You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2018/06/30 14:46:18 UTC

[royale-asjs] branch develop updated: Navigation, Drawer and ItemRenderer styles updated

This is an automated email from the ASF dual-hosted git repository.

carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/develop by this push:
     new d047e2e  Navigation, Drawer and ItemRenderer styles updated
d047e2e is described below

commit d047e2e065218bf123a7ccd7bf5a73d75852fc22
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sat Jun 30 16:46:13 2018 +0200

    Navigation, Drawer and ItemRenderer styles updated
---
 .../src/main/royale/vos/NavigationLinkVO.as        |  4 +-
 .../main/royale/org/apache/royale/jewel/Group.as   | 27 ++++++++-
 .../royale/jewel/itemRenderers/ListItemRenderer.as | 67 ++--------------------
 .../itemRenderers/NavigationLinkItemRenderer.as    | 36 +++++++-----
 .../src/main/sass/components/_itemRenderer.sass    | 23 ++++----
 .../Jewel/src/main/sass/components/_list.sass      |  2 +-
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../src/main/resources/defaults.css                | 32 +++++++++--
 .../JewelTheme/src/main/resources/defaults.css     | 25 ++++++--
 .../src/main/sass/components-primary/_drawer.sass  |  6 +-
 .../sass/components-primary/_itemRenderer.sass     | 19 ++++++
 .../{_itemRenderer.sass => _navigation.sass}       | 14 +----
 .../themes/JewelTheme/src/main/sass/defaults.sass  |  1 +
 35 files changed, 737 insertions(+), 255 deletions(-)

diff --git a/examples/royale/JewelExample/src/main/royale/vos/NavigationLinkVO.as b/examples/royale/JewelExample/src/main/royale/vos/NavigationLinkVO.as
index ad5ec82..c33b845 100644
--- a/examples/royale/JewelExample/src/main/royale/vos/NavigationLinkVO.as
+++ b/examples/royale/JewelExample/src/main/royale/vos/NavigationLinkVO.as
@@ -23,11 +23,13 @@ package vos
     {
         public var label:String;
         public var href:String;
+        public var icon:String;
 
-        public function NavigationLinkVO(label:String, href:String)
+        public function NavigationLinkVO(label:String, href:String, icon:String = null)
         {
             this.label = label;
             this.href = href;
+            this.icon = icon;
         }
     }
 }
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Group.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Group.as
index f273ada..edf58b9 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Group.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Group.as
@@ -20,6 +20,7 @@ package org.apache.royale.jewel
 {
 	import org.apache.royale.html.Group;
     import org.apache.royale.utils.ClassSelectorList;
+    import org.apache.royale.utils.IClassSelectorListSupport;
 
     /**
      *  The Group class provides a light-weight container for visual elements. By default
@@ -34,7 +35,7 @@ package org.apache.royale.jewel
      *  @playerversion AIR 2.6
      *  @productversion Royale 0.9.3
      */
-	public class Group extends org.apache.royale.html.Group
+	public class Group extends org.apache.royale.html.Group implements IClassSelectorListSupport
 	{
         /**
          *  Constructor.
@@ -59,6 +60,14 @@ package org.apache.royale.jewel
             classSelectorList.addNames(value);
         }
 
+        /**
+         *  adds a class name
+         * 
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion Royale 0.9.3
+         */
         public function addClass(name:String):void
         {
             COMPILE::JS
@@ -67,6 +76,14 @@ package org.apache.royale.jewel
             }
         }
 
+        /**
+		 *  removes a class name
+         * 
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion Royale 0.9.3
+		 */
         public function removeClass(name:String):void
         {
             COMPILE::JS
@@ -75,6 +92,14 @@ package org.apache.royale.jewel
             }
         }
 
