Skip to content

Commit

Permalink
Adding haml and bootstrap
Browse files Browse the repository at this point in the history
  • Loading branch information
MohamedBrary committed May 7, 2017
1 parent 3caf956 commit c079391
Show file tree
Hide file tree
Showing 17 changed files with 1,050 additions and 28 deletions.
4 changes: 4 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,7 @@ end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

# haml and bootstrap
gem 'haml-rails'
gem 'bootstrap-generators'
23 changes: 23 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ GEM
tzinfo (~> 1.1)
arel (8.0.0)
bindex (0.5.0)
bootstrap-generators (3.3.4)
railties (>= 3.1.0)
builder (3.2.3)
byebug (9.0.6)
coffee-rails (4.2.1)
Expand All @@ -51,10 +53,25 @@ GEM
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
erubi (1.6.0)
erubis (2.7.0)
execjs (2.7.0)
ffi (1.9.18)
globalid (0.4.0)
activesupport (>= 4.2.0)
haml (5.0.1)
temple (>= 0.8.0)
tilt
haml-rails (1.0.0)
actionpack (>= 4.0.1)
activesupport (>= 4.0.1)
haml (>= 4.0.6, < 6.0)
html2haml (>= 1.0.1)
railties (>= 4.0.1)
html2haml (2.2.0)
erubis (~> 2.7.0)
haml (>= 4.0, < 6)
nokogiri (>= 1.6.0)
ruby_parser (~> 3.5)
i18n (0.8.1)
jbuilder (2.6.3)
activesupport (>= 3.0.0, < 5.2)
Expand Down Expand Up @@ -110,13 +127,16 @@ GEM
rb-inotify (0.9.8)
ffi (>= 0.5.0)
ruby_dep (1.5.0)
ruby_parser (3.9.0)
sexp_processor (~> 4.1)
sass (3.4.23)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sexp_processor (4.9.0)
spring (2.0.1)
activesupport (>= 4.2)
spring-watcher-listen (2.0.1)
Expand All @@ -129,6 +149,7 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
temple (0.8.0)
thor (0.19.4)
thread_safe (0.3.6)
tilt (2.0.7)
Expand All @@ -152,8 +173,10 @@ PLATFORMS
ruby

DEPENDENCIES
bootstrap-generators
byebug
coffee-rails (~> 4.2)
haml-rails
jbuilder (~> 2.5)
listen (>= 3.0.5, < 3.2)
mysql2 (>= 0.3.18, < 0.5)
Expand Down
1 change: 1 addition & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@
//
//= require rails-ujs
//= require turbolinks
//= require bootstrap
//= require_tree .
23 changes: 23 additions & 0 deletions app/assets/stylesheets/bootstrap-generators.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
@import "bootstrap-variables.scss";
@import "bootstrap-sprockets.scss";
@import "bootstrap.scss";

body {
padding-top: $navbar-height + 10px;
}

.page-header {
a.btn {
float: right;
}

a.btn + a.btn {
margin-right: 8px;
}
}

input[type="radio"], input[type="checkbox"] {
width: initial;
height: initial;
margin-top: 7px;
}
Loading

0 comments on commit c079391

Please sign in to comment.