Browse Source

fix css assets (e wrong no of args 1 for 0)

pull/1/head
Nicolae Claudius 13 years ago
parent
commit
42bcf9ec9d
  1. 2
      Gemfile
  2. 6
      Gemfile.lock
  3. 2
      app/assets/javascripts/application.js.coffee
  4. 6
      app/assets/stylesheets/application.css.scss
  5. 3
      app/assets/stylesheets/theme/errors.css.scss

2
Gemfile

@ -39,7 +39,7 @@ group :assets do
gem 'coffee-rails', "~> 3.2.1"
gem 'uglifier', '>= 1.0.3'
gem 'therubyracer'
gem 'bootstrap-sass-rails', '~> 2.0.0.2'
gem 'bootstrap-sass', '~> 2.0.1'
end
gem 'jquery-rails'

6
Gemfile.lock

@ -50,9 +50,7 @@ GEM
addressable (2.2.7)
arel (3.0.2)
bcrypt-ruby (3.0.1)
bootstrap-sass-rails (2.0.0.3)
rails (~> 3.1)
sass-rails (~> 3.1)
bootstrap-sass (2.0.2)
builder (3.0.0)
cancan (1.6.7)
capistrano (2.9.0)
@ -273,7 +271,7 @@ DEPENDENCIES
active-model-email-validator (~> 1.0.2)
active_scaffold (~> 3.2.3)
acts_as_nested_interval (~> 0.0.5)
bootstrap-sass-rails (~> 2.0.0.2)
bootstrap-sass (~> 2.0.1)
cancan (~> 1.6.7)
capistrano (~> 2.9.0)
capistrano-ext (~> 1.2.1)

2
app/assets/javascripts/application.js.coffee

@ -11,7 +11,7 @@
#= require pjax/page_triggers
#= require active_scaffold
#= require slides
#= require twitter/bootstrap
#= require bootstrap
#= require_self
$ ->

6
app/assets/stylesheets/application.css.scss

@ -4,7 +4,6 @@
* the top of the compiled file, but it's generally better to create a new file per style scope.
*= require_self
*= require theme/errors
*= require theme/logo
*= require theme/layout
*= require pages/domains
@ -13,8 +12,9 @@
*= require slides
*/
@import "twitter/bootstrap";
@import "twitter/bootstrap/responsive";
@import "bootstrap";
@import "bootstrap-responsive";
@import "active_scaffold";
@import "theme/overrides";
@import "theme/errors";

3
app/assets/stylesheets/theme/errors.css.scss

@ -1,7 +1,4 @@
@import 'compass/css3/border-radius';
@import 'twitter/bootstrap/variables';
@import 'twitter/bootstrap/alerts';
#error_explanation {
@extend .alert;

Loading…
Cancel
Save