appengine/config_service/ui/src/config-ui/config-ui.html - Issue 2984073002: Nothing changed, ignore this commit

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: appengine/config_service/ui/src/config-ui/config-ui.html

Issue 2984073002: Nothing changed, ignore this commit (Closed)

Patch Set: Created 3 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « appengine/config_service/ui/src/config-ui/config-set.html ('k') | appengine/config_service/ui/src/config-ui/front-page.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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">

<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>