From 5fef6294fc122290383d8e22264ce8f57b1b8628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tayfun=20O=CC=88zis=CC=A7=20ERI=CC=87KAN?= Date: Mon, 2 Dec 2013 12:49:14 +0200 Subject: [PATCH 01/12] #41 Screenshots was added. --- README.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b29c21a..172103d 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,19 @@ This is yet an other private admin template which base on Twitter Bootstrap 3 wi NOTE: Don't use this theme until v1.0.0 +## Screenshots + +### Login screen +![hierapolis_login](https://f.cloud.github.com/assets/310691/1653859/8cc7597e-5b3e-11e3-9efa-40ce52c63f3f.png) +### Forgot password +![hierapolis_forgot_password](https://f.cloud.github.com/assets/310691/1653860/95295568-5b3e-11e3-827d-998a3ad93b8b.png) +### Dashboard +![hierapolis_dashboard](https://f.cloud.github.com/assets/310691/1653862/99fe359a-5b3e-11e3-99b0-2aefce46f99a.png) +### Tables +![hierapolis_tables](https://f.cloud.github.com/assets/310691/1653863/a58d5a8a-5b3e-11e3-9650-68617b2c7631.png) +### Forms +![hierapolis_forms](https://f.cloud.github.com/assets/310691/1653864/ac4d1720-5b3e-11e3-9465-18984b9f151b.png) + ## Requirements TODO @@ -44,4 +57,4 @@ The names and logos for lab2023 are trademarks of lab2023, inc. ## License -Copyright 2013 lab2023 – internet technologies +Copyright 2013 lab2023 – internet technologies \ No newline at end of file From a61f8954a49fc3c3a2aca55f8e45ab8b2619abcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tayfun=20O=CC=88zis=CC=A7=20ERI=CC=87KAN?= Date: Mon, 2 Dec 2013 12:50:01 +0200 Subject: [PATCH 02/12] #41 Middleman, bootstrap-sass were updated. --- Gemfile | 18 +++++++++++++--- Gemfile.lock | 59 +++++++++++++++++++++++----------------------------- 2 files changed, 41 insertions(+), 36 deletions(-) diff --git a/Gemfile b/Gemfile index 1a5900a..20b63a7 100755 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,17 @@ -source 'https://rubygems.org' +# If you have OpenSSL installed, we recommend updating +# the following line to use "https" +source 'http://rubygems.org' -gem 'middleman', '~> 3.1.4' +gem 'middleman', '~>3.2.0' + +# Live-reloading plugin gem 'middleman-livereload', '~> 3.1.0' -gem 'bootstrap-sass', :git => 'git://github.com/thomas-mcdonald/bootstrap-sass.git', :branch => '3' \ No newline at end of file + +# For faster file watcher updates on Windows: +gem 'wdm', '~> 0.1.0', :platforms => [:mswin, :mingw] + +# Compass +gem 'compass', '~> 0.12.2' + +# Bootstrap sass +gem 'bootstrap-sass', '~> 3.0.2.1' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 84e9535..9871e28 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,18 +1,12 @@ -GIT - remote: git://github.com/thomas-mcdonald/bootstrap-sass.git - revision: 0e88056ac5d58fb0bbd23d3fe929eac01712d964 - branch: 3 - specs: - bootstrap-sass (3.0.0.0) - sass (~> 3.2) - GEM - remote: https://rubygems.org/ + remote: http://rubygems.org/ specs: - activesupport (3.2.14) + activesupport (3.2.15) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - chunky_png (1.2.8) + bootstrap-sass (3.0.2.1) + sass (~> 3.2) + chunky_png (1.2.9) coffee-script (2.2.0) coffee-script-source execjs @@ -27,34 +21,33 @@ GEM eventmachine (1.0.3) execjs (1.4.0) multi_json (~> 1.0) - ffi (1.9.0) + ffi (1.9.3) fssm (0.2.10) - haml (4.0.3) + haml (4.0.4) tilt hike (1.2.3) http_parser.rb (0.5.3) - i18n (0.6.4) - kramdown (1.1.0) - listen (1.2.2) + i18n (0.6.5) + kramdown (1.2.0) + listen (1.3.1) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) rb-kqueue (>= 0.2) - middleman (3.1.4) + middleman (3.2.0) coffee-script (~> 2.2.0) compass (>= 0.12.2) execjs (~> 1.4.0) haml (>= 3.1.6) - kramdown (~> 1.1.0) - middleman-core (= 3.1.4) - middleman-more (= 3.1.4) + kramdown (~> 1.2) + middleman-core (= 3.2.0) middleman-sprockets (>= 3.1.2) sass (>= 3.1.20) uglifier (~> 2.1.0) - middleman-core (3.1.4) + middleman-core (3.2.0) activesupport (~> 3.2.6) bundler (~> 1.1) i18n (~> 0.6.1) - listen (~> 1.2.2) + listen (~> 1.1) rack (>= 1.4.5) rack-test (~> 0.6.1) thor (>= 0.15.2, < 2.0) @@ -64,33 +57,31 @@ GEM middleman-core (>= 3.0.2) multi_json (~> 1.0) rack-livereload - middleman-more (3.1.4) - middleman-sprockets (3.1.4) - middleman-core (>= 3.0.14) - middleman-more (>= 3.0.14) + middleman-sprockets (3.2.0) + middleman-core (~> 3.2) sprockets (~> 2.1) sprockets-helpers (~> 1.0.0) sprockets-sass (~> 1.0.0) - multi_json (1.7.8) + multi_json (1.8.2) rack (1.5.2) rack-livereload (0.3.15) rack rack-test (0.6.2) rack (>= 1.0) rb-fsevent (0.9.3) - rb-inotify (0.9.0) + rb-inotify (0.9.2) ffi (>= 0.5.0) rb-kqueue (0.2.0) ffi (>= 0.5.0) - sass (3.2.9) - sprockets (2.10.0) + sass (3.2.12) + sprockets (2.10.1) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sprockets-helpers (1.0.1) sprockets (~> 2.0) - sprockets-sass (1.0.1) + sprockets-sass (1.0.2) sprockets (~> 2.0) tilt (~> 1.1) thor (0.18.1) @@ -103,6 +94,8 @@ PLATFORMS ruby DEPENDENCIES - bootstrap-sass! - middleman (~> 3.1.4) + bootstrap-sass (~> 3.0.2.1) + compass (~> 0.12.2) + middleman (~> 3.2.0) middleman-livereload (~> 3.1.0) + wdm (~> 0.1.0) From a2ae4576bdb0b6b53d4638a181647de21d74f41d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tayfun=20O=CC=88zis=CC=A7=20ERI=CC=87KAN?= Date: Fri, 6 Dec 2013 14:24:48 +0200 Subject: [PATCH 03/12] #42 Bootstrap was updated. --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 20b63a7..0be8bb3 100755 --- a/Gemfile +++ b/Gemfile @@ -14,4 +14,4 @@ gem 'wdm', '~> 0.1.0', :platforms => [:mswin, :mingw] gem 'compass', '~> 0.12.2' # Bootstrap sass -gem 'bootstrap-sass', '~> 3.0.2.1' \ No newline at end of file +gem 'bootstrap-sass', '~> 3.0.3.0' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 9871e28..905b4bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,7 +4,7 @@ GEM activesupport (3.2.15) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - bootstrap-sass (3.0.2.1) + bootstrap-sass (3.0.3.0) sass (~> 3.2) chunky_png (1.2.9) coffee-script (2.2.0) @@ -94,7 +94,7 @@ PLATFORMS ruby DEPENDENCIES - bootstrap-sass (~> 3.0.2.1) + bootstrap-sass (~> 3.0.3.0) compass (~> 0.12.2) middleman (~> 3.2.0) middleman-livereload (~> 3.1.0) From bb47ca7b93178f81ea081f23a912c3fec3610817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tayfun=20=C3=96zi=C5=9F=20ER=C4=B0KAN?= Date: Fri, 27 Dec 2013 15:40:22 +0200 Subject: [PATCH 04/12] #45 was done --- source/partials/_footer.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/partials/_footer.haml b/source/partials/_footer.haml index d68fbfd..83393a1 100644 --- a/source/partials/_footer.haml +++ b/source/partials/_footer.haml @@ -1,6 +1,6 @@ - / Javascripts = javascript_include_tag '//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js', '//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js', '//cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js', - 'application' \ No newline at end of file + 'application' += yield_content :foot From 4a80ca9e9cabfbe876180b8f470307c87f6c7512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Muhammet=20DI=CC=87LEK?= Date: Tue, 14 Jan 2014 15:00:53 +0200 Subject: [PATCH 05/12] github pages settings --- Gemfile | 3 ++- Gemfile.lock | 4 ++++ Rakefile | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 Rakefile diff --git a/Gemfile b/Gemfile index 0be8bb3..f77eb1a 100755 --- a/Gemfile +++ b/Gemfile @@ -14,4 +14,5 @@ gem 'wdm', '~> 0.1.0', :platforms => [:mswin, :mingw] gem 'compass', '~> 0.12.2' # Bootstrap sass -gem 'bootstrap-sass', '~> 3.0.3.0' \ No newline at end of file +gem 'bootstrap-sass', '~> 3.0.3.0' +gem 'middleman-gh-pages' diff --git a/Gemfile.lock b/Gemfile.lock index 905b4bd..8729ce9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -52,6 +52,8 @@ GEM rack-test (~> 0.6.1) thor (>= 0.15.2, < 2.0) tilt (~> 1.3.6) + middleman-gh-pages (0.0.3) + rake (> 0.9.3) middleman-livereload (3.1.0) em-websocket (>= 0.2.0) middleman-core (>= 3.0.2) @@ -68,6 +70,7 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) + rake (10.1.1) rb-fsevent (0.9.3) rb-inotify (0.9.2) ffi (>= 0.5.0) @@ -97,5 +100,6 @@ DEPENDENCIES bootstrap-sass (~> 3.0.3.0) compass (~> 0.12.2) middleman (~> 3.2.0) + middleman-gh-pages middleman-livereload (~> 3.1.0) wdm (~> 0.1.0) diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000..52a2b4c --- /dev/null +++ b/Rakefile @@ -0,0 +1 @@ +require 'middleman-gh-pages' From 5ba05d37a422fd2bc85e1786a15e6f605c66fd1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20=C3=96zg=C3=BCr=20=C3=96ZKAN?= Date: Tue, 14 Jan 2014 16:27:54 +0200 Subject: [PATCH 06/12] Add rails hierapolis gem. --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 172103d..ae714f0 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,8 @@ TODO TODO +* There is also [Rails Hierapolis Gem](https://github.com/kebab-project/hierapolis-rails) for Rails developer. + ## What Hierapolis included? * [Bootstrap 3](http://getbootstrap.com/) @@ -57,4 +59,4 @@ The names and logos for lab2023 are trademarks of lab2023, inc. ## License -Copyright 2013 lab2023 – internet technologies \ No newline at end of file +Copyright 2013 lab2023 – internet technologies From fabb1760a0c3870a2d9021215f66c21667a14439 Mon Sep 17 00:00:00 2001 From: Ahmet Sezgin Duran Date: Sat, 3 May 2014 15:45:41 +0300 Subject: [PATCH 07/12] LAB-31 #time 2m Update README.md and license --- LICENSE.txt | 2 +- README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index af2fd60..2ac268c 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2013 lab2023 - internet technologies +Copyright (c) 2014 lab2023 - information technologies MIT License diff --git a/README.md b/README.md index ae714f0..47254ad 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ TODO TODO -* There is also [Rails Hierapolis Gem](https://github.com/kebab-project/hierapolis-rails) for Rails developer. +* There is also [Rails Hierapolis Gem](https://github.com/kebab-project/hierapolis-rails) for Rails developer. ## What Hierapolis included? @@ -51,7 +51,7 @@ Once you've made your great commits: ## Credits -Hierapolis is maintained and funded by [lab2023 - internet technologies](http://lab2023.com/) +Hierapolis is maintained and funded by [lab2023 - information technologies](http://lab2023.com/) Thank you to all the [contributors!](https://github.com/kebab-project/hierapolis/graphs/contributors) @@ -59,4 +59,4 @@ The names and logos for lab2023 are trademarks of lab2023, inc. ## License -Copyright 2013 lab2023 – internet technologies +Copyright 2014 lab2023 – information technologies From d23d1f3c2ea36872b4335b6e1deb206875fc91d6 Mon Sep 17 00:00:00 2001 From: Ahmet Sezgin Duran Date: Thu, 8 May 2014 18:12:10 +0300 Subject: [PATCH 08/12] LAB-31 #time 1m Add named logo --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 47254ad..d242039 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,8 @@ Once you've made your great commits: ## Credits +![lab2023](http://lab2023.com/assets/images/named-logo.png) + Hierapolis is maintained and funded by [lab2023 - information technologies](http://lab2023.com/) Thank you to all the [contributors!](https://github.com/kebab-project/hierapolis/graphs/contributors) From 77460602034868f534670710d3989f26aa60a57f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20=C3=96zg=C3=BCr=20=C3=96ZKAN?= Date: Wed, 28 May 2014 12:17:50 +0300 Subject: [PATCH 09/12] Give more information about run and build middleman --- README.md | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d242039..a371fa5 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,21 @@ TODO ## Usage -TODO +For see in action + +1. `git clone git@github.com:lab2023/hierapolis.git` +2. `bundle install` +3. `middleman` +4. Open `0.0.0.0:4567` + +Get html, css, js output + +1. `middleman build` +2. `cd build` + +You can see outputs in build folder. + +**NOTE** * There is also [Rails Hierapolis Gem](https://github.com/kebab-project/hierapolis-rails) for Rails developer. From 62e8249929875c5e3c523ba4c336a2d1e74a9079 Mon Sep 17 00:00:00 2001 From: Dennis Saenger Date: Wed, 28 May 2014 13:47:34 +0200 Subject: [PATCH 10/12] lock version of middleman-sprockets to 3.3.2 due to a bug see: https://github.com/middleman/middleman/issues/1265 --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile b/Gemfile index f77eb1a..89b7c95 100755 --- a/Gemfile +++ b/Gemfile @@ -7,6 +7,8 @@ gem 'middleman', '~>3.2.0' # Live-reloading plugin gem 'middleman-livereload', '~> 3.1.0' +gem 'middleman-sprockets', '3.3.2' + # For faster file watcher updates on Windows: gem 'wdm', '~> 0.1.0', :platforms => [:mswin, :mingw] From 03ca365dfc068c84d6b76d798602965c30ebb4e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tayfun=20O=CC=88zis=CC=A7=20ERI=CC=87KAN?= Date: Fri, 6 Jun 2014 19:29:55 +0300 Subject: [PATCH 11/12] #TB-40 Middleman updates and improvements - Middleman gems were updated - HAML layout structures were updated - Bootstrap-sass was updated - Middleman-deploy plugin was enabled and rakefile was removed - .gitignore file was updated --- .gitignore | 38 +- .nojekyll | 0 Gemfile | 16 +- Gemfile.lock | 136 +++--- Rakefile | 1 - config.rb | 72 ++-- source/README.md | 388 ------------------ source/VERSION.txt | 1 + source/assets/fonts/.keep | 0 source/layouts/layout.haml | 42 +- source/layouts/login.haml | 34 +- .../{ => layouts}/partials/_breadcrumb.haml | 0 source/{ => layouts}/partials/_dock.haml | 0 source/{ => layouts}/partials/_footer.haml | 0 source/{ => layouts}/partials/_navbar.haml | 0 source/{ => layouts}/partials/_toolbar.haml | 0 source/{ => layouts}/partials/_trackers.haml | 0 17 files changed, 172 insertions(+), 556 deletions(-) create mode 100644 .nojekyll delete mode 100644 Rakefile delete mode 100755 source/README.md create mode 120000 source/VERSION.txt create mode 100644 source/assets/fonts/.keep rename source/{ => layouts}/partials/_breadcrumb.haml (100%) rename source/{ => layouts}/partials/_dock.haml (100%) rename source/{ => layouts}/partials/_footer.haml (100%) rename source/{ => layouts}/partials/_navbar.haml (100%) rename source/{ => layouts}/partials/_toolbar.haml (100%) rename source/{ => layouts}/partials/_trackers.haml (100%) diff --git a/.gitignore b/.gitignore index 73b8583..53d2bcc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,24 +1,20 @@ -*.gem -*.rbc -.bundle -.config -coverage -InstalledFiles -lib/bundler/man -pkg -rdoc -spec/reports -test/tmp -test/version_tmp -tmp +# See http://help.github.com/ignore-files/ for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile ~/.gitignore_global -# IDE -.idea +# Ignore bundler config +/.bundle -# YARD artifacts -.yardoc -_yardoc -doc/ -*.psd +# Ignore the build directory +/build -build/ +# Ignore caches +/.sass-cache +.cache/ + +# Ignore .DS_store file +.DS_Store + +.idea/ \ No newline at end of file diff --git a/.nojekyll b/.nojekyll new file mode 100644 index 0000000..e69de29 diff --git a/Gemfile b/Gemfile index 89b7c95..b13373a 100755 --- a/Gemfile +++ b/Gemfile @@ -2,19 +2,25 @@ # the following line to use "https" source 'http://rubygems.org' -gem 'middleman', '~>3.2.0' +gem 'middleman', '~>3.3.3' # Live-reloading plugin gem 'middleman-livereload', '~> 3.1.0' +# Middleman-sprockets gem 'middleman-sprockets', '3.3.2' +# Middleman-deploy +gem 'middleman-deploy', '~> 0.2.4' + # For faster file watcher updates on Windows: gem 'wdm', '~> 0.1.0', :platforms => [:mswin, :mingw] +# Windows does not come with time zone data +gem 'tzinfo-data', platforms: [:mswin, :mingw] + # Compass -gem 'compass', '~> 0.12.2' +gem 'compass', '~> 0.12.6' -# Bootstrap sass -gem 'bootstrap-sass', '~> 3.0.3.0' -gem 'middleman-gh-pages' +# Twitter Bootstrap +gem 'bootstrap-sass', '~> 3.1.1.1' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 8729ce9..32017c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,105 +1,135 @@ GEM remote: http://rubygems.org/ specs: - activesupport (3.2.15) - i18n (~> 0.6, >= 0.6.4) - multi_json (~> 1.0) - bootstrap-sass (3.0.3.0) + activesupport (4.1.1) + i18n (~> 0.6, >= 0.6.9) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.1) + tzinfo (~> 1.1) + bootstrap-sass (3.1.1.1) sass (~> 3.2) - chunky_png (1.2.9) + chunky_png (1.3.1) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.6.3) - compass (0.12.2) + coffee-script-source (1.7.0) + compass (0.12.6) chunky_png (~> 1.2) fssm (>= 0.2.7) - sass (~> 3.1) - em-websocket (0.5.0) + sass (~> 3.2.19) + compass-import-once (1.0.4) + sass (>= 3.2, < 3.5) + em-websocket (0.5.1) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.5.3) + http_parser.rb (~> 0.6.0) + erubis (2.7.0) eventmachine (1.0.3) - execjs (1.4.0) - multi_json (~> 1.0) + execjs (2.1.0) ffi (1.9.3) fssm (0.2.10) - haml (4.0.4) + haml (4.0.5) tilt hike (1.2.3) - http_parser.rb (0.5.3) - i18n (0.6.5) - kramdown (1.2.0) + hooks (0.4.0) + uber (~> 0.0.4) + http_parser.rb (0.6.0) + i18n (0.6.9) + json (1.8.1) + kramdown (1.3.3) listen (1.3.1) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) rb-kqueue (>= 0.2) - middleman (3.2.0) + middleman (3.3.3) coffee-script (~> 2.2.0) - compass (>= 0.12.2) - execjs (~> 1.4.0) - haml (>= 3.1.6) + compass (>= 0.12.4) + compass-import-once (= 1.0.4) + execjs (~> 2.0) + haml (>= 4.0.5) kramdown (~> 1.2) - middleman-core (= 3.2.0) + middleman-core (= 3.3.3) middleman-sprockets (>= 3.1.2) - sass (>= 3.1.20) - uglifier (~> 2.1.0) - middleman-core (3.2.0) - activesupport (~> 3.2.6) + sass (>= 3.2.17, < 4.0) + uglifier (~> 2.5) + middleman-core (3.3.3) + activesupport (~> 4.1.0) bundler (~> 1.1) - i18n (~> 0.6.1) + erubis + hooks (~> 0.3) + i18n (~> 0.6.9) listen (~> 1.1) - rack (>= 1.4.5) - rack-test (~> 0.6.1) + padrino-helpers (~> 0.12.1) + rack (>= 1.4.5, < 2.0) + rack-test (~> 0.6.2) thor (>= 0.15.2, < 2.0) - tilt (~> 1.3.6) - middleman-gh-pages (0.0.3) - rake (> 0.9.3) - middleman-livereload (3.1.0) + tilt (~> 1.4.1, < 2.0) + middleman-deploy (0.2.4) + middleman-core (>= 3.0.0) + net-sftp + ptools + middleman-livereload (3.1.1) em-websocket (>= 0.2.0) middleman-core (>= 3.0.2) multi_json (~> 1.0) rack-livereload - middleman-sprockets (3.2.0) - middleman-core (~> 3.2) - sprockets (~> 2.1) - sprockets-helpers (~> 1.0.0) + middleman-sprockets (3.3.2) + middleman-core (>= 3.2) + sprockets (~> 2.2) + sprockets-helpers (~> 1.1.0) sprockets-sass (~> 1.0.0) - multi_json (1.8.2) + minitest (5.3.4) + multi_json (1.10.1) + net-sftp (2.1.2) + net-ssh (>= 2.6.5) + net-ssh (2.9.1) + padrino-helpers (0.12.2) + i18n (~> 0.6, >= 0.6.7) + padrino-support (= 0.12.2) + tilt (~> 1.4.1) + padrino-support (0.12.2) + activesupport (>= 3.1) + ptools (1.2.4) rack (1.5.2) rack-livereload (0.3.15) rack rack-test (0.6.2) rack (>= 1.0) - rake (10.1.1) - rb-fsevent (0.9.3) - rb-inotify (0.9.2) + rb-fsevent (0.9.4) + rb-inotify (0.9.4) ffi (>= 0.5.0) - rb-kqueue (0.2.0) + rb-kqueue (0.2.3) ffi (>= 0.5.0) - sass (3.2.12) - sprockets (2.10.1) + sass (3.2.19) + sprockets (2.12.1) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-helpers (1.0.1) + sprockets-helpers (1.1.0) sprockets (~> 2.0) - sprockets-sass (1.0.2) + sprockets-sass (1.0.3) sprockets (~> 2.0) tilt (~> 1.1) - thor (0.18.1) - tilt (1.3.7) - uglifier (2.1.2) + thor (0.19.1) + thread_safe (0.3.4) + tilt (1.4.1) + tzinfo (1.2.1) + thread_safe (~> 0.1) + uber (0.0.6) + uglifier (2.5.0) execjs (>= 0.3.0) - multi_json (~> 1.0, >= 1.0.2) + json (>= 1.8.0) PLATFORMS ruby DEPENDENCIES - bootstrap-sass (~> 3.0.3.0) - compass (~> 0.12.2) - middleman (~> 3.2.0) - middleman-gh-pages + bootstrap-sass (~> 3.1.1.1) + compass (~> 0.12.6) + middleman (~> 3.3.3) + middleman-deploy (~> 0.2.4) middleman-livereload (~> 3.1.0) + middleman-sprockets (= 3.3.2) + tzinfo-data wdm (~> 0.1.0) diff --git a/Rakefile b/Rakefile deleted file mode 100644 index 52a2b4c..0000000 --- a/Rakefile +++ /dev/null @@ -1 +0,0 @@ -require 'middleman-gh-pages' diff --git a/config.rb b/config.rb index 7c6a7ce..ce36a56 100755 --- a/config.rb +++ b/config.rb @@ -2,50 +2,32 @@ # Compass ### -# Bootstrap -# First: -# gem install sass-rails -# gem install bootstrap-sass -require 'bootstrap-sass' - -# Susy grids in Compass -# First: gem install compass-susy-plugin -# require 'susy' - # Change Compass configuration -compass_config do |config| - config.output_style = :nested - config.http_path = '/' - config.images_dir = 'assets/images' - config.javascripts_dir = 'assets/javascripts' -end - -# Cache Buster -#activate :asset_hash -activate :cache_buster +# compass_config do |config| +# config.output_style = :compact +# end ### # Page options, layouts, aliases and proxies ### # Per-page layout changes: -# +# # With no layout # page "/path/to/file.html", :layout => false -# +# # With alternative layout # page "/path/to/file.html", :layout => :otherlayout -# -# A path which all have the same layout +# +# A path which all have the same layout with_layout :login do - page '/index.html' - page '/forgot_password.html' + page '/index.html' + page '/forgot_password.html' end -# Proxy (fake) files -# page "/this-page-has-no-template.html", :proxy => "/template-file.html" do -# @which_fake_page = "Rendering a fake page with a variable" -# end +# Proxy pages (http://middlemanapp.com/basics/dynamic-pages/) +# proxy "/this-page-has-no-template.html", "/template-file.html", :locals => { +# :which_fake_page => "Rendering a fake page with a local variable" } ### # Helpers @@ -54,8 +36,13 @@ # Automatic image dimensions on image_tag helper activate :automatic_image_sizes -# Live Reload -activate :livereload +# Reload the browser automatically whenever files change +configure :development do + activate :livereload +end + +# Pretty URLs +activate :directory_indexes # Methods defined in the helpers block are available in templates # helpers do @@ -70,8 +57,9 @@ set :css_dir, 'assets/stylesheets' set :js_dir, 'assets/javascripts' set :images_dir, 'assets/images' +set :fonts_dir, 'assets/fonts' -activate :directory_indexes +set :haml, format: :html5 # Build-specific configuration configure :build do @@ -82,16 +70,20 @@ activate :minify_javascript # Enable cache buster - activate :cache_buster + activate :asset_hash # Use relative URLs activate :relative_assets - # Compress PNGs after build - # First: gem install middleman-smusher - # require "middleman-smusher" - # activate :smusher - # Or use a different image path - #set :http_path, "/img/" + # set :http_prefix, "/Content/images/" +end +config[:file_watcher_ignore] += [ /.idea\// ] + +# Deployment +activate :deploy do |deploy| + deploy.method = :git + # Optional Settings + deploy.remote = 'git@github.com:lab2023/hierapolis.git' + deploy.branch = 'gh-pages' end \ No newline at end of file diff --git a/source/README.md b/source/README.md deleted file mode 100755 index 452c329..0000000 --- a/source/README.md +++ /dev/null @@ -1,388 +0,0 @@ -# HTML5 Boilerplate [http://html5boilerplate.com](http://html5boilerplate.com) - -## Changelog: - -### v.2.0 : August 10th, 2011 - -### v2.0 HIGHLIGHTS - -#### NORMALIZE.CSS - -We are now using [normalize.css](http://github.com/necolas/normalize.css/) developed by Nicolas Gallagher along with Jonathan Neal instead of the traditional CSS Reset stylesheet. - -normalize.css retains useful browser defaults and includes several common fixes to improve cross-browser (desktop and mobile) styling consistency. - -Lots of research has gone into normalize, verifying what are the default user agent styles provided by each browser. We can very specifically change only the ones we need to instead of the bulldozer approach. - -##### Why this is great news: - -* Who likes being so damn redundant and declaring: em, i { font-style: italic; } -* By using normalization instead of a reset + building up default styles, we use less styles and save bytes -* Less noise in your dev tools: when debugging, you don't have to trawl through every reset selector to reach the actual style that is causing the issue. -* More details here: http://necolas.github.com/normalize.css/ - - -#### PROMPT CHROME FRAME FOR IE6 -* With the latest release of Chrome frame which does not require admin access to be installed, we felt it was a good time to prompt IE 6 users to install Chrome Frame. (Using protocol-relative url and exact version for higher expires headers) - - -####BUILD SCRIPT++: Faster, @import inlining, appcache generation -* If 15 seconds was too long to wait before, you'll be happy with the changes. Via a new "intermediate" folder, we cut down build time by 80% or more. -* If you use @imports in your CSS to author in multiple files, the build script will inline all these together. This way, you have a maintainable authoring experience, and still a highly performant production version. -* Making an app that works offline is a badge of honor. Now with a flick of a config switch, the H5BP build script can autogenerate your cache manifest file with all the right info and wire it up. It'll also keep the manifest revved as you deploy new changes. - -##### ADDING RESPOND.JS -* Add respond.js as a shift to a responsive approach. Updated it to improved, comment-free version which would enable IEs to also apply styles using media queries. - - -#### PNGFIX & HANDHELD REMOVED -* Remove handheld.css as we do not think it was useful among the diverse feature phones -* We feel tools like imagealpha and pngquant are more useful than using stopgap fixes like belatedpng. - -### detailed 2.0 changelog - -#### .HTACCESS -* Disable directory browsing by default -* removed trailing slash redirects in htaccess. More: https://github.com/paulirish/html5-boilerplate/wiki/Proper-usage-of-trailing-slash-redirects #493 #515 -* Updating TTF mimetype to fix Google Chrome warning -* Improved support for all versions of Apache, incl workaround for bug in mod_filter: Fixes #441. Fixes #499. Fixes #535. Closes #549. (the grouping ticket) Ref #576 -* Use substring matching in gzip filter_module and re-enable gzip for some common MIME-types -* mod_deflate trigger rules modifications -* Add gzip support for XHTML, RSS, Atom -* Move font & SVG compression from FilesMatch to FilterProvider / AddOutputFilterByType -* Added m4a (Need it for IE9) and m4v (HandBrake default) MIME types. -* moved ETag removal configs closer -* added Header unset ETag In some servers setting "FileETag None" alone, is not enough. Removing header and setting it to None fixes the issue. -* Add `Options +FollowSymlinks` when `RewriteEngine` is used. Fixes #489. -* Some more security for PHP: turn off error display and turn on error logging -* Allow Blackberry to read vCards - - -#### BUILD SCRIPT -* CSSLint, JSLint, JSHint tools are now optionally available in the build script -* New features in build script: -* Added a files.bypass property which when set, will not compress the listed JavaScript files, but just silently passes it on to the publish folder without any change. -* Added a images.bypass with a list of image files or folders within the img directory that you do not want to be optimized. Fixes #564 -* Build script is compatible with php files now. it appears. fixes #392. -* Build script now generates appcache manifest. see #652 -* Test for ant version to head off problems with ant < 1.8.2 -* removes concatenated css files from index.html when they are linked to with link tag. Fixes #452 -* Added DOCTYPE so Eclipse and other IDE's do not complain about the lack of schema. http://stackoverflow.com/questions/363768/disable-dtd-warning-for-ant-scripts-in-eclipse -* Updated Windows optipng and jpegtran paths to include ${basedir} -* Minification affects all .css and .js files in /css and /js dirs, not just the ones explicitly included in concatenation. -* Build script: compress all images in subfolders, too. -* Added gae.js_dir and gae.css_dir so that App Engine projects can have the correct directory names swapped in their templates. -* added a second replace token statement so that "/css/style.css" gets swapped too. -* change *.png and *.jpg to **/*.png and **/*.jpg so that optimize commands reach subdirectories. -* Improved build script compatibility with Netbeans IDE. default.properties: added IDE generated files/folders to exclude from build script .gitignore: Filename case correction for Windows generated Thumb.db Fix #374 -* Adding properties to project.properties so that Google App Engine builds don't have "static" prepended when swapping for minified versions. -* console.log messages are no longer commented out. use log() instead - -* Much faster build process - -Intermediate stages are stored in a new intermediate folder, and only -files that should be published are copied into the publish folder. - -Files are not deleted at the beginning of every build, and files that -have already been processed will not be reprocessed unless the source -has changed. - -* Files are revved by SHA, not incrementally at each build - -Versioned files are referenced by a SHA-1 hash of the content rather -than a build number. This means that changing your HTML and rebuilding -will not cause your users to redownload the same CSS and JavaScript, and -a reverted change may cause users to use a copy that was previously -downloaded. It may be better to use only part of the hash so the HTTP -request is shorter. - -* copy files last This slightly simplifies copying because we don't have to exclude PNG, JPEG, or HTML files from the copy stage. it comes preminified, and we don't need to minify it again This also updates the HTML so that the script is not missing if the unminified scripts are unavailable on the server. This commit requires a change to existing HTML files :/ -* change the source htaccess rather than updating it -* update yuicompressor to 2.4.5. fixes media query minification issue. -* update htmlcompressor to 1.1 which uses the new yuicompressor for CSS. -* try not to re-optimize the same images every time -* Lots of bug fixes for edge cases and improved techniques.. - - - -#### INDEX.HTML -* Use minified jQuery by default. / jQuery updated to 1.6.2 -* Add respond.js as part of shift to 'mobile first' approach. -* Updated to Modernizr 2.0 Complete, Production minified. -* Prompt IE 6 users to install Chrome Frame, update chromeframe install to 1.0.3. Move chromeframe to bottom of page after the other scripts. also reference exact version for higher expires headers. Use protocol-relative url for chrome frame URL Fixes #495 -* Removing touch icon link tags and retaining only the comment. -* Encourage people to send the X-UA-Compatible HTTP header instead of leaving it in the HTML, to avoid edge case issues. Fixes #378. -* Remove the cache-busting query parameters from the HTML. -* Simplify the conditional comment containing code for IE 9+ and modern browsers -* Simpler escape for ``. See http://mathiasbynens.be/notes/etago for more information. -* Encourage people to use a custom Modernizr build containing only the features they need for that particular project. -* Added maximum touch-icon support as per http://mathiasbynens.be/notes/touch-icons#sizes -* Add a link to optional tags that could be added to the element: https://github.com/paulirish/html5-boilerplate/issues/482 -* Standardize the use of single and double quotes as per http://h5bp.com/d/The-markup★quotes -* Added Site Speed tracking for Google Analytics -* Using Modernizr.load/yepnope for loading Google Analytics. Fixes #542 -* Google Analytics now retrieved with Modernizr.load() for byte brevity and optimal speed - -#### STYLE.CSS -* Major: Now using css normalization instead of css reset + building up default styles. Fixes #412, #500, #534. Closes #456. Links #566 -* Add `'oldie'` class to conditional `` classnames. Fix #522 -* Add `img { max-width: 100%; }` to print styles to prevent images from getting cut off. -* Update clearfix to use 'micro' clearfix http://nicolasgallagher.com/micro-clearfix-hack/ -* Add placeholder CSS MQs for mobile-first approach -* Tweaking our hot pink ::selection. It is now #fe57a1, which is Festal (adj): pertaining to or befitting a feast, festival, holiday, or gala occasion. -* Use black for links when printing, refs #147 -* added vertical-align: middle to fix borders on image containers. Fixes #440 -* Add `` overflow fix for IE9. Group `` and `` rules in an 'embedded content' section of CSS file. Add {cursor:pointer} to ` in IE6/7. Avoids numerous layout and whitespace issues that result from setting {overflow:visible} to fix the odd inner spacing of those form elements. -* Add `{resize: vertical}` to `