Skip to content

Hierapolis Build #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Hierapolis Build #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c0638e
Build middeman, edit head and foot, change js load order, removed htm…
coskuntekin Jan 22, 2015
4bd5704
gitignore change are reverted and build folder removed
coskuntekin Jan 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
# the following line to use "https"
source 'http://rubygems.org'

gem 'middleman', '~>3.3.3'
gem 'middleman', '~>3.3.7'

# Live-reloading plugin
gem 'middleman-livereload', '~> 3.1.0'
gem 'middleman-livereload', '~> 3.4.2'

# Middleman-sprockets
gem 'middleman-sprockets', '3.3.2'
gem 'middleman-sprockets', '3.4.1'

# Middleman-deploy
gem 'middleman-deploy', '~> 0.2.4'
gem 'middleman-deploy', '~> 1.0.0'

# For faster file watcher updates on Windows:
gem 'wdm', '~> 0.1.0', :platforms => [:mswin, :mingw]
Expand All @@ -20,7 +20,7 @@ gem 'wdm', '~> 0.1.0', :platforms => [:mswin, :mingw]
gem 'tzinfo-data', platforms: [:mswin, :mingw]

# Compass
gem 'compass', '~> 0.12.6'
gem 'compass', '~> 1.0.3'

# Twitter Bootstrap
gem 'bootstrap-sass', '~> 3.1.1.1'
gem 'bootstrap-sass', '~> 3.3.3'
134 changes: 72 additions & 62 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,135 +1,145 @@
GEM
remote: http://rubygems.org/
specs:
activesupport (4.1.1)
activesupport (4.1.9)
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.3.1)
coffee-script (2.2.0)
autoprefixer-rails (5.0.0.1)
execjs
bootstrap-sass (3.3.3)
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.2.19)
celluloid (0.16.0)
timers (~> 4.0.0)
chunky_png (1.3.3)
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.7.0)
compass (0.12.6)
coffee-script-source (1.8.0)
compass (1.0.3)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.2.19)
compass-import-once (1.0.4)
compass-core (~> 1.0.2)
compass-import-once (~> 1.0.5)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
sass (>= 3.3.13, < 3.5)
compass-core (1.0.3)
multi_json (~> 1.0)
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.1.0)
ffi (1.9.3)
fssm (0.2.10)
haml (4.0.5)
eventmachine (1.0.4)
execjs (2.2.2)
ffi (1.9.6)
haml (4.0.6)
tilt
hike (1.2.3)
hitimes (1.2.2)
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)
i18n (0.6.11)
json (1.8.2)
kramdown (1.5.0)
listen (2.8.5)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
rb-kqueue (>= 0.2)
middleman (3.3.3)
coffee-script (~> 2.2.0)
compass (>= 0.12.4)
compass-import-once (= 1.0.4)
middleman (3.3.7)
coffee-script (~> 2.2)
compass (>= 1.0.0, < 2.0.0)
compass-import-once (= 1.0.5)
execjs (~> 2.0)
haml (>= 4.0.5)
kramdown (~> 1.2)
middleman-core (= 3.3.3)
middleman-core (= 3.3.7)
middleman-sprockets (>= 3.1.2)
sass (>= 3.2.17, < 4.0)
sass (>= 3.4.0, < 4.0)
uglifier (~> 2.5)
middleman-core (3.3.3)
middleman-core (3.3.7)
activesupport (~> 4.1.0)
bundler (~> 1.1)
erubis
hooks (~> 0.3)
i18n (~> 0.6.9)
listen (~> 1.1)
padrino-helpers (~> 0.12.1)
listen (>= 2.7.9, < 3.0)
padrino-helpers (~> 0.12.3)
rack (>= 1.4.5, < 2.0)
rack-test (~> 0.6.2)
thor (>= 0.15.2, < 2.0)
tilt (~> 1.4.1, < 2.0)
middleman-deploy (0.2.4)
middleman-core (>= 3.0.0)
middleman-deploy (1.0.0)
middleman-core (>= 3.2)
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.3.2)
middleman-core (>= 3.2)
sprockets (~> 2.2)
middleman-livereload (3.4.2)
em-websocket (~> 0.5.1)
middleman-core (>= 3.3)
rack-livereload (~> 0.3.15)
middleman-sprockets (3.4.1)
middleman-core (>= 3.3)
sprockets (~> 2.12.1)
sprockets-helpers (~> 1.1.0)
sprockets-sass (~> 1.0.0)
minitest (5.3.4)
sprockets-sass (~> 1.3.0)
minitest (5.5.1)
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)
net-ssh (2.9.2)
padrino-helpers (0.12.4)
i18n (~> 0.6, >= 0.6.7)
padrino-support (= 0.12.2)
padrino-support (= 0.12.4)
tilt (~> 1.4.1)
padrino-support (0.12.2)
padrino-support (0.12.4)
activesupport (>= 3.1)
ptools (1.2.4)
ptools (1.3.2)
rack (1.5.2)
rack-livereload (0.3.15)
rack
rack-test (0.6.2)
rack-test (0.6.3)
rack (>= 1.0)
rb-fsevent (0.9.4)
rb-inotify (0.9.4)
ffi (>= 0.5.0)
rb-kqueue (0.2.3)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
sass (3.2.19)
sprockets (2.12.1)
sass (3.4.10)
sprockets (2.12.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-helpers (1.1.0)
sprockets (~> 2.0)
sprockets-sass (1.0.3)
sprockets-sass (1.3.1)
sprockets (~> 2.0)
tilt (~> 1.1)
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
tzinfo (1.2.1)
timers (4.0.1)
hitimes
tzinfo (1.2.2)
thread_safe (~> 0.1)
uber (0.0.6)
uglifier (2.5.0)
uber (0.0.13)
uglifier (2.7.0)
execjs (>= 0.3.0)
json (>= 1.8.0)

PLATFORMS
ruby

DEPENDENCIES
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)
bootstrap-sass (~> 3.3.3)
compass (~> 1.0.3)
middleman (~> 3.3.7)
middleman-deploy (~> 1.0.0)
middleman-livereload (~> 3.4.2)
middleman-sprockets (= 3.4.1)
tzinfo-data
wdm (~> 0.1.0)
1 change: 1 addition & 0 deletions source/assets/javascripts/application.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#= require bootstrap
#= require_tree
####if modernizr added dont need html5shiv (http://modernizr.com/docs)

