From e4d8c6e1e6f6fa2ca746ef22378f9c87a8d28aea Mon Sep 17 00:00:00 2001
From: Axa Mei Liauw <aliauw@princeton.edu>
Date: Wed, 16 Mar 2016 14:55:55 -0400
Subject: [PATCH] Clean up styles files

---
 app/assets/stylesheets/application.scss       | 35 ++++++++++---------
 app/assets/stylesheets/blacklight.css.scss    |  5 ---
 .../stylesheets/blacklight_gallery.css.scss   |  3 --
 .../stylesheets/blacklight_oembed.css.scss    |  0
 app/assets/stylesheets/openseadragon.css      |  3 --
 app/assets/stylesheets/spotlight.scss         | 11 ------
 app/assets/stylesheets/viewer.scss            |  6 ----
 7 files changed, 18 insertions(+), 45 deletions(-)
 delete mode 100644 app/assets/stylesheets/blacklight.css.scss
 delete mode 100644 app/assets/stylesheets/blacklight_gallery.css.scss
 delete mode 100644 app/assets/stylesheets/blacklight_oembed.css.scss
 delete mode 100644 app/assets/stylesheets/openseadragon.css
 delete mode 100644 app/assets/stylesheets/spotlight.scss
 delete mode 100644 app/assets/stylesheets/viewer.scss

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 11a08636..c8852886 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -1,20 +1,21 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any styles
- * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
- * file per style scope.
- *
- *= require_tree .
- *= require normalize-rails
- *= require_self
- */
+@import 'bootstrap-tagsinput';
+@import 'jquery.jcrop';
+@import 'bootstrap-sprockets';
+@import 'utils/variables__bootstrap'; // pul bootstrap variables override
+@import 'sir-trevor';
+@import 'sir-trevor-icons';
+@import 'bootstrap';
+@import 'openseadragon/openseadragon';
+@import 'blacklight/blacklight';
+@import 'blacklight_gallery/default';
+@import 'spotlight/spotlight';
 
+@import 'normalize-rails';
 @import 'pul-assets';
 
-@import 'utils/variables__bootstrap';
+.viewer {
+  height: 400px;
+  iframe {
+    position: absolute;
+  }
+}
diff --git a/app/assets/stylesheets/blacklight.css.scss b/app/assets/stylesheets/blacklight.css.scss
deleted file mode 100644
index 3519d906..00000000
--- a/app/assets/stylesheets/blacklight.css.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@import 'bootstrap-sprockets';
-
-@import 'bootstrap';
-
-@import 'blacklight/blacklight';
diff --git a/app/assets/stylesheets/blacklight_gallery.css.scss b/app/assets/stylesheets/blacklight_gallery.css.scss
deleted file mode 100644
index 19af6827..00000000
--- a/app/assets/stylesheets/blacklight_gallery.css.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
- *= require blacklight_gallery/default
- */
\ No newline at end of file
diff --git a/app/assets/stylesheets/blacklight_oembed.css.scss b/app/assets/stylesheets/blacklight_oembed.css.scss
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/assets/stylesheets/openseadragon.css b/app/assets/stylesheets/openseadragon.css
deleted file mode 100644
index c1efc39f..00000000
--- a/app/assets/stylesheets/openseadragon.css
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
- *= require openseadragon/openseadragon
- */
\ No newline at end of file
diff --git a/app/assets/stylesheets/spotlight.scss b/app/assets/stylesheets/spotlight.scss
deleted file mode 100644
index 8d846864..00000000
--- a/app/assets/stylesheets/spotlight.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
-*= require social-share-button
-*= require bootstrap-tagsinput
-*= require jquery.jcrop
-*/
-@import 'spotlight/variables_bootstrap';
-@import 'bootstrap-sprockets';
-@import 'sir-trevor';
-@import 'sir-trevor-icons';
-@import 'bootstrap';
-@import 'spotlight/spotlight';
diff --git a/app/assets/stylesheets/viewer.scss b/app/assets/stylesheets/viewer.scss
deleted file mode 100644
index 2016d881..00000000
--- a/app/assets/stylesheets/viewer.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-.viewer {
-  height: 400px;
-  iframe {
-    position: absolute;
-  }
-}