deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

boostrap scss gem

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-01-26 09:51:11 +02:00
parent 15b1b51524
commit ee2583e1b5
4 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -28,6 +28,7 @@ gem "resque"
gem "httparty" gem "httparty"
gem "charlock_holmes" gem "charlock_holmes"
gem "foreman" gem "foreman"
gem 'bootstrap-sass'
group :assets do group :assets do
gem "sass-rails", "~> 3.1.0" gem "sass-rails", "~> 3.1.0"

10
Gemfile.lock
View file

@ -67,6 +67,8 @@ GEM
awesome_print (0.4.0) awesome_print (0.4.0)
bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1)
blankslate (2.1.2.4) blankslate (2.1.2.4)
bootstrap-sass (1.4.4)
sass-rails (~> 3.1)
builder (3.0.0) builder (3.0.0)
capybara (1.1.2) capybara (1.1.2)
mime-types (>= 1.16) mime-types (>= 1.16)
@ -214,12 +216,11 @@ GEM
blankslate (>= 2.1.2.3) blankslate (>= 2.1.2.3)
ffi (~> 1.0.7) ffi (~> 1.0.7)
rubyzip (0.9.4) rubyzip (0.9.4)
sass (3.1.10) sass (3.1.12)
sass-rails (3.1.4) sass-rails (3.1.5)
actionpack (~> 3.1.0) actionpack (~> 3.1.0)
railties (~> 3.1.0) railties (~> 3.1.0)
sass (>= 3.1.4) sass (~> 3.1.10)
sprockets (~> 2.0.0)
tilt (~> 1.3.2) tilt (~> 1.3.2)
seed-fu (2.1.0) seed-fu (2.1.0)
activerecord (~> 3.1.0) activerecord (~> 3.1.0)
@ -287,6 +288,7 @@ DEPENDENCIES
autotest autotest
autotest-rails autotest-rails
awesome_print awesome_print
bootstrap-sass
capybara capybara
carrierwave carrierwave
charlock_holmes charlock_holmes

6
app/assets/stylesheets/common.scss
View file

@ -1,3 +1,5 @@
@import "bootstrap";
$text_color:#222; $text_color:#222;
$lite_text_color: #666; $lite_text_color: #666;
$link_color:#111; $link_color:#111;
@ -10,6 +12,8 @@ $app_width:980px;
$app_padding:20px; $app_padding:20px;
$bg_color: #FFF; $bg_color: #FFF;
$styled_border_color: #2FA0BB; $styled_border_color: #2FA0BB;
$color: "#4BB8D2";
$blue_link: "#2fa0bb";
/** MIXINS **/ /** MIXINS **/
@mixin round-borders-bottom($radius) { @mixin round-borders-bottom($radius) {
@ -98,8 +102,10 @@ body.collapsed {
a { a {
color: $link_color; color: $link_color;
&:hover { text-decoration:none; }
} }
@import "style.scss"; @import "style.scss";
@import "projects.css.scss"; @import "projects.css.scss";
@import "commits.css.scss"; @import "commits.css.scss";

4
app/assets/stylesheets/style.scss
View file

@ -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} .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*/ /* eo 960gs*/
/* Vars */
$color: "#4BB8D2";
$blue_link: "#2fa0bb";
/* eo Vars */
html{ -webkit-font-smoothing:antialiased; } html{ -webkit-font-smoothing:antialiased; }
body { body {