Merge branch 'master' of github.com:divshot/ele-web

divshot · Jul 10, 2014 · 56d7b4f · 56d7b4f
2 parents 18bc1cb + 1841eeb
commit 56d7b4f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/public/components/ele-editor.css b/public/components/ele-editor.css
@@ -1,4 +1,4 @@
-core-toolbar {
+#browse-elements {
   background: #FF4081;
   color: white;
   fill: white;
@@ -23,5 +23,5 @@ core-drawer-panel::shadow #scrim {
 }
 
 pvc-spinner::shadow .spinner > div {
-  background: #FF4081;
+  background: #FF4081 !important;
 }
diff --git a/public/components/ele-editor.html b/public/components/ele-editor.html
@@ -35,7 +35,7 @@
 
         <core-header-panel drawer mode="seamed">
           <polymer-flex-layout vertical></polymer-flex-layout>
-          <core-toolbar>Your Elements</core-toolbar>
+          <core-toolbar id="browse-elements">Your Elements</core-toolbar>
           <div flex id="element-sidebar">
             <ele-package-list selected="{{packageId}}" on-selected="{{loadPackage}}"></ele-package-list>
             <paper-button id="new-element" on-click=="{{createElement}}">Create New Element</paper-button>

diff --git a/public/css/lander.css b/public/css/lander.css
@@ -31,6 +31,12 @@ nav {
   right: 10px;
 }
 
+nav paper-button span {
+  font-size: 14px;
+  color: #C5CAE9;
+  transition: fill 0.2s;
+}
+
 nav paper-button::shadow span {
   font-size: 14px;
   color: #C5CAE9;
@@ -57,10 +63,6 @@ nav paper-button::shadow #icon svg {
   height: 20px !important;
 }
 
-bs-container {
-  max-width: 780px;
-}
-
 #intro {
   background: #3F51B5 url('/images/components.svg');
   background-size: cover;
@@ -93,12 +95,25 @@ bs-container {
   background: #FF4081;
 }
 
+#intro paper-button #icon {
+  margin-top: 7px;
+  margin-right: 4px;
+  padding-left: 8px;
+}
+
 #intro paper-button::shadow #icon {
   margin-top: 7px;
   margin-right: 4px;
   padding-left: 8px;
 }
 
+#intro paper-button span {
+  color: #fff;
+  margin-left: 0;
+  padding-right: 8px;
+  font-size: 16px;
+}
+
 #intro paper-button::shadow span {
   color: #fff;
   margin-left: 0;
@@ -194,6 +209,11 @@ core-scroll-header-panel::shadow #headerBg {
   border-top: 4px solid #303F9F;
 }
 
+core-scroll-header-panel #headerBg, core-scroll-header-panel #condensedHeaderBg {
+  background: #3F51B5;
+  border-top: 4px solid #303F9F;
+}
+
 .title {
   font-size: 40px;
 }