Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: static/scss/_navbar.scss

Issue 29587584: Issue 5635 - Implement website-default navbar component (Closed) Base URL: https://hg.adblockplus.org/website-defaults
Left Patch Set: Demo - Use table layout Created Nov. 2, 2017, 11:08 a.m.
Right Patch Set: Rebase Created Jan. 4, 2018, 7:40 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « static/js/navbar.js ('k') | static/scss/_variables.scss » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 // This file is part of help.eyeo.com. 1 // This file is part of help.eyeo.com.
2 // Copyright (C) 2017 Eyeo GmbH 2 // Copyright (C) 2017 Eyeo GmbH
3 // 3 //
4 // help.eyeo.com is free software: you can redistribute it and/or modify 4 // help.eyeo.com is free software: you can redistribute it and/or modify
5 // it under the terms of the GNU General Public License as published by 5 // it under the terms of the GNU General Public License as published by
6 // the Free Software Foundation, either version 3 of the License, or 6 // the Free Software Foundation, either version 3 of the License, or
7 // (at your option) any later version. 7 // (at your option) any later version.
8 // 8 //
9 // help.eyeo.com is distributed in the hope that it will be useful, 9 // help.eyeo.com is distributed in the hope that it will be useful,
10 // but WITHOUT ANY WARRANTY; without even the implied warranty of 10 // but WITHOUT ANY WARRANTY; without even the implied warranty of
11 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 // GNU General Public License for more details. 12 // GNU General Public License for more details.
13 // 13 //
14 // You should have received a copy of the GNU General Public License 14 // You should have received a copy of the GNU General Public License
15 // along with help.eyeo.com. If not, see <http://www.gnu.org/licenses/>. 15 // along with help.eyeo.com. If not, see <http://www.gnu.org/licenses/>.
16 16
17 /******************************************************************************* 17 /*******************************************************************************
18 * Navbar component 18 * Navbar component
19 ******************************************************************************/ 19 ******************************************************************************/
20 20
21 .navbar .container 21 .navbar
22 { 22 {
23 display: table; 23 @extend .clearfix;
24 width: 100%;
ire 2017/11/02 11:15:28 For some reason this didn't work when it was the o
juliandoucette 2017/11/02 13:31:23 Acknowledged.
25 max-width: $large-desktop-width;
26 } 24 }
27 25
28 .navbar button 26 /* .navbar .navbar-container
27 ****************************************************************************/
28
29 .navbar-container
29 { 30 {
30 color: inherit; 31 @if ($add-horizontal-navbar-padding)
32 {
33 @extend .container;
34 }
35 @else
36 {
37 @include container($container-width, 0px);
38 }
31 } 39 }
32 40
33 .navbar-branding, 41 /* .navbar .navbar-branding
34 .toggle-navbar-collapse, 42 ****************************************************************************/
35 .navbar-collapse 43
44 .navbar-branding
36 { 45 {
37 display: table-cell; 46 padding-top: $navbar-padding + ($navbar-padding / 4);
38 padding-top: $small-space; 47 padding-bottom: $navbar-padding + ($navbar-padding / 4);
39 padding-bottom: $small-space; 48 line-height: 1;
40 vertical-align: middle; 49
50 @if ($add-horizontal-navbar-padding != true)
51 {
52 padding-right: $navbar-padding;
53 padding-left: $navbar-padding;
54 }
55 }
56
57 .navbar-branding img
58 {
59 height: $navbar-branding-height;
60 vertical-align: text-top;
41 } 61 }
42 62
43 /* .navbar .toggle-navbar-collapse 63 /* .navbar .toggle-navbar-collapse
44 ****************************************************************************/ 64 ****************************************************************************/
45 65
46 .toggle-navbar-collapse 66 .toggle-navbar-collapse
47 { 67 {
48 display: none; 68 display: none;
69 padding-top: ($navbar-branding-height / 2) + ($navbar-padding / 2);
70 padding-bottom: ($navbar-branding-height / 2) + ($navbar-padding / 2);
71
72 @if ($add-horizontal-navbar-padding != true)
73 {
74 padding-right: $navbar-padding;
75 padding-left: $navbar-padding;
76 }
49 } 77 }
50 78
51 .js .toggle-navbar-collapse 79 .js .toggle-navbar-collapse
52 { 80 {
53 display: table-cell; 81 display: block;
54 82
55 @media (min-width: $tablet-breakpoint) 83 @media (min-width: $tablet-breakpoint)
56 { 84 {
57 display: none; 85 display: none;
58 } 86 }
59 } 87 }
60 88
61 .toggle-navbar-collapse button
62 {
63 min-width: 100px;
64 border: 0;
65 background-color: transparent;
66 cursor: pointer;
67 }
68
69 .js .toggle-navbar-collapse .close-label
70 {
71 display: none;
72 }
73
74 .expanded .toggle-navbar-collapse .open-label
75 {
76 display: none;
77 }
78
79 .expanded .toggle-navbar-collapse .close-label
80 {
81 display: inline;
82 }
83
84 /* .navbar .navbar-collapse 89 /* .navbar .navbar-collapse
85 ****************************************************************************/ 90 ****************************************************************************/
86 91
87 .navbar-collapse 92 .navbar-collapse
88 { 93 {
89 display: table-row; 94 clear: both;
90 text-align: left;
91 95
92 @media (min-width: $tablet-breakpoint) 96 @media (min-width: $tablet-breakpoint)
93 { 97 {
94 display: table-cell; 98 float: right;
95 text-align: right; 99 clear: none;
96 } 100 }
97 } 101 }
98 102
99 [dir="rtl"] .navbar-collapse 103 [dir="rtl"] .navbar-collapse
100 { 104 {
101 text-align: right; 105 float: left;
102
103 @media (min-width: $tablet-breakpoint)
104 {
105 text-align: left;
106 }
107 } 106 }
108 107
109 .js .navbar-collapse 108 .js .navbar-collapse
110 { 109 {
111 display: none; 110 display: none;
112 111
113 @media (min-width: $tablet-breakpoint) 112 @media (min-width: $tablet-breakpoint)
114 { 113 {
115 display: table-cell; 114 display: block;
116 } 115 }
117 } 116 }
118 117
119 .expanded .navbar-collapse 118 .expanded .navbar-collapse
120 { 119 {
121 display: table-row; 120 display: block;
122 } 121 width: 100%;
123 122
124 .no-js .navbar-collapse:after, 123 @media (min-width: $tablet-breakpoint)
125 .expanded .navbar-collapse:after
ire 2017/11/02 11:15:28 This is the only way I could think of to add botto
juliandoucette 2017/11/02 13:31:23 You could add padding to the nav within instead.
126 {
127 @media (max-width: $tablet-breakpoint + 1px)
128 { 124 {
129 display: block; 125 width: auto;
130 height: $small-space;
131 content: "";
132 } 126 }
133 } 127 }
134 128
129 /* .navbar .navbar-nav
130 ****************************************************************************/
131
132 @if ($add-horizontal-navbar-padding)
133 {
134 .navbar .navbar-nav
135 {
136 padding-bottom: $navbar-padding / 2;
137
138 @media (min-width: $tablet-breakpoint)
139 {
140 margin-right: -($navbar-padding / 2);
141 margin-left: -($navbar-padding / 2);
142 padding-bottom: 0;
143 }
144 }
145 }
146
147 .navbar .navbar-nav li
148 {
149 @media (min-width: $tablet-breakpoint)
150 {
151 display: inline-block;
152 }
153 }
154
155 .navbar .navbar-nav a
156 {
157 display: block;
158 padding-top: $navbar-padding / 2;
159 padding-bottom: $navbar-padding / 2;
160
161 @if ($add-horizontal-navbar-padding != true)
162 {
163 padding-right: $navbar-padding;
164 padding-left: $navbar-padding;
165 }
166
167 @media (min-width: $tablet-breakpoint)
168 {
169 padding-top: ($navbar-branding-height / 2) + ($navbar-padding / 2);
170 padding-right: $navbar-padding / 2;
171 padding-bottom: ($navbar-branding-height / 2) + ($navbar-padding / 2);
172 padding-left: $navbar-padding / 2;
173 }
174 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld