Index: appengine/config_service/ui/src/config-ui/config-ui.html |
diff --git a/appengine/config_service/ui/src/config-ui/config-ui.html b/appengine/config_service/ui/src/config-ui/config-ui.html |
index 440b7b30531cadb9dd226ae7c74afd40a2fa5b44..6fbe134de847161a62a701ff72065b1541f89ccd 100644 |
--- a/appengine/config_service/ui/src/config-ui/config-ui.html |
+++ b/appengine/config_service/ui/src/config-ui/config-ui.html |
@@ -20,24 +20,38 @@ |
<dom-module id="config-ui"> |
<template> |
<style> |
+ @media only screen and (min-width: 768px) { |
+ app-toolbar { |
+ height: 60px; |
+ } |
+ |
+ .logo { |
+ height: 50px; |
+ } |
+ |
+ .right { margin-left:15px; } |
+ } |
+ |
* { font-family: sans-serif; } |
app-toolbar { |
background-color: var(--google-blue-500); |
color: #232323; |
- height: 60px; |
} |
+<<<<<<< ours |
+======= |
- .logo { |
- height: 50px; |
+ .link { |
+ font-size: 75%; |
+ color: white; |
+ margin-right: 10px; |
} |
- .right { margin-left:15px; } |
- |
.title { |
- font-size: 125%; |
color: white; |
+ font-size: 125%; |
} |
+>>>>>>> theirs |
</style> |
<app-drawer-layout fullbleed force-narrow> |