use paper-toolbar in air client (#2832)

trevj · web-flow · commit a18d4993ebba · 2016-11-29T12:29:15.000-05:00
use paper-toolbar
diff --git a/src/cca/bower.json b/src/cca/bower.json
@@ -13,9 +13,12 @@
     "tests"
   ],
   "dependencies": {
+    "iron-icons": "PolymerElements/iron-icons#^1.2.0",
     "paper-button": "PolymerElements/paper-button#^1.0.14",
     "paper-card": "PolymerElements/paper-card#^1.1.4",
     "paper-header-panel": "PolymerElements/paper-header-panel#^1.1.7",
-    "paper-input": "PolymerElements/paper-input#^1.1.22"
+    "paper-icon-button": "PolymerElements/paper-icon-button#^1.1.3",
+    "paper-input": "PolymerElements/paper-input#^1.1.22",
+    "paper-toolbar": "PolymerElements/paper-toolbar#^1.1.7"
   }
 }
diff --git a/src/cca/index.html b/src/cca/index.html
@@ -7,8 +7,12 @@
   <meta name='viewport' content='width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes'>
   <script src='bower_components/webcomponentsjs/webcomponents-lite.min.js'></script>
 
+  <link rel="import" href="bower_components/iron-icons/iron-icons.html">
   <link rel="import" href="bower_components/paper-button/paper-button.html">
   <link rel="import" href="bower_components/paper-header-panel/paper-header-panel.html">
+  <link rel="import" href="bower_components/paper-icon-button/paper-icon-button.html">
+  <link rel="import" href="bower_components/paper-toolbar/paper-toolbar.html">
+
   <!-- Figure out how to fix the CSP issue with the googleapis font import from iron-meta -->
   <!--<link rel="import" href="bower_components/paper-card/paper-card.html">-->
   <!--<link rel="import" href="bower_components/paper-input/paper-input.html">-->
@@ -17,18 +21,8 @@
   <link href='generic_ui/style/global.css' rel='stylesheet' shim-shadowdom>
 
   <style>
-    .paper-header {
-        background-color: #12a391;
-        color: #FeFeFe;
-        text-align: left;
-        padding: 10px;
-        font-size: 2;
-        font-size: 1.7em;
-        font-weight: bold;
-    }
-    .paper-button:enabled {
-      background-color: #12a391;
-      color: #fefefe;
+    paper-toolbar.uproxy {
+      background: #12a391;
     }
     .server-entry-card, .access-code-card {
       background-color: white;
@@ -60,7 +54,6 @@
     }
     body {
       display: block;
-      text-align: center;
       margin: 0;
       font-family: Roboto, sans-serif;
       font-size: 13px;
@@ -72,7 +65,10 @@
 
 <body touch-action='auto' class='fullbleed layout vertical'>
   <paper-header-panel mode='waterfall' class='flex'>
-    <div class='paper-header'>uProxy</div>
+    <paper-toolbar class='uproxy'>
+      <paper-icon-button icon="menu"></paper-icon-button>
+      <span class="title">uProxy</span>
+    </paper-toolbar>
     <div class='page-content'>
       <div id='entry-list'></div>
       <div class='access-code-card'>

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,12 @@`
`13`	`13`	`"tests"`
`14`	`14`	`],`
`15`	`15`	`"dependencies": {`
	`16`	`+ "iron-icons": "PolymerElements/iron-icons#^1.2.0",`
`16`	`17`	`"paper-button": "PolymerElements/paper-button#^1.0.14",`
`17`	`18`	`"paper-card": "PolymerElements/paper-card#^1.1.4",`
`18`	`19`	`"paper-header-panel": "PolymerElements/paper-header-panel#^1.1.7",`
`19`		`- "paper-input": "PolymerElements/paper-input#^1.1.22"`
	`20`	`+ "paper-icon-button": "PolymerElements/paper-icon-button#^1.1.3",`
	`21`	`+ "paper-input": "PolymerElements/paper-input#^1.1.22",`
	`22`	`+ "paper-toolbar": "PolymerElements/paper-toolbar#^1.1.7"`
`20`	`23`	`}`
`21`	`24`	`}`