Merge pull request #7 from mindreeper2420/v0.8.0

fix(update): Generalize icon names; update stylesheets
rh-uxd · Nov 16, 2017 · 2d335a9 · 2d335a9
2 parents dd1d3e2 + 93c673a
commit 2d335a9
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 25 deletions.
diff --git a/_includes/header.html b/_includes/header.html
@@ -6,7 +6,7 @@
     <meta name="description" content="Red Hat User Experience Design">
     <meta name="author" content="Red Hat UXD">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <link rel="shortcut icon" href="{{ page.relative_path }}assets/img/uxd.png">
+    <link rel="shortcut icon" href="{{ page.relative_path }}assets/img/favicon.png">
     <title>{% if page.title %}{{ page.title }}{% endif %}</title>
     <!-- link to main stylesheet -->
     <link rel="stylesheet" type="text/css" href="{{ page.relative_path }}assets/css/styles.css">
@@ -19,7 +19,5 @@
     <!-- Site JS -->
     <script src="{{ page.relative_path }}assets/js/designSearch.js"></script>
     <script src="{{ page.relative_path }}assets/js/designSort.js"></script>
-    <!-- Place this tag in your head or just before your close body tag. -->
-    <script async defer src="https://buttons.github.io/buttons.js"></script>
   </head>
   <body>
diff --git a/_includes/nav.html b/_includes/nav.html
@@ -9,7 +9,7 @@
         <span class="icon-bar"></span>
       </button>
       <a class="navbar-brand" href="{{ page.relative_path }}">
-        <img alt="brand" src="{{ page.relative_path }}assets/img/uxd.png" alt="UXD" width="25px">
+        <img alt="brand" src="{{ page.relative_path }}assets/img/icon.png" alt="UXD" width="25px">
       </a>
     </div>
     <!-- Collect the nav links, forms, and other content for toggling -->

diff --git a/_sass/base.scss b/_sass/base.scss
@@ -16,19 +16,6 @@ body { font-size: $fa-font-size-base; }
     text-decoration: none;
   }
 }
-.green { background-color: $color-pf-green-200; }
-.blue { background-color: $color-pf-blue-200; }
-.light-blue { background-color: $color-pf-blue-100; }
-.light-blue-text { color: $color-pf-black !important; }
-.orange { background-color: $color-pf-orange-200; }
-.purple {
-  background-color: $color-pf-purple-200;
-  color: $color-pf-white;
-}
-.red {
-  background-color: $color-pf-red-100;
-  color: $color-pf-white;
-}
 .filter-control {
   list-style: none;
   padding: 0 5px;

diff --git a/_sass/table-colors.scss b/_sass/table-colors.scss
@@ -0,0 +1,15 @@
+@import "vendor/patternfly/variables.scss";
+
+.green { background-color: $color-pf-green-200; }
+.blue { background-color: $color-pf-blue-200; }
+.light-blue { background-color: $color-pf-blue-100; }
+.light-blue-text { color: $color-pf-black !important; }
+.orange { background-color: $color-pf-orange-200; }
+.purple {
+  background-color: $color-pf-purple-200;
+  color: $color-pf-white;
+}
+.red {
+  background-color: $color-pf-red-100;
+  color: $color-pf-white;
+}
diff --git a/assets/css/styles.scss b/assets/css/styles.scss
@@ -3,18 +3,11 @@
 ---
 @charset "utf-8";
 
-// PatternFly import
-//@import "patternfly/patternfly";
-
-// Variables to modify font folders
-// $icon-font-path:      "../fonts/bootstrap";
-// $fa-font-path:        "../fonts/font-awesome";
-
 // Imports
 @import "../_sass/vendor/patternfly/_patternfly";
-// @import "_bootstrap";
 @import "../_sass/vendor/patternfly/font-awesome";
 
 // Site styles
 @import "base";
+@import "table-colors";
 @import "design-links";
diff --git a/assets/img/uxd.png → assets/img/favicon.png b/assets/img/uxd.png → assets/img/favicon.png
diff --git a/assets/img/icon.png b/assets/img/icon.png
diff --git a/assets/img/uxd_logo.png b/assets/img/uxd_logo.png