Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ gem 'bootstrap-sass'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'

# Compass stylesheets
gem 'compass-rails'

# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
Expand Down
16 changes: 0 additions & 16 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -121,26 +121,11 @@ GEM
cheat (1.3.3)
pager (~> 1.0)
choice (0.2.0)
chunky_png (1.4.0)
codeclimate-test-reporter (1.0.9)
simplecov (<= 0.13)
codecov (0.2.12)
json
simplecov
compass (1.0.3)
chunky_png (~> 1.2)
compass-core (~> 1.0.2)
compass-import-once (~> 1.0.5)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
sass (>= 3.3.13, < 3.5)
compass-core (1.0.3)
multi_json (~> 1.0)
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
compass-rails (2.0.1)
compass (~> 1.0.0)
concurrent-ruby (1.1.8)
crass (1.0.6)
daemons (1.3.1)
Expand Down Expand Up @@ -541,7 +526,6 @@ DEPENDENCIES
cheat
codeclimate-test-reporter
codecov
compass-rails
database_cleaner
deep_cloneable
doorkeeper
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/bootstrap_and_overrides.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
button.standard, input[type='submit'].standard {
@extend .btn;
@extend .btn-primary;
@include border-radius(0px);
border-radius: 0;
&:hover, &:focus {
color: white;
}
Expand Down
2 changes: 0 additions & 2 deletions app/assets/stylesheets/common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,3 @@
@import "common_dimensions";
@import "common_misc";
@import "common_body_margins";
@import "compass/css3";
@import "compass/utilities";
6 changes: 2 additions & 4 deletions app/assets/stylesheets/exercise_edit_app.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import "common";
@import "compass/css3/opacity";
@import "compass/css3/user-interface";

$edit_app_light_gray: lighten($os_gray,50%);

Expand Down Expand Up @@ -59,7 +57,7 @@ $edit_app_light_gray: lighten($os_gray,50%);
}

.gray-out {
@include opacity(0.2);
opacity: 0.2;
}

.question {
Expand Down Expand Up @@ -254,4 +252,4 @@ $edit_app_light_gray: lighten($os_gray,50%);
}
}

}
}
6 changes: 2 additions & 4 deletions app/assets/stylesheets/layouts/application_top_nav.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import "common";
@import "compass/css3";
@import "compass/utilities";

#top-nav-frame {
height: $application_top_nav_height;
Expand All @@ -20,7 +18,7 @@
float: right;
font-size:11px;
border: none;
@include border-radius(0px);
border-radius: 0px;
background: 186px 5px image-url('search_lens.png') no-repeat rgb(234,232,232) ;
}

Expand Down Expand Up @@ -102,4 +100,4 @@
vertical-align: middle;
}

}
}
4 changes: 2 additions & 2 deletions app/assets/stylesheets/lists.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
background-color: white;
border: 1px solid $os_light_gray;
padding: 15px;
@include border-radius(5px);
border-radius: 5px;

a.btn-sm {
color: white;
@include border-radius(0px);
border-radius: 0px;
float: right;
display: none;
margin-top: -4px;
Expand Down
3 changes: 0 additions & 3 deletions config/initializers/assets.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,3 @@
# application.js, application.css, and all non-JS/CSS in the app/assets
# folder are already added.
Rails.application.config.assets.precompile += %w( admin.js admin.css )
Rails.application.config.assets.paths.concat(
Compass::Frameworks::ALL.map { |f| f.stylesheets_directory }
)