Committed by
Gerrit Code Review
LnF updates to navigation menu.
Change-Id: I8dce2d5feebcf65143b1c0b4eee8b298a68995e0
Showing
4 changed files
with
39 additions
and
25 deletions
... | @@ -53,6 +53,8 @@ public class MainNavResource extends AbstractInjectionResource { | ... | @@ -53,6 +53,8 @@ public class MainNavResource extends AbstractInjectionResource { |
53 | "<div class=\"nav-hdr\">%s</div>%n"; | 53 | "<div class=\"nav-hdr\">%s</div>%n"; |
54 | private static final String NAV_FORMAT = | 54 | private static final String NAV_FORMAT = |
55 | "<a ng-click=\"navCtrl.hideNav()\" href=\"#/%s\">%s %s</a>%n"; | 55 | "<a ng-click=\"navCtrl.hideNav()\" href=\"#/%s\">%s %s</a>%n"; |
56 | + private static final String ICON_FORMAT = | ||
57 | + "<div icon icon-id=\"%s\"></div>"; | ||
56 | 58 | ||
57 | private static final String BLANK_GLYPH = "unknown"; | 59 | private static final String BLANK_GLYPH = "unknown"; |
58 | 60 | ||
... | @@ -119,6 +121,6 @@ public class MainNavResource extends AbstractInjectionResource { | ... | @@ -119,6 +121,6 @@ public class MainNavResource extends AbstractInjectionResource { |
119 | 121 | ||
120 | private String icon(UiView view) { | 122 | private String icon(UiView view) { |
121 | String gid = view.iconId() == null ? BLANK_GLYPH : view.iconId(); | 123 | String gid = view.iconId() == null ? BLANK_GLYPH : view.iconId(); |
122 | - return "<div icon icon-id=\"" + gid + "\"></div>"; | 124 | + return String.format(ICON_FORMAT, gid); |
123 | } | 125 | } |
124 | } | 126 | } | ... | ... |
... | @@ -19,42 +19,46 @@ | ... | @@ -19,42 +19,46 @@ |
19 | */ | 19 | */ |
20 | 20 | ||
21 | .light #nav { | 21 | .light #nav { |
22 | - background-color: #bbb; | 22 | + background-color: #231f20; |
23 | - box-shadow: 0 2px 8px #777; | ||
24 | } | 23 | } |
25 | .dark #nav { | 24 | .dark #nav { |
26 | - background-color: #444; | 25 | + /* TODO: dark theme */ |
27 | - box-shadow: 0 2px 8px #111; | 26 | + background-color: #231f20; |
28 | } | 27 | } |
29 | 28 | ||
30 | .light #nav .nav-hdr { | 29 | .light #nav .nav-hdr { |
31 | - color: #ddd; | 30 | + color: #716b6a; |
32 | - border-bottom: solid 1px #999; | 31 | + background-color: #3c3a3a; |
33 | - background-color: #aaa; | ||
34 | } | 32 | } |
35 | .dark #nav .nav-hdr { | 33 | .dark #nav .nav-hdr { |
36 | - color: #888; | 34 | + /* TODO: dark theme */ |
37 | - border-bottom: solid 1px #444; | 35 | + color: #716b6a; |
38 | - background-color: #555; | 36 | + background-color: #3c3a3a; |
39 | } | 37 | } |
40 | 38 | ||
41 | .light #nav a { | 39 | .light #nav a { |
42 | - color: #369; | 40 | + color: #c7c7c0; |
43 | - border-bottom: solid #ccc 1px; | 41 | + border-bottom: solid #3c3a3a 1px; |
44 | } | 42 | } |
45 | .dark #nav a { | 43 | .dark #nav a { |
46 | - color: #eee; | 44 | + /* TODO: dark theme */ |
47 | - border-bottom: solid #333 1px; | 45 | + color: #c7c7c0; |
46 | + border-bottom: solid #3c3a3a 1px; | ||
48 | } | 47 | } |
49 | 48 | ||
50 | .light #nav a:hover { | 49 | .light #nav a:hover { |
51 | - background-color: #ddd; | 50 | + color: #ffffff; |
52 | } | 51 | } |
53 | .dark #nav a:hover { | 52 | .dark #nav a:hover { |
54 | - background-color: #777; | 53 | + /* TODO: dark theme */ |
54 | + color: #ffffff; | ||
55 | } | 55 | } |
56 | 56 | ||
57 | #nav a div svg.embeddedIcon g.icon .glyph { | 57 | #nav a div svg.embeddedIcon g.icon .glyph { |
58 | - fill: #c66; | 58 | + fill: #007dc4; |
59 | +} | ||
60 | + | ||
61 | +#nav a:hover div svg.embeddedIcon g.icon .glyph { | ||
62 | + fill: #20b2ff; | ||
59 | } | 63 | } |
60 | 64 | ... | ... |
... | @@ -20,27 +20,32 @@ | ... | @@ -20,27 +20,32 @@ |
20 | 20 | ||
21 | #nav { | 21 | #nav { |
22 | position: absolute; | 22 | position: absolute; |
23 | - top: 45px; | 23 | + top: 48px; |
24 | - left: 1px; | 24 | + left: 0; |
25 | padding: 0; | 25 | padding: 0; |
26 | z-index: 3000; | 26 | z-index: 3000; |
27 | visibility: hidden; | 27 | visibility: hidden; |
28 | } | 28 | } |
29 | 29 | ||
30 | html[data-platform='iPad'] #nav { | 30 | html[data-platform='iPad'] #nav { |
31 | - top: 57px; | 31 | + top: 60px; |
32 | } | 32 | } |
33 | 33 | ||
34 | #nav .nav-hdr { | 34 | #nav .nav-hdr { |
35 | - font-style: italic; | 35 | + font-weight: bold; |
36 | - padding: 6px 8px 6px 8px; | 36 | + font-variant: small-caps; |
37 | + text-transform: uppercase; | ||
38 | + font-size: 12pt; | ||
39 | + padding: 8px 15px; | ||
37 | } | 40 | } |
38 | 41 | ||
39 | #nav a { | 42 | #nav a { |
40 | text-decoration: none; | 43 | text-decoration: none; |
41 | - font-size: 14pt; | 44 | + font-size: 13pt; |
45 | + font-weight: lighter; | ||
42 | display: block; | 46 | display: block; |
43 | - padding: 8px 16px 6px 12px; | 47 | + padding: 6px 10px; |
48 | + margin: 0 7px; | ||
44 | } | 49 | } |
45 | 50 | ||
46 | #nav a div { | 51 | #nav a div { | ... | ... |
... | @@ -24,6 +24,9 @@ | ... | @@ -24,6 +24,9 @@ |
24 | <meta name="apple-mobile-web-app-status-bar-style" content="black"> | 24 | <meta name="apple-mobile-web-app-status-bar-style" content="black"> |
25 | <meta name="viewport" content="width=device-width, initial-scale=1.0"> | 25 | <meta name="viewport" content="width=device-width, initial-scale=1.0"> |
26 | 26 | ||
27 | + <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,300,700' | ||
28 | + rel='stylesheet' type='text/css'> | ||
29 | + | ||
27 | <title>ONOS</title> | 30 | <title>ONOS</title> |
28 | 31 | ||
29 | <!-- Third party library code included here --> | 32 | <!-- Third party library code included here --> | ... | ... |
-
Please register or login to post a comment