Download as
Browse Code »

Commit ee2583e1b5df301cf1124f1c528fe778af8ffb3e

Authored by Dmitriy Zaporozhets
1 parent 15b1b515
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

boostrap scss gem

Showing 4 changed files with 13 additions and 8 deletions   Show diff stats
@@ -28,6 +28,7 @@ gem "resque" @@ -28,6 +28,7 @@ gem "resque"
28 gem "httparty" 28 gem "httparty"
29 gem "charlock_holmes" 29 gem "charlock_holmes"
30 gem "foreman" 30 gem "foreman"
  31 +gem 'bootstrap-sass'
31 32
32 group :assets do 33 group :assets do
33 gem "sass-rails", "~> 3.1.0" 34 gem "sass-rails", "~> 3.1.0"
@@ -67,6 +67,8 @@ GEM @@ -67,6 +67,8 @@ GEM
67 awesome_print (0.4.0) 67 awesome_print (0.4.0)
68 bcrypt-ruby (3.0.1) 68 bcrypt-ruby (3.0.1)
69 blankslate (2.1.2.4) 69 blankslate (2.1.2.4)
  70 + bootstrap-sass (1.4.4)
  71 + sass-rails (~> 3.1)
70 builder (3.0.0) 72 builder (3.0.0)
71 capybara (1.1.2) 73 capybara (1.1.2)
72 mime-types (>= 1.16) 74 mime-types (>= 1.16)
@@ -214,12 +216,11 @@ GEM @@ -214,12 +216,11 @@ GEM
214 blankslate (>= 2.1.2.3) 216 blankslate (>= 2.1.2.3)
215 ffi (~> 1.0.7) 217 ffi (~> 1.0.7)
216 rubyzip (0.9.4) 218 rubyzip (0.9.4)
217 - sass (3.1.10)  
218 - sass-rails (3.1.4) 219 + sass (3.1.12)
  220 + sass-rails (3.1.5)
219 actionpack (~> 3.1.0) 221 actionpack (~> 3.1.0)
220 railties (~> 3.1.0) 222 railties (~> 3.1.0)
221 - sass (>= 3.1.4)  
222 - sprockets (~> 2.0.0) 223 + sass (~> 3.1.10)
223 tilt (~> 1.3.2) 224 tilt (~> 1.3.2)
224 seed-fu (2.1.0) 225 seed-fu (2.1.0)
225 activerecord (~> 3.1.0) 226 activerecord (~> 3.1.0)
@@ -287,6 +288,7 @@ DEPENDENCIES @@ -287,6 +288,7 @@ DEPENDENCIES
287 autotest 288 autotest
288 autotest-rails 289 autotest-rails
289 awesome_print 290 awesome_print
  291 + bootstrap-sass
290 capybara 292 capybara
291 carrierwave 293 carrierwave
292 charlock_holmes 294 charlock_holmes
app/assets/stylesheets/common.scss
  Diff comments   View file @ee2583e
  1 +@import "bootstrap";
  2 +
1 $text_color:#222; 3 $text_color:#222;
2 $lite_text_color: #666; 4 $lite_text_color: #666;
3 $link_color:#111; 5 $link_color:#111;
@@ -10,6 +12,8 @@ $app_width:980px; @@ -10,6 +12,8 @@ $app_width:980px;
10 $app_padding:20px; 12 $app_padding:20px;
11 $bg_color: #FFF; 13 $bg_color: #FFF;
12 $styled_border_color: #2FA0BB; 14 $styled_border_color: #2FA0BB;
  15 +$color: "#4BB8D2";
  16 +$blue_link: "#2fa0bb";
13 17
14 /** MIXINS **/ 18 /** MIXINS **/
15 @mixin round-borders-bottom($radius) { 19 @mixin round-borders-bottom($radius) {
@@ -98,8 +102,10 @@ body.collapsed { @@ -98,8 +102,10 @@ body.collapsed {
98 102
99 a { 103 a {
100 color: $link_color; 104 color: $link_color;
  105 + &:hover { text-decoration:none; }
101 } 106 }
102 107
  108 +
103 @import "style.scss"; 109 @import "style.scss";
104 @import "projects.css.scss"; 110 @import "projects.css.scss";
105 @import "commits.css.scss"; 111 @import "commits.css.scss";
app/assets/stylesheets/style.scss
  Diff comments   View file @ee2583e
@@ -70,10 +70,6 @@ td { vertical-align: top; } @@ -70,10 +70,6 @@ td { vertical-align: top; }
70 .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} 70 .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}
71 /* eo 960gs*/ 71 /* eo 960gs*/
72 72
73 -/* Vars */  
74 -$color: "#4BB8D2";  
75 -$blue_link: "#2fa0bb";  
76 -/* eo Vars */  
77 73
78 html{ -webkit-font-smoothing:antialiased; } 74 html{ -webkit-font-smoothing:antialiased; }
79 body { 75 body {