Merge lp:~stephen-stewart/snapweb/tidy-up-banner into lp:~snappy-dev/snapweb/trunk

Proposed by Stephen Stewart on 2015-06-02
Status: Merged
Approved by: Sergio Schvezov on 2015-06-03
Approved revision: 156
Merged at revision: 153
Proposed branch: lp:~stephen-stewart/snapweb/tidy-up-banner
Merge into: lp:~snappy-dev/snapweb/trunk
Diff against target: 129 lines (+27/-24)
3 files modified
www/src/css/banner.css (+17/-19)
www/src/css/infobar.css (+9/-4)
www/src/js/templates/layout-banner.hbs (+1/-1)
To merge this branch: bzr merge lp:~stephen-stewart/snapweb/tidy-up-banner
Reviewer Review Type Date Requested Status
Sergio Schvezov 2015-06-02 Approve on 2015-06-03
Review via email: mp+260836@code.launchpad.net

Commit Message

make banner a bit smaller, and a bit less black

To post a comment you must log in.
Sergio Schvezov (sergiusens) wrote :

why not ;-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'www/src/css/banner.css'
2--- www/src/css/banner.css 2015-05-22 12:46:22 +0000
3+++ www/src/css/banner.css 2015-06-02 14:06:40 +0000
4@@ -1,7 +1,7 @@
5 /** @define b-banner; weak */
6
7 .b-banner {
8- background-color:#2f2f2f;
9+ background-color:#37373d;
10 color:#efefef;
11 line-height:20px;
12 }
13@@ -26,11 +26,11 @@
14 .b-banner__brand a {
15 display: flex;
16 align-items:center;
17- padding:15px 2em 15px 15px;
18+ padding:10px 1em;
19 }
20
21 .b-banner__brand img {
22- margin:0 15px 0 0;
23+ margin:0 10px 0 0;
24 }
25
26 .b-banner__search {
27@@ -44,9 +44,9 @@
28 .b-banner__search input[type=search] {
29 width:50%;
30 border:none;
31- height:30px;
32+ height:24px;
33 line-height:20px;
34- padding:15px 25px 15px 15px;
35+ padding:12px 25px 12px 15px;
36 background-color:#333;
37 }
38
39@@ -74,29 +74,31 @@
40 }
41
42 .b-banner__nav-item {
43- border-right:1px solid #333;
44-}
45-
46-.b-banner__nav-item_active {
47 position:relative;
48 }
49
50-.b-banner__nav-item_active::before {
51+.b-banner__nav-item::before {
52+ opacity:0;
53 position:absolute;
54 content:'';
55 background:#dd4814;
56 bottom:0;
57- left:-1px;
58- right:-1px;
59- height:3px;
60+ left:0;
61+ right:0;
62+ height:2px;
63+ transition: opacity 0.3s;
64+}
65+
66+.b-banner__nav-item_active::before {
67+ opacity:1;
68 }
69
70 .b-banner__primary-nav .b-banner__nav-item a {
71 white-space: nowrap;
72- padding:20px 2em;
73+ padding:12px 1em;
74 }
75
76-.b-banner__primary-nav .b-banner__nav-item:hover {
77+.b-banner__nav-item:hover {
78 background-color:#dd4814;
79 }
80
81@@ -104,10 +106,6 @@
82 margin-left:auto;
83 }
84
85-.b-banner__secondary-nav .b-banner__nav-item:last-child {
86- border-right:none;
87-}
88-
89 .b-banner__secondary-nav .b-banner__nav-item a {
90 padding: 15px;
91 }
92
93=== modified file 'www/src/css/infobar.css'
94--- www/src/css/infobar.css 2015-05-26 21:10:37 +0000
95+++ www/src/css/infobar.css 2015-06-02 14:06:40 +0000
96@@ -1,11 +1,16 @@
97 /** @define b-infobar; weak */
98
99 .b-infobar {
100- padding:8px 0;
101- font-size:12px;
102+ padding: 4px 0;
103+ font-size: 12px;
104+ background-color: #eee;
105+ box-shadow:0 2px 1px #ddd;
106+}
107+
108+.b-infobar .b-layout__container {
109+ display:flex;
110+ justify-content:flex-end;
111 }
112
113 .b-infobar__datetime {
114- float:right;
115- display:inline-block;
116 }
117
118=== modified file 'www/src/js/templates/layout-banner.hbs'
119--- www/src/js/templates/layout-banner.hbs 2015-05-22 12:46:22 +0000
120+++ www/src/js/templates/layout-banner.hbs 2015-06-02 14:06:40 +0000
121@@ -2,7 +2,7 @@
122 <div class="b-banner__brand">
123 <div class="b-banner__nav-item{{#if isHomeActive }} b-banner__nav-item_active{{/if}}">
124 <a href="/">
125- <img src="/public/images/cof.svg" height="30" width="30">
126+ <img src="/public/images/cof.svg" height="24" width="24">
127 <span>{{ name }} {{ subname }}</span>
128 </a>
129 </div>

Subscribers

People subscribed via source and target branches