Permalink
Browse files

Switched to sass version of twitter bootstrap

  • Loading branch information...
andrew committed Jun 9, 2013
1 parent 060e48c commit b4c99fd12011be46eb5cb21f2e827bd3bb7f56f1
Showing with 6 additions and 97 deletions.
  1. +1 −2 Gemfile
  2. +4 −13 Gemfile.lock
  3. +1 −0 app/assets/stylesheets/application.css
  4. +0 −82 app/assets/stylesheets/bootstrap_and_overrides.css.less
View
@@ -19,8 +19,7 @@ gem 'newrelic_rpm'
gem 'simplecov'
gem 'kaminari'
gem 'twitter'
-gem "less-rails"
-gem "twitter-bootstrap-rails"
+gem 'anjlab-bootstrap-rails', :require => 'bootstrap-rails'
gem 'simple_form'
gem 'rack-google-analytics'
View
@@ -29,6 +29,9 @@ GEM
i18n (= 0.6.1)
multi_json (~> 1.0)
addressable (2.3.4)
+ anjlab-bootstrap-rails (2.3.1.2)
+ railties (>= 3.0)
+ sass (>= 3.2)
arel (3.0.2)
brakeman (2.0.0)
erubis (~> 2.6)
@@ -69,7 +72,6 @@ GEM
execjs
coffee-script-source (1.6.2)
colorize (0.5.8)
- commonjs (0.2.6)
crack (0.4.0)
safe_yaml (~> 0.9.0)
daemons (1.1.9)
@@ -149,11 +151,6 @@ GEM
sprockets
launchy (2.3.0)
addressable (~> 2.3)
- less (2.3.2)
- commonjs (~> 0.2.6)
- less-rails (2.3.3)
- actionpack (>= 3.1)
- less (~> 2.3.1)
listen (1.1.6)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
@@ -323,11 +320,6 @@ GEM
faraday (~> 0.8, < 0.10)
multi_json (~> 1.0)
simple_oauth (~> 0.2)
- twitter-bootstrap-rails (2.2.7)
- actionpack (>= 3.1)
- execjs
- rails (>= 3.1)
- railties (>= 3.1)
tzinfo (0.3.37)
uglifier (2.1.1)
execjs (>= 0.3.0)
@@ -347,6 +339,7 @@ PLATFORMS
ruby
DEPENDENCIES
+ anjlab-bootstrap-rails
brakeman
bugsnag
capybara (= 2.0.2)
@@ -366,7 +359,6 @@ DEPENDENCIES
kaminari
konacha
launchy
- less-rails
memcachier
minitest (= 4.7.4)
newrelic_rpm
@@ -392,7 +384,6 @@ DEPENDENCIES
thin
timecop
twitter
- twitter-bootstrap-rails
uglifier
unicorn
webmock
@@ -9,5 +9,6 @@
* compiled file, but it's generally better to create a new file per style scope.
*
*= require_self
+ *= require twitter/bootstrap
*= require_tree .
*/
@@ -1,82 +0,0 @@
-@import "twitter/bootstrap/bootstrap";
-@import "twitter/bootstrap/responsive";
-
-// Set the correct sprite paths
-@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings");
-@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white");
-
-// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
-// Note: If you use asset_path() here, your compiled boostrap_and_overrides.css will not
-// have the proper paths. So for now we use the absolute path.
-@fontAwesomeEotPath: asset-path("fontawesome-webfont.eot");
-@fontAwesomeEotPath_iefix: asset-path("fontawesome-webfont.eot#iefix");
-@fontAwesomeWoffPath: asset-path("fontawesome-webfont.woff");
-@fontAwesomeTtfPath: asset-path("fontawesome-webfont.ttf");
-@fontAwesomeSvgPath: asset-path("fontawesome-webfont.svg");
-
-// Font Awesome
-@import "fontawesome";
-
-// Gives us our custom designed buttons
-@buttonRadius: 20px;
-@btnBorder: #c3c3c3;
-@btnBackground: #eaeaea;
-
-// Gives us our flat buttons
-.buttonBackgroundOverrides(@color, @textColor: #fff, @textShadow: 0 -1px 0 rgba(0,0,0,.25)) {
- .buttonBackground(@color, @color, @textColor, @textShadow);
-
- &:hover, &:active, &.active, &.disabled, &[disabled] {
- background-color: darken(@color, 5%);
- }
-}
-
-.btn {
- .border-radius(@buttonRadius);
- .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.9), 0 1px 0 rgba(0, 0, 0, .3)");
- .buttonBackgroundOverrides(@btnBackground, @grayDark, 0 1px 1px rgba(255,255,255,.75));
- text-shadow: 0 1px 0 #fff;
- padding: 7px 12px;
-
- &:hover {
- background-position: 0 -40px;
- }
-}
-
-.btn-large {
- padding: @paddingLarge;
- .border-radius(@buttonRadius*1.5);
-}
-
-.btn-small {
- padding: @paddingSmall;
- .border-radius(@buttonRadius/1.5);
-}
-
-
-.btn-primary {
- .buttonBackgroundOverrides(@btnPrimaryBackground);
-}
-.btn-warning {
- .buttonBackgroundOverrides(@btnWarningBackground);
-}
-.btn-danger {
- .buttonBackgroundOverrides(@btnDangerBackground);
-}
-.btn-success {
- .buttonBackgroundOverrides(@btnSuccessBackground);
-}
-.btn-info {
- .buttonBackgroundOverrides(@btnInfoBackground);
-}
-.btn-inverse {
- .buttonBackgroundOverrides(@btnInverseBackground);
-}
-
-h1, h2, h3, h4, h5, h6 {
- text-rendering: auto;
-}
-
-#spinner img {
- margin-top: 10px;
-}

0 comments on commit b4c99fd

Please sign in to comment.