Merge branch 'release/0.3.0'

CHANGELOG.md

@@ -0,0 +1,20 @@
+
+#### [Current]
+ * [78661d9](../../commit/78661d9) #20 Twitter Bootstrap 3  integration... __(Tayfun Öziş ERİKAN)__
+ * [96b9a9e](../../commit/96b9a9e) Update README.md __(Tayfun Öziş ERİKAN)__
+ * [b59ecc8](../../commit/b59ecc8) Update README.md __(Tayfun Öziş ERİKAN)__
+ * [5a2349c](../../commit/5a2349c) Update README.md __(Tayfun Öziş ERİKAN)__
+ * [3cba739](../../commit/3cba739) MIT license was added. __(Tayfun Öziş ERİKAN)__
+ * [6c19329](../../commit/6c19329) Version was updated. __(Tayfun Öziş ERİKAN)__
+
+#### 0.2.0
+ * [1d76b56](../../commit/1d76b56) #9 Added Flat UI __(coskuntekin)__
+ * [366ec3d](../../commit/366ec3d) gitignore was updated. __(coskuntekin)__
+
+#### 0.1.0
+ * [de1e5a9](../../commit/de1e5a9) Bump version 0.1.0 __(Tayfun Öziş ERİKAN)__
+ * [ceae0f2](../../commit/ceae0f2) #8 Font 'open sans' was integrated. __(coskuntekin)__
+ * [a221df3](../../commit/a221df3) #3 Font awesome was integrated. __(coskuntekin)__
+ * [4b1b2f1](../../commit/4b1b2f1) #1 Rubygems source switched to https __(Tayfun Öziş ERİKAN)__
+ * [57f5f93](../../commit/57f5f93) fixed index.html.haml __(coskuntekin)__
+ * [1c220c1](../../commit/1c220c1) #1 install middleman __(coskuntekin)__

Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'middleman', '~>3.0.14'
-gem 'middleman-livereload', '~> 3.0.1'
-gem 'bootstrap-sass'
+gem 'middleman', '~> 3.1.4'
+gem 'middleman-livereload', '~> 3.1.0'
+gem 'bootstrap-sass', :git => 'git://github.com/thomas-mcdonald/bootstrap-sass.git', :branch => '3'

Gemfile.lock

@@ -1,16 +1,22 @@
+GIT
+  remote: git://github.com/thomas-mcdonald/bootstrap-sass.git
+  revision: 79e7f27bcd70aa56682a8460c0bd6871bb6da172
+  branch: 3
+  specs:
+    bootstrap-sass (3.0.0.0)
+      sass (~> 3.2)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    bootstrap-sass (2.3.2.0)
-      sass (~> 3.2)
     chunky_png (1.2.8)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.3.3)
+    coffee-script-source (1.6.3)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
@@ -21,77 +27,62 @@ GEM
     eventmachine (1.0.3)
     execjs (1.4.0)
       multi_json (~> 1.0)
+    ffi (1.9.0)
     fssm (0.2.10)
     haml (4.0.3)
       tilt
     hike (1.2.3)
     http_parser.rb (0.5.3)
-    http_router (0.10.2)
-      rack (>= 1.0.0)
-      url_mount (~> 0.2.1)
-    i18n (0.6.1)
-    listen (0.7.3)
-    maruku (0.6.1)
-      syntax (>= 1.0.0)
-    middleman (3.0.14)
-      middleman-core (= 3.0.14)
-      middleman-more (= 3.0.14)
-      middleman-sprockets (~> 3.1.0)
-    middleman-core (3.0.14)
+    i18n (0.6.4)
+    kramdown (1.1.0)
+    listen (1.2.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
+    middleman (3.1.4)
+      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)
+      middleman-sprockets (>= 3.1.2)
+      sass (>= 3.1.20)
+      uglifier (~> 2.1.0)
+    middleman-core (3.1.4)
       activesupport (~> 3.2.6)
       bundler (~> 1.1)
-      listen (~> 0.7.3)
-      rack (~> 1.4.1)
+      i18n (~> 0.6.1)
+      listen (~> 1.2.2)
+      rack (>= 1.4.5)
       rack-test (~> 0.6.1)
-      rb-fsevent (~> 0.9.3)
-      thor (~> 0.15.4)
+      thor (>= 0.15.2, < 2.0)
       tilt (~> 1.3.6)
-    middleman-livereload (3.0.1)
+    middleman-livereload (3.1.0)
       em-websocket (>= 0.2.0)
