Merge pull request #3 from thewebplatform/master

Updating From Parent
thewebplatform · Jul 12, 2015 · 8185789 · 8185789
2 parents 1805b9f + 4fd457b
commit 8185789
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/app/styles/app-theme.html b/app/styles/app-theme.html
@@ -22,27 +22,33 @@
   /* Application theme */
 
   :root {
-    --dark-primary-color: #303F9F;
-    --default-primary-color: #3F51B5;
-    --light-primary-color: #C5CAE9;
-    --text-primary-color: #ffffff; /*text/icons*/
-    --accent-color: #FF4081;
-    --primary-background-color: #c5cae9;
-    --primary-text-color: #212121;
-    --secondary-text-color: #727272;
-    --disabled-text-color: #bdbdbd;
-    --divider-color: #B6B6B6;
+    --dark-primary-color:       #1976D2;
+    --default-primary-color:    #2196F3;
+    --light-primary-color:      #BBDEFB;
+    --text-primary-color:       #FFFFFF;
+    --accent-color:             #FF5722;
+    --primary-background-color: #BBDEFB;
+    --primary-text-color:       #212121;
+    --secondary-text-color:     #727272;
+    --disabled-text-color:      #BDBDBD;
+    --divider-color:            #B6B6B6;
+
 
     /* Components */
 
     /* paper-drawer-panel */
-    --drawer-menu-color: #ffffff;
-    --drawer-border-color: 1px solid #ccc;
+    --drawer-menu-color:           #ffffff;
+    --drawer-border-color:         1px solid #ccc;
     --drawer-toolbar-border-color: 1px solid rgba(0, 0, 0, 0.22);
 
     /* paper-menu */
     --paper-menu-background-color: #fff;
-    --menu-link-color: #111111;
+    --menu-link-color:             #111111;
+
+    /* paper-input */
+   --paper-input-container-color:       rgba(255, 255, 255, 0.64);
+   --paper-input-container-focus-color: rgba(255, 255, 255, 1);
+   --paper-input-container-input-color: #fff;
   }
 
   /* General styles */

diff --git a/assets/wireframes/firstdraft.jpg b/assets/wireframes/firstdraft.jpg