From ee2583e1b5df301cf1124f1c528fe778af8ffb3e Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 26 Jan 2012 09:51:11 +0200 Subject: [PATCH] boostrap scss gem --- Gemfile | 1 + Gemfile.lock | 10 ++++++---- app/assets/stylesheets/common.scss | 6 ++++++ app/assets/stylesheets/style.scss | 4 ---- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index b80dca11..be2dcbad 100644 --- a/Gemfile +++ b/Gemfile @@ -28,6 +28,7 @@ gem "resque" gem "httparty" gem "charlock_holmes" gem "foreman" +gem 'bootstrap-sass' group :assets do gem "sass-rails", "~> 3.1.0" diff --git a/Gemfile.lock b/Gemfile.lock index ec171d2c..eabe1540 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -67,6 +67,8 @@ GEM awesome_print (0.4.0) bcrypt-ruby (3.0.1) blankslate (2.1.2.4) + bootstrap-sass (1.4.4) + sass-rails (~> 3.1) builder (3.0.0) capybara (1.1.2) mime-types (>= 1.16) @@ -214,12 +216,11 @@ GEM blankslate (>= 2.1.2.3) ffi (~> 1.0.7) rubyzip (0.9.4) - sass (3.1.10) - sass-rails (3.1.4) + sass (3.1.12) + sass-rails (3.1.5) actionpack (~> 3.1.0) railties (~> 3.1.0) - sass (>= 3.1.4) - sprockets (~> 2.0.0) + sass (~> 3.1.10) tilt (~> 1.3.2) seed-fu (2.1.0) activerecord (~> 3.1.0) @@ -287,6 +288,7 @@ DEPENDENCIES autotest autotest-rails awesome_print + bootstrap-sass capybara carrierwave charlock_holmes diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 518d56f0..9edcee93 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1,3 +1,5 @@ +@import "bootstrap"; + $text_color:#222; $lite_text_color: #666; $link_color:#111; @@ -10,6 +12,8 @@ $app_width:980px; $app_padding:20px; $bg_color: #FFF; $styled_border_color: #2FA0BB; +$color: "#4BB8D2"; +$blue_link: "#2fa0bb"; /** MIXINS **/ @mixin round-borders-bottom($radius) { @@ -98,8 +102,10 @@ body.collapsed { a { color: $link_color; + &:hover { text-decoration:none; } } + @import "style.scss"; @import "projects.css.scss"; @import "commits.css.scss"; diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss index 1c0ce0f1..41db5af3 100644 --- a/app/assets/stylesheets/style.scss +++ b/app/assets/stylesheets/style.scss @@ -70,10 +70,6 @@ td { vertical-align: top; } .container_4{width:98%;margin-left:1%;margin-right:1%}.grid_1,.grid_2,.grid_3,.grid_4{display:inline;float:left;position:relative;margin-left:1%;margin-right:1%}.alpha{margin-left:0}.omega{margin-right:0}.container_4 .grid_1{width:23.0%}.container_4 .grid_2{width:48.0%}.container_4 .grid_3{width:73.0%}.container_4 .grid_4{width:98.0%}.container_4 .prefix_1{padding-left:25.0%}.container_4 .prefix_2{padding-left:50.0%}.container_4 .prefix_3{padding-left:75.0%}.container_4 .suffix_1{padding-right:25.0%}.container_4 .suffix_2{padding-right:50.0%}.container_4 .suffix_3{padding-right:75.0%}.container_4 .push_1{left:25.0%}.container_4 .push_2{left:50.0%}.container_4 .push_3{left:75.0%}.container_4 .pull_1{left:-25.0%}.container_4 .pull_2{left:-50.0%}.container_4 .pull_3{left:-75.0%}.clear{clear:both;display:block;overflow:hidden;visibility:hidden;width:0;height:0}.clearfix:after{clear:both;content:' ';display:block;font-size:0;line-height:0;visibility:hidden;width:0;height:0}.clearfix{display:inline-block}* html .clearfix{height:1%}.clearfix{display:block} /* eo 960gs*/ -/* Vars */ -$color: "#4BB8D2"; -$blue_link: "#2fa0bb"; -/* eo Vars */ html{ -webkit-font-smoothing:antialiased; } body {