$(document).ready ->

Expand Down
8 changes: 0 additions & 8 deletions source/assets/javascripts/vendor/html5shiv.js
View file
Open in desktop

This file was deleted.

12 changes: 7 additions & 5 deletions source/assets/stylesheets/application.css.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ body.main
//+background-image(linear-gradient(left, $body-bg-primary, $body-bg-secondary))

.sprite-image
background-image: url(../images/sprite.png)
background-image: image_url('sprite.png')

form
.form-actions
Expand Down Expand Up @@ -87,7 +87,8 @@ form
span.badge
font-size: .7em
padding: 2px 4px
.label, .badge
.label,
.badge
margin-right: 5px
margin-top: 4px
padding-bottom: 4px
Expand Down Expand Up @@ -152,7 +153,8 @@ form
+box-shadow(0 0 0 2px $box-shadow-color)
overflow: hidden

#content, #sidebar
#content,
#sidebar
position: absolute
top: 0
bottom: 0
Expand Down Expand Up @@ -289,9 +291,9 @@ form
@extend .sprite-image
position: absolute
bottom: 5px
background-position: 0 0
width: 12px
height: 24px
margin-left: 33px
background-position: 0 0
background-size: 100px
background-repeat: no-repeat
margin-left: 33px
7 changes: 7 additions & 0 deletions source/layouts/layout.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@
= stylesheet_link_tag 'application',
'//netdna.bootstrapcdn.com/font-awesome/3.2.0/css/font-awesome.min.css'

//modernizr must be on head
= javascript_include_tag '//cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js'

//CSS3 media query work on IE9
/[if lt IE 9]
=javascript_include_tag 'https://cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.js'

= favicon_tag 'favicon.ico'

= yield_content :head
Expand Down
1 change: 0 additions & 1 deletion source/layouts/partials/_footer.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/ 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'
= yield_content :foot