Merge pull request #404 from pulibrary/revert-401-issue/287-update-he…

…ader Revert "Update header and footer to match orangelight"
pulibrary · Jul 24, 2018 · 38a3e55 · 38a3e55
2 parents 1f01eff + 751d833
commit 38a3e55
Show file tree

Hide file tree

Showing 29 changed files with 10 additions and 7,175 deletions.
diff --git a/app/assets/images/facebook.png b/app/assets/images/facebook.png
diff --git a/app/assets/images/facebook.svg b/app/assets/images/facebook.svg
diff --git a/app/assets/images/friends.png b/app/assets/images/friends.png
diff --git a/app/assets/images/friends.svg b/app/assets/images/friends.svg
diff --git a/app/assets/images/govdocs.png b/app/assets/images/govdocs.png
diff --git a/app/assets/images/govdocs.svg b/app/assets/images/govdocs.svg
diff --git a/app/assets/images/pu.png b/app/assets/images/pu.png
diff --git a/app/assets/images/pu.svg b/app/assets/images/pu.svg
diff --git a/app/assets/images/pul-logo-new.svg b/app/assets/images/pul-logo-new.svg
diff --git a/app/assets/images/twitter.png b/app/assets/images/twitter.png
diff --git a/app/assets/images/twitter.svg b/app/assets/images/twitter.svg
diff --git a/app/assets/images/up-arrow.svg b/app/assets/images/up-arrow.svg
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -11,7 +11,6 @@
 
 @import 'application_variables';
 @import 'spotlight/variables_bootstrap';
-@import 'variables/variables_bootstrap';
 @import 'bootstrap-sprockets';
 @import 'bootstrap';
 @import 'sir-trevor/main';
@@ -20,23 +19,7 @@
 @import 'spotlight/spotlight';
 
 @import 'normalize-rails';
-
-@import 'mixins';
-@import 'header';
-@import 'footer';
-
-body {
-  background-color: $masthead-bg;
-}
-
-.masthead {
-  margin-bottom: 0px;
-}
-
-#main-content {
-  background-color: $white;
-  padding-top: 15px;
-}
+@import 'pul-assets';
 
 .viewer {
   height: 400px;

diff --git a/app/assets/stylesheets/footer.scss b/app/assets/stylesheets/footer.scss