-      middleman-core (~> 3.0.2)
+      middleman-core (>= 3.0.2)
       multi_json (~> 1.0)
       rack-livereload
-    middleman-more (3.0.14)
-      coffee-script (~> 2.2.0)
-      coffee-script-source (~> 1.3.3)
-      compass (>= 0.12.2)
-      execjs (~> 1.4.0)
-      haml (>= 3.1.6)
-      i18n (~> 0.6.0, < 0.6.2)
-      maruku (~> 0.6.0)
-      middleman-core (= 3.0.14)
-      padrino-helpers (= 0.10.7)
-      sass (>= 3.1.20)
-      uglifier (~> 1.2.6)
-    middleman-sprockets (3.1.1)
+    middleman-more (3.1.4)
+    middleman-sprockets (3.1.4)
       middleman-core (>= 3.0.14)
-      padrino-helpers (= 0.10.7)
+      middleman-more (>= 3.0.14)
       sprockets (~> 2.1)
       sprockets-helpers (~> 1.0.0)
       sprockets-sass (~> 1.0.0)
-    multi_json (1.7.6)
-    padrino-core (0.10.7)
-      activesupport (~> 3.2.0)
-      http_router (~> 0.10.2)
-      sinatra (~> 1.3.1)
-      thor (~> 0.15.2)
-      tilt (~> 1.3.0)
-    padrino-helpers (0.10.7)
-      i18n (~> 0.6)
-      padrino-core (= 0.10.7)
-    rack (1.4.5)
+    multi_json (1.7.8)
+    rack (1.5.2)
     rack-livereload (0.3.15)
       rack
-    rack-protection (1.5.0)
-      rack
     rack-test (0.6.2)
       rack (>= 1.0)
     rb-fsevent (0.9.3)
+    rb-inotify (0.9.0)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.0)
+      ffi (>= 0.5.0)
     sass (3.2.9)
-    sinatra (1.3.6)
-      rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
     sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -102,19 +93,16 @@ GEM
     sprockets-sass (1.0.1)
       sprockets (~> 2.0)
       tilt (~> 1.1)
-    syntax (1.0.0)
-    thor (0.15.4)
+    thor (0.18.1)
     tilt (1.3.7)
-    uglifier (1.2.7)
+    uglifier (2.1.2)
       execjs (>= 0.3.0)
-      multi_json (~> 1.3)
-    url_mount (0.2.1)
-      rack
+      multi_json (~> 1.0, >= 1.0.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bootstrap-sass
-  middleman (~> 3.0.14)
-  middleman-livereload (~> 3.0.1)
+  bootstrap-sass!
+  middleman (~> 3.1.4)
+  middleman-livereload (~> 3.1.0)

LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2013 lab2023 - internet technologies
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,9 +1,11 @@
 # Hierapolis
 
-This is yet an other private admin template which base on Twitter Bootstrap with Sass.
+This is yet an other private admin template which base on Twitter Bootstrap 3 with Sass and Compass.
 
 **Hierapolis** Hierapolis (Greek: Ἱεράπολις 'sacred city') was an ancient Greco-Roman city in Phrygia located on hot springs in southwest Anatolia. Its ruins are adjacent to modern Pamukkale, Turkey.
 
+NOTE: Don't use this theme until v1.0.0
+
 ## Requirements
 
 TODO
@@ -14,7 +16,7 @@ TODO
 
 ## What Hierapolis included?
 
-* [Bootstrap](http://twitter.github.com/bootstrap/)
+* [Bootstrap 3](http://getbootstrap.com/)
 
 ## Bugs and  Feedback
 
@@ -36,10 +38,10 @@ Once you've made your great commits:
 
 Hierapolis is maintained and funded by [lab2023 - internet technologies](http://lab2023.com/)
 
-Thank you to all the [contributors!](https://github.com/lab2023/hierapolis/graphs/contributors)
+Thank you to all the [contributors!](https://github.com/kebab-project/hierapolis/graphs/contributors)
 
 The names and logos for lab2023 are trademarks of lab2023, inc.
 
 ## License
 
-Copyright 2012 lab2023 – internet technologies
+Copyright 2013 lab2023 – internet technologies

VERSION.txt

@@ -1 +1 @@
-0.1.0
+0.3.0

config.rb

@@ -63,6 +63,7 @@
 #   end
 # end
 
+set :fonts_dir, 'assets/fonts'
 set :css_dir, 'assets/stylesheets'
 set :js_dir, 'assets/javascripts'
 set :images_dir, 'assets/images'