+        /**
+		 *  toggle a class name
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion Royale 0.9.3
+		 */
         public function toggleClass(name:String, value:Boolean):void
         {
             COMPILE::JS
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ListItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ListItemRenderer.as
index fb8005d..9777945 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ListItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ListItemRenderer.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.jewel.itemRenderers
 {
-	import org.apache.royale.core.MXMLItemRenderer;
+	import org.apache.royale.core.StyledMXMLItemRenderer;
 	import org.apache.royale.utils.ClassSelectorList;
 
     COMPILE::JS
@@ -35,7 +35,7 @@ package org.apache.royale.jewel.itemRenderers
 	 *  @playerversion AIR 2.6
 	 *  @productversion Royale 0.9.3
 	 */
-	public class ListItemRenderer extends MXMLItemRenderer
+	public class ListItemRenderer extends StyledMXMLItemRenderer
 	{
 		/**
 		 *  constructor.
@@ -49,19 +49,9 @@ package org.apache.royale.jewel.itemRenderers
 		{
 			super();
 
-			classSelectorList = new ClassSelectorList(this);
-            typeNames = "jewel item";
+			typeNames = "jewel item";
 		}
 
-		protected var classSelectorList:ClassSelectorList;
-
-
-        COMPILE::JS
-        override protected function setClassName(value:String):void
-        {
-            classSelectorList.addNames(value);
-        }
-		
 		private var _text:String = "";
 
         /**
@@ -149,57 +139,8 @@ package org.apache.royale.jewel.itemRenderers
 
             COMPILE::JS
             {
-                //element.className = "jewel item selected";
-				classSelectorList.toggle("selected", selected);
+                toggleClass("selected", selected);
             }
 		}
-
-		private var _twoLine:Boolean;
-        /**
-         *  Activate "twoline" class selector, for use in list item.
-		 *  Optional Two Line List Variant
-         *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion Royale 0.9.3
-         */
-        public function get twoLine():Boolean
-        {
-            return _twoLine;
-        }
-        public function set twoLine(value:Boolean):void
-        {
-            _twoLine = value;
-
-            COMPILE::JS
-            {
-                element.classList.toggle("twoline", _twoLine);
-            }
-        }
-
-		private var _threeLine:Boolean;
-        /**
-         *  Activate "threeline" class selector, for use in list item.
-		 *  Optional Three Line List Variant
-         *
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10.2
-		 *  @playerversion AIR 2.6
-		 *  @productversion Royale 0.9.3
-         */
-        public function get threeLine():Boolean
-        {
-            return _threeLine;
-        }
-        public function set threeLine(value:Boolean):void
-        {
-            _threeLine = value;
-
-            COMPILE::JS
-            {
-                element.classList.toggle("threeline", _threeLine);
-            }
-        }
 	}
 }
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/NavigationLinkItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/NavigationLinkItemRenderer.as
index b36def5..29edc55 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/NavigationLinkItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/NavigationLinkItemRenderer.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.jewel.itemRenderers
 {
-	import org.apache.royale.core.MXMLItemRenderer;
+	import org.apache.royale.core.StyledMXMLItemRenderer;
     
     COMPILE::JS
     {
@@ -36,7 +36,7 @@ package org.apache.royale.jewel.itemRenderers
 	 *  @playerversion AIR 2.6
 	 *  @productversion Royale 0.9.3
 	 */
-	public class NavigationLinkItemRenderer extends MXMLItemRenderer
+	public class NavigationLinkItemRenderer extends StyledMXMLItemRenderer
 	{
 		/**
 		 *  constructor.
@@ -50,9 +50,9 @@ package org.apache.royale.jewel.itemRenderers
 		{
 			super();
 
-            typeNames = "jewel navigationlink";
+			typeNames = "jewel navigationlink";
 		}
-		
+
 		private var _href:String = "#";
         /**
          *  the navigation link url
@@ -71,24 +71,24 @@ package org.apache.royale.jewel.itemRenderers
             _href = value;
 		}
 
-		private var _label:String = "";
+		private var _text:String = "";
 
         /**
-         *  The label of the navigation link
+         *  The text of the navigation link
          *  
          *  @langversion 3.0
          *  @playerversion Flash 10.2
          *  @playerversion AIR 2.6
          *  @productversion Royale 0.9.3
          */
-		public function get label():String
+		public function get text():String
 		{
-            return _label;
+            return _text;
 		}
 
-		public function set label(value:String):void
+		public function set text(value:String):void
 		{
-             _label = value;
+             _text = value;
 		}
 
 		COMPILE::JS
@@ -112,15 +112,15 @@ package org.apache.royale.jewel.itemRenderers
 
 			if (labelField)
 			{
-                label = String(value[labelField]);
+                text = String(value[labelField]);
             }
 			else if(value.label !== undefined)
 			{
-                label = String(value.label);
+                text = String(value.label);
 			}
 			else
 			{
-				label = String(value);
+				text = String(value);
 			}
 			
             if(value.href !== undefined)
@@ -132,7 +132,7 @@ package org.apache.royale.jewel.itemRenderers
 			{
 				if(textNode != null)
 				{
-					textNode.nodeValue = label;
+					textNode.nodeValue = text;
                     (element as HTMLElement).setAttribute('href', href);
 				}	
 			}
@@ -156,5 +156,13 @@ package org.apache.royale.jewel.itemRenderers
 
             return element;
         }
+
+		/**
+		 * @private
+		 */
+		override public function updateRenderer():void
+		{
+			// override all and do nothing, all is managed in CSS
+		}
 	}
 }
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass b/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass
index 991ed7b..637db5a 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass
@@ -22,21 +22,22 @@
 // ListItemRenderer variables
 $item-min-height: 34px
 
-.jewel.item
+.jewel.item, .jewel.navigationlink
     display: flex
     cursor: pointer
     min-height: $item-min-height
+    text-decoration: none
+    align-items: center
+    letter-spacing: 0
+    line-height: normal !important
+    overflow: hidden
+
+
+.jewel.navigationlink
+    min-height: 48px
     
 j|ListItemRenderer
     IBeadController: ClassReference("org.apache.royale.jewel.beads.controllers.ItemRendererMouseController")
 
-
-.jewel.navigationlink
-    text-decoration: none
-    margin: 0
-    padding: 16px 0px
-    vertical-align: middle
-    font-size: 14px
-    font-weight: 400
-    line-height: 24px
-    letter-spacing: 0
\ No newline at end of file
+j|NavigationLinkItemRenderer
+    IBeadController: ClassReference("org.apache.royale.jewel.beads.controllers.ItemRendererMouseController")
\ No newline at end of file
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_list.sass b/frameworks/projects/Jewel/src/main/sass/components/_list.sass
index 6010eb4..0655a71 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_list.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_list.sass
@@ -20,7 +20,7 @@
 // Jewel List
 // List variables
 
-.jewel.list
+.jewel.list, .jewel.navigation
     align-items: stretch
     align-content: flex-start
     
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
index 30a6bbb..a88b2a3 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
@@ -238,22 +238,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #262626;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #595959;
+  background-color: #8c8c8c;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#d43bd1, #b427b1);
+  border-bottom: 1px solid #751a74;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -268,6 +273,21 @@ j|Card {
   background: #b427b1;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #737373;
+}
+.jewel.navigationlink:active {
+  background: #595959;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css
index bf07f7a..9e30049 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css
@@ -238,22 +238,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #262626;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #595959;
+  background-color: #8c8c8c;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#54b7f3, #24a3ef);
+  border-bottom: 1px solid #0d79ba;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -268,6 +273,21 @@ j|Card {
   background: #24a3ef;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #737373;
+}
+.jewel.navigationlink:active {
+  background: #595959;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Emerald-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Emerald-Theme/src/main/resources/defaults.css
index 9301148..4bc16a4 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Emerald-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Emerald-Theme/src/main/resources/defaults.css
@@ -238,22 +238,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #262626;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #595959;
+  background-color: #8c8c8c;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#98cc50, #7eb435);
+  border-bottom: 1px solid #557923;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -268,6 +273,21 @@ j|Card {
   background: #7eb435;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #737373;
+}
+.jewel.navigationlink:active {
+  background: #595959;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Green-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Green-Theme/src/main/resources/defaults.css
index a35dc9b..2c168d2 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Green-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Green-Theme/src/main/resources/defaults.css
@@ -238,22 +238,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #262626;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #595959;
+  background-color: #8c8c8c;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#45c354, #34a241);
+  border-bottom: 1px solid #21682a;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -268,6 +273,21 @@ j|Card {
   background: #34a241;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #737373;
+}
+.jewel.navigationlink:active {
+  background: #595959;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Orange-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Orange-Theme/src/main/resources/defaults.css
index 82f61b4..3aa494c 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Orange-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Orange-Theme/src/main/resources/defaults.css
@@ -238,22 +238,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #262626;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #595959;
+  background-color: #8c8c8c;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#f8a036, #f28809);
+  border-bottom: 1px solid #a85e06;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -268,6 +273,21 @@ j|Card {
   background: #f28809;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #737373;
+}
+.jewel.navigationlink:active {
+  background: #595959;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Red-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Red-Theme/src/main/resources/defaults.css
index e782b91..2c1d231 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Red-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Red-Theme/src/main/resources/defaults.css
@@ -238,22 +238,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #262626;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #595959;
+  background-color: #8c8c8c;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#ee343b, #dc121a);
+  border-bottom: 1px solid #950d12;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -268,6 +273,21 @@ j|Card {
   background: #dc121a;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #737373;
+}
+.jewel.navigationlink:active {
+  background: #595959;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sapphire-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sapphire-Theme/src/main/resources/defaults.css
index e621b8f..1c28d8a 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sapphire-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sapphire-Theme/src/main/resources/defaults.css
@@ -238,22 +238,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #262626;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #595959;
+  background-color: #8c8c8c;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#3481d0, #2767a9);
+  border-bottom: 1px solid #19416b;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -268,6 +273,21 @@ j|Card {
   background: #2767a9;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #737373;
+}
+.jewel.navigationlink:active {
+  background: #595959;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sunflower-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sunflower-Theme/src/main/resources/defaults.css
index 2f7b36a..82f4e80 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sunflower-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Sunflower-Theme/src/main/resources/defaults.css
@@ -238,22 +238,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #262626;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #595959;
+  background-color: #8c8c8c;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#f9bb58, #f7a726);
+  border-bottom: 1px solid #ca7f07;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -268,6 +273,21 @@ j|Card {
   background: #f7a726;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #737373;
+}
+.jewel.navigationlink:active {
+  background: #595959;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Topaz-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Topaz-Theme/src/main/resources/defaults.css
index 79fd1d1..e7ffef7 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Topaz-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Topaz-Theme/src/main/resources/defaults.css
@@ -238,22 +238,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #262626;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #595959;
+  background-color: #8c8c8c;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#f16c42, #ed4812);
+  border-bottom: 1px solid #a6320d;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -268,6 +273,21 @@ j|Card {
   background: #ed4812;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #737373;
+}
+.jewel.navigationlink:active {
+  background: #595959;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Turquoise-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Turquoise-Theme/src/main/resources/defaults.css
index e43c02f..db6ce58 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Turquoise-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Turquoise-Theme/src/main/resources/defaults.css
@@ -238,22 +238,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #262626;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #595959;
+  background-color: #8c8c8c;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#2ebcb2, #24948c);
+  border-bottom: 1px solid #155651;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -268,6 +273,21 @@ j|Card {
   background: #24948c;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #737373;
+}
+.jewel.navigationlink:active {
+  background: #595959;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Violet-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Violet-Theme/src/main/resources/defaults.css
index bad593c..673be1d 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Violet-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Violet-Theme/src/main/resources/defaults.css
@@ -238,22 +238,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #262626;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #595959;
+  background-color: #8c8c8c;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#7432a4, #58267c);
+  border-bottom: 1px solid #2f1442;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -268,6 +273,21 @@ j|Card {
   background: #58267c;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #737373;
+}
+.jewel.navigationlink:active {
+  background: #595959;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Yellow-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Yellow-Theme/src/main/resources/defaults.css
index 6dea3fe..d07e0f7 100644
--- a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Yellow-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Yellow-Theme/src/main/resources/defaults.css
@@ -238,22 +238,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #262626;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #595959;
+  background-color: #8c8c8c;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#f4e813, #cac00a);
+  border-bottom: 1px solid #817a06;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -268,6 +273,21 @@ j|Card {
   background: #cac00a;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #737373;
+}
+.jewel.navigationlink:active {
+  background: #595959;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
index b9aa1da..44edb6f 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
@@ -237,22 +237,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #a6a6a6;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #d9d9d9;
+  background-color: white;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#d43bd1, #b427b1);
+  border-bottom: 1px solid #751a74;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -267,6 +272,21 @@ j|Card {
   background: #b427b1;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #f3f3f3;
+}
+.jewel.navigationlink:active {
+  background: #d9d9d9;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css
index ccd8393..54e3210 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css
@@ -237,22 +237,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #a6a6a6;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #d9d9d9;
+  background-color: white;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#54b7f3, #24a3ef);
+  border-bottom: 1px solid #0d79ba;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -267,6 +272,21 @@ j|Card {
   background: #24a3ef;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #f3f3f3;
+}
+.jewel.navigationlink:active {
+  background: #d9d9d9;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Emerald-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Emerald-Theme/src/main/resources/defaults.css
index de4dc44..47848c7 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Emerald-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Emerald-Theme/src/main/resources/defaults.css
@@ -237,22 +237,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #a6a6a6;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #d9d9d9;
+  background-color: white;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#98cc50, #7eb435);
+  border-bottom: 1px solid #557923;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -267,6 +272,21 @@ j|Card {
   background: #7eb435;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #f3f3f3;
+}
+.jewel.navigationlink:active {
+  background: #d9d9d9;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Green-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Green-Theme/src/main/resources/defaults.css
index ffec2e4..8b90e1c 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Green-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Green-Theme/src/main/resources/defaults.css
@@ -237,22 +237,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #a6a6a6;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #d9d9d9;
+  background-color: white;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#45c354, #34a241);
+  border-bottom: 1px solid #21682a;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -267,6 +272,21 @@ j|Card {
   background: #34a241;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #f3f3f3;
+}
+.jewel.navigationlink:active {
+  background: #d9d9d9;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Orange-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Orange-Theme/src/main/resources/defaults.css
index 2fa26d7..5b31a66 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Orange-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Orange-Theme/src/main/resources/defaults.css
@@ -237,22 +237,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #a6a6a6;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #d9d9d9;
+  background-color: white;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#f8a036, #f28809);
+  border-bottom: 1px solid #a85e06;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -267,6 +272,21 @@ j|Card {
   background: #f28809;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #f3f3f3;
+}
+.jewel.navigationlink:active {
+  background: #d9d9d9;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Red-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Red-Theme/src/main/resources/defaults.css
index eb7e225..f7715b6 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Red-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Red-Theme/src/main/resources/defaults.css
@@ -237,22 +237,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #a6a6a6;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #d9d9d9;
+  background-color: white;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#ee343b, #dc121a);
+  border-bottom: 1px solid #950d12;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -267,6 +272,21 @@ j|Card {
   background: #dc121a;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #f3f3f3;
+}
+.jewel.navigationlink:active {
+  background: #d9d9d9;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Sapphire-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Sapphire-Theme/src/main/resources/defaults.css
index ec8e8a9..a5faea8 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Sapphire-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Sapphire-Theme/src/main/resources/defaults.css
@@ -237,22 +237,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #a6a6a6;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #d9d9d9;
+  background-color: white;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#3481d0, #2767a9);
+  border-bottom: 1px solid #19416b;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -267,6 +272,21 @@ j|Card {
   background: #2767a9;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #f3f3f3;
+}
+.jewel.navigationlink:active {
+  background: #d9d9d9;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Sunflower-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Sunflower-Theme/src/main/resources/defaults.css
index 770532b..3f1e869 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Sunflower-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Sunflower-Theme/src/main/resources/defaults.css
@@ -237,22 +237,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #a6a6a6;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #d9d9d9;
+  background-color: white;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#f9bb58, #f7a726);
+  border-bottom: 1px solid #ca7f07;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -267,6 +272,21 @@ j|Card {
   background: #f7a726;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #f3f3f3;
+}
+.jewel.navigationlink:active {
+  background: #d9d9d9;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Topaz-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Topaz-Theme/src/main/resources/defaults.css
index 1f9c1f3..b0e0b69 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Topaz-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Topaz-Theme/src/main/resources/defaults.css
@@ -237,22 +237,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #a6a6a6;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #d9d9d9;
+  background-color: white;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#f16c42, #ed4812);
+  border-bottom: 1px solid #a6320d;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -267,6 +272,21 @@ j|Card {
   background: #ed4812;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #f3f3f3;
+}
+.jewel.navigationlink:active {
+  background: #d9d9d9;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Turquoise-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Turquoise-Theme/src/main/resources/defaults.css
index 08083ba..de43460 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Turquoise-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Turquoise-Theme/src/main/resources/defaults.css
@@ -237,22 +237,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #a6a6a6;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #d9d9d9;
+  background-color: white;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#2ebcb2, #24948c);
+  border-bottom: 1px solid #155651;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -267,6 +272,21 @@ j|Card {
   background: #24948c;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #f3f3f3;
+}
+.jewel.navigationlink:active {
+  background: #d9d9d9;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Violet-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Violet-Theme/src/main/resources/defaults.css
index afc5610..07b9f3b 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Violet-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Violet-Theme/src/main/resources/defaults.css
@@ -237,22 +237,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #a6a6a6;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #d9d9d9;
+  background-color: white;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#7432a4, #58267c);
+  border-bottom: 1px solid #2f1442;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -267,6 +272,21 @@ j|Card {
   background: #58267c;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #f3f3f3;
+}
+.jewel.navigationlink:active {
+  background: #d9d9d9;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/Jewel-Light-NoFlat-Primary-Yellow-Theme/src/main/resources/defaults.css b/frameworks/themes/Jewel-Light-NoFlat-Primary-Yellow-Theme/src/main/resources/defaults.css
index fa8e812..05257e8 100644
--- a/frameworks/themes/Jewel-Light-NoFlat-Primary-Yellow-Theme/src/main/resources/defaults.css
+++ b/frameworks/themes/Jewel-Light-NoFlat-Primary-Yellow-Theme/src/main/resources/defaults.css
@@ -237,22 +237,27 @@ j|Card {
   will-change: opacity;
   transition: opacity 0.4s 0ms;
 }
-.jewel.drawer .jewel.navigation {
-  border-right: 1px solid #a6a6a6;
+.jewel.drawer .drawermain {
   box-shadow: 0px 0px 6px 1px rgba(1, 1, 1, 0.7);
   transform: translateX(-104%);
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #d9d9d9;
+  background-color: white;
   transition: transform 250ms 0ms;
 }
-.jewel.drawer.open .jewel.navigation {
+.jewel.drawer.open .drawermain {
   transform: none;
   transition: transform 300ms 0ms;
 }
-.jewel.drawer > * {
-  padding-left: 40px;
+
+.jewel.drawerheader {
+  background: linear-gradient(#f4e813, #cac00a);
+  border-bottom: 1px solid #817a06;
+  color: #FFFFFF;
+}
+.jewel.drawerheader div {
+  padding: 16px;
 }
 
 .jewel.item {
@@ -267,6 +272,21 @@ j|Card {
   background: #cac00a;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #f3f3f3;
+}
+.jewel.navigationlink:active {
+  background: #d9d9d9;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 979440b..f7fd3dc 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -243,7 +243,7 @@ j|Card {
   will-change: transform;
   width: calc(100% - 54px);
   max-width: 280px;
-  background-color: #d9d9d9;
+  background-color: white;
   transition: transform 250ms 0ms;
 }
 .jewel.drawer.open .drawermain {
@@ -260,10 +260,6 @@ j|Card {
   padding: 16px;
 }
 
-.jewel.drawercontent > * {
-  padding-left: 16px;
-}
-
 .jewel.dropdownlist {
   cursor: pointer;
   display: inline-block;
@@ -318,6 +314,21 @@ j|Card {
   background: #24a3ef;
 }
 
+.jewel.navigationlink {
+  margin: 0;
+  padding: 0 16px;
+  font-family: "Lato", sans-serif;
+  font-size: 1em;
+  font-weight: 500;
+  color: rgba(0, 0, 0, 0.6);
+}
+.jewel.navigationlink:hover {
+  background: #f3f3f3;
+}
+.jewel.navigationlink:active {
+  background: #d9d9d9;
+}
+
 .jewel.label {
   font-family: "Lato", sans-serif;
   font-size: 1em;
@@ -330,6 +341,10 @@ j|Card {
   border-radius: 3px;
 }
 
+.jewel.navigation {
+  background-color: #ffffff;
+}
+
 .jewel.radiobutton input + span::before {
   background: linear-gradient(white, #f3f3f3);
   border: 1px solid #b3b3b3;
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_drawer.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_drawer.sass
index 10e8971..472276a 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_drawer.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_drawer.sass
@@ -19,7 +19,6 @@
 
 $drawer-width-offset: 54px
 $drawer-max-width: 280px
-$drawer-padding-left: 16px
 $drawer-transition-close-time: 250ms
 $drawer-transition-open-time: 300ms
 $drawer-transition-close: animation-standard(transform, $drawer-transition-close-time)
@@ -42,7 +41,7 @@ $drawer-overlay-opacity: .65 !default
         will-change: transform
         width: calc(100% - #{$drawer-width-offset})
         max-width: $drawer-max-width
-        background-color: $default-color
+        background-color: lighten($default-color, 20%)
         transition: $drawer-transition-close
     
     &.open        
@@ -65,8 +64,7 @@ $drawer-overlay-opacity: .65 !default
         padding: 16px
 
 .jewel.drawercontent
-    > *
-        padding-left: $drawer-padding-left
+
 
 j|Drawer
 
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_itemRenderer.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_itemRenderer.sass
index c2117b8..0b4fcfc 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_itemRenderer.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_itemRenderer.sass
@@ -18,6 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // Jewel ListItemRenderer
+$itemrenderer-padding: 16px
 
 // ListItemRenderer variables
 .jewel.item
@@ -30,3 +31,21 @@
     &:active, &.selected
         color: $font-theme-color
         background: darken($primary-color, 5%)
+
+.jewel.navigationlink
+    margin: 0
+    padding: 0 $itemrenderer-padding
+    font:
+        family: $font-stack
+        size: $font-size
+        weight: $font-weight-normal + 100
+
+    color: rgba(black, 0.6)
+    
+    &:hover
+        //color: $font-theme-color
+        background: lighten($default-color, 10%)
+
+    &:active
+        //color: $font-theme-color
+        background: $default-color
\ No newline at end of file
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_itemRenderer.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_navigation.sass
similarity index 78%
copy from frameworks/themes/JewelTheme/src/main/sass/components-primary/_itemRenderer.sass
copy to frameworks/themes/JewelTheme/src/main/sass/components-primary/_navigation.sass
index c2117b8..66ff92d 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_itemRenderer.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_navigation.sass
@@ -17,16 +17,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-// Jewel ListItemRenderer
 
-// ListItemRenderer variables
-.jewel.item
-    padding: 8px
-    
-    &:hover
-        color: $font-theme-color
-        background: $primary-color
+j|Navigation
 
-    &:active, &.selected
-        color: $font-theme-color
-        background: darken($primary-color, 5%)
+.jewel.navigation
+    background-color: #ffffff
\ No newline at end of file
diff --git a/frameworks/themes/JewelTheme/src/main/sass/defaults.sass b/frameworks/themes/JewelTheme/src/main/sass/defaults.sass
index 73d24f3..ea81dd4 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/defaults.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/defaults.sass
@@ -36,6 +36,7 @@
 @import "components-primary/itemRenderer"
 @import "components-primary/label"
 @import "components-primary/list"
+@import "components-primary/navigation"
 @import "components-primary/radiobutton"
 @import "components-primary/slider"
 @import "components-primary/textinput"