OLD | NEW |
1 <!-- | 1 <!-- |
2 Copyright 2017 The LUCI Authors. All rights reserved. | 2 Copyright 2017 The LUCI Authors. All rights reserved. |
3 Use of this source code is governed under the Apache License, Version 2.0 | 3 Use of this source code is governed under the Apache License, Version 2.0 |
4 that can be found in the LICENSE file. | 4 that can be found in the LICENSE file. |
5 --> | 5 --> |
6 | 6 |
7 <link rel="import" href="../../bower_components/polymer/polymer.html"> | 7 <link rel="import" href="../../bower_components/polymer/polymer.html"> |
8 <link rel="import" href="../../bower_components/paper-search/paper-search-bar.ht
ml"> | 8 <link rel="import" href="../../bower_components/paper-search/paper-search-bar.ht
ml"> |
9 <link rel="import" href="../../bower_components/app-route/app-location.html"> | 9 <link rel="import" href="../../bower_components/app-route/app-location.html"> |
10 <link rel="import" href="../../bower_components/app-route/app-route.html"> | 10 <link rel="import" href="../../bower_components/app-route/app-route.html"> |
11 <link rel="import" href="../../bower_components/app-layout/app-drawer-layout/app
-drawer-layout.html"> | 11 <link rel="import" href="../../bower_components/app-layout/app-drawer-layout/app
-drawer-layout.html"> |
12 <link rel="import" href="../../bower_components/app-layout/app-header/app-header
.html"> | 12 <link rel="import" href="../../bower_components/app-layout/app-header/app-header
.html"> |
13 <link rel="import" href="../../bower_components/app-layout/app-header-layout/app
-header-layout.html"> | 13 <link rel="import" href="../../bower_components/app-layout/app-header-layout/app
-header-layout.html"> |
14 <link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolb
ar.html"> | 14 <link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolb
ar.html"> |
15 | 15 |
16 <link rel="import" href="../../common/auth-signin.html"> | 16 <link rel="import" href="../../common/auth-signin.html"> |
17 <link rel="import" href="config-set.html"> | 17 <link rel="import" href="config-set.html"> |
18 <link rel="import" href="front-page.html"> | 18 <link rel="import" href="front-page.html"> |
19 | 19 |
20 <dom-module id="config-ui"> | 20 <dom-module id="config-ui"> |
21 <template> | 21 <template> |
22 <style> | 22 <style> |
| 23 @media only screen and (min-width: 768px) { |
| 24 app-toolbar { |
| 25 height: 60px; |
| 26 } |
| 27 |
| 28 .logo { |
| 29 height: 50px; |
| 30 } |
| 31 |
| 32 .right { margin-left:15px; } |
| 33 } |
| 34 |
23 * { font-family: sans-serif; } | 35 * { font-family: sans-serif; } |
24 | 36 |
25 app-toolbar { | 37 app-toolbar { |
26 background-color: var(--google-blue-500); | 38 background-color: var(--google-blue-500); |
27 color: #232323; | 39 color: #232323; |
28 height: 60px; | 40 } |
| 41 <<<<<<< ours |
| 42 ======= |
| 43 |
| 44 .link { |
| 45 font-size: 75%; |
| 46 color: white; |
| 47 margin-right: 10px; |
29 } | 48 } |
30 | 49 |
31 .logo { | 50 .title { |
32 height: 50px; | 51 color: white; |
| 52 font-size: 125%; |
33 } | 53 } |
34 | 54 >>>>>>> theirs |
35 .right { margin-left:15px; } | |
36 | |
37 .title { | |
38 font-size: 125%; | |
39 color: white; | |
40 } | |
41 </style> | 55 </style> |
42 | 56 |
43 <app-drawer-layout fullbleed force-narrow> | 57 <app-drawer-layout fullbleed force-narrow> |
44 <app-header-layout> | 58 <app-header-layout> |
45 <app-header reveals slot="header"> | 59 <app-header reveals slot="header"> |
46 <app-toolbar> | 60 <app-toolbar> |
47 <!--<image class="logo" src="/static/images/chromium.png"/>--> | 61 <!--<image class="logo" src="/static/images/chromium.png"/>--> |
48 <div class="title" main-title> | 62 <div class="title" main-title> |
49 Configuration Service | 63 Configuration Service |
50 </div> | 64 </div> |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
120 // If the path is blank, redirect to / | 134 // If the path is blank, redirect to / |
121 if (!this.route.path) { | 135 if (!this.route.path) { |
122 this.set('route.path', '/'); | 136 this.set('route.path', '/'); |
123 } | 137 } |
124 }); | 138 }); |
125 }, | 139 }, |
126 | 140 |
127 }); | 141 }); |
128 </script> | 142 </script> |
129 </dom-module> | 143 </dom-module> |
OLD | NEW |