Merge pull request #309 from openstax/rm-compass

remove compass
openstax · Feb 4, 2021 · 9f607aa · 9f607aa
2 parents 262809a + f9bb20b
commit 9f607aa
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 34 deletions.
diff --git a/Gemfile b/Gemfile
@@ -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'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -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)
@@ -541,7 +526,6 @@ DEPENDENCIES
   cheat
   codeclimate-test-reporter
   codecov
-  compass-rails
   database_cleaner
   deep_cloneable
   doorkeeper

diff --git a/app/assets/stylesheets/bootstrap_and_overrides.scss b/app/assets/stylesheets/bootstrap_and_overrides.scss
@@ -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;
   }

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
@@ -5,5 +5,3 @@
 @import "common_dimensions";
 @import "common_misc";
 @import "common_body_margins";  
-@import "compass/css3";
-@import "compass/utilities";
diff --git a/app/assets/stylesheets/exercise_edit_app.scss b/app/assets/stylesheets/exercise_edit_app.scss
@@ -1,6 +1,4 @@
 @import "common";
-@import "compass/css3/opacity";
-@import "compass/css3/user-interface";
 
 $edit_app_light_gray: lighten($os_gray,50%);
 
@@ -59,7 +57,7 @@ $edit_app_light_gray: lighten($os_gray,50%);
   }
 
   .gray-out {
-    @include opacity(0.2);
+    opacity: 0.2;
   }
 
   .question {
@@ -254,4 +252,4 @@ $edit_app_light_gray: lighten($os_gray,50%);
       }
   }
 
-}
+}
diff --git a/app/assets/stylesheets/layouts/application_top_nav.scss b/app/assets/stylesheets/layouts/application_top_nav.scss
@@ -1,6 +1,4 @@
 @import "common";
-@import "compass/css3";
-@import "compass/utilities";
 
 #top-nav-frame {
   height: $application_top_nav_height;
@@ -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) ;
   }
 
@@ -102,4 +100,4 @@
     vertical-align: middle; 
   }
 
-}
+}
diff --git a/app/assets/stylesheets/lists.scss b/app/assets/stylesheets/lists.scss
@@ -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;

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
@@ -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 }
-)