Changed sidebar color and got everything ready for production minus t…

…he new logo
rfrowe · Sep 1, 2016 · c2cbc05 · c2cbc05
1 parent 00d7a13
commit c2cbc05
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 16 deletions.
diff --git a/public_html/css/materialize.css b/public_html/css/materialize.css
diff --git a/public_html/css/materialize/_custom.scss b/public_html/css/materialize/_custom.scss
@@ -140,20 +140,21 @@
     border-bottom-right-radius: 2px;
   }
   .collapsible-header {
-    background-color: lighten($primary-color, 30%);
+    background-color: color("grey", "lighten-3");
+    //color: #FFF;
 
     a {
       background-color: #FFF;
-      color: $secondary-color;
+      color: lighten($secondary-color, 10%);
     }
   }
   .collapsible-body {
-    background-color: color("grey", "lighten-4");
+    background-color: color("grey", "lighten-5");
   }
 
   a {
     @media #{$medium-and-down} {
-      width: auto;
+      width: auto !important;
     }
     overflow: hidden;
     -webkit-user-select: none;
@@ -169,4 +170,8 @@
       }
     }
   }
+}
+
+#icon {
+  fill: $primary-color;
 }
diff --git a/public_html/css/materialize/_sideNav.scss b/public_html/css/materialize/_sideNav.scss
@@ -191,8 +191,6 @@
     .userView {
       padding: $sidenav-padding $sidenav-padding 0;
     }
-
-    background-color: lighten($footer-bg-color, 25%);
   }
 
   .side-nav {

diff --git a/public_html/css/materialize/_variables.scss b/public_html/css/materialize/_variables.scss
@@ -227,7 +227,7 @@ $navbar-brand-font-size: 2.1rem !default;
 
 $sidenav-font-size: 14px !default;
 $sidenav-font-color: rgba(0,0,0,.87) !default;
-$sidenav-bg-color: lighten($secondary-color, 50%) !default;
+$sidenav-bg-color: lighten($primary-color, 40%) !default;
 $sidenav-padding: 16px !default;
 $sidenav-item-height: 48px !default;
 
@@ -249,8 +249,8 @@ $spinner-default-color: $secondary-color !default;
 /* 17. Tabs
    ========================================================================== */
 
-$tabs-underline-color: $primary-color-light !default;
-$tabs-text-color: $primary-color !default;
+$tabs-underline-color: lighten($secondary-color, 15%); //$primary-color-light !default;
+$tabs-text-color: $secondary-color; //$primary-color !default;
 $tabs-bg-color: #fff !default;
 
 

diff --git a/public_html/css/style.css b/public_html/css/style.css
@@ -77,6 +77,7 @@ header {
 #icon {
     padding-top: 1em;
     padding-bottom: 1em;
+    visibility: hidden;
 }
 
 #nav-links {

diff --git a/public_html/files/header.html b/public_html/files/header.html
@@ -23,7 +23,7 @@
     </div> <!-- end .navbar-fixed -->
     <ul id="slidey-nav" class="side-nav fixed top-mobile row">
         <div id="icon" class="white center col s4 l12 valign-wrapper">
-            <img src="//placehold.it/500x500" class="container responsive-img circle">
+            <img src="/images/logo.svg" class="container responsive-img circle svg">
         </div>
         <div id="nav-links" class="col s8 l12 no-select">
             <li><a href="/">Home</a></li>

diff --git a/public_html/files/js/common.js b/public_html/files/js/common.js
@@ -89,4 +89,37 @@ target.addEventListener('touchmove', function(e){
         e.preventDefault();
     }
     last_y = e.changedTouches[0].pageY;
+});
+
+// Replace SVG with inline\
+$(function () {
+    jQuery('img.svg').each(function(){
+        var $img = jQuery(this);
+        var imgID = $img.attr('id');
+        var imgClass = $img.attr('class');
+        var imgURL = $img.attr('src');
+
+        jQuery.get(imgURL, function(data) {
+            // Get the SVG tag, ignore the rest
+            var $svg = jQuery(data).find('svg');
+
+            // Add replaced image's ID to the new SVG
+            if(typeof imgID !== 'undefined') {
+                $svg = $svg.attr('id', imgID);
+            }
+            // Add replaced image's classes to the new SVG
+            if(typeof imgClass !== 'undefined') {
+                $svg = $svg.attr('class', imgClass+' replaced-svg');
+            }
+
+            // Remove any invalid XML tags as per http://validator.w3.org
+            $svg = $svg.removeAttr('xmlns:a');
+
+            // Replace image with new SVG
+            $img.replaceWith($svg);
+            $svg.css("visibility", "visible");
+
+        }, 'xml');
+
+    });
 });
diff --git a/public_html/honors/index.php b/public_html/honors/index.php
@@ -52,7 +52,7 @@ function noMore() {
                         .appendTo($("#courses")).slideDown();
                 } else {
                     Materialize.toast(
-                        $('<span class="valign-wrapper"><i class="material-icons green-text left">info_outline</i>No more posts for this year</span>'),
+                        $('<span class="valign-wrapper"><i class="material-icons blue-text left">info_outline</i>No more posts for this year</span>'),
                         4000
                     );
                 }
@@ -220,8 +220,8 @@ function tabSwitch(context) {
         <div id="endless-scroll"></div>
         <div class="grey lighten-2 valign-wrapper card" id="loading">
             <div class="container">
-                <div class="progress blue lighten-4">
-                    <div class="indeterminate blue"></div>
+                <div class="progress deep-purple lighten-4">
+                    <div class="indeterminate deep-purple"></div>
                 </div>
             </div>
         </div>