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

Unified Diff: static/scss/_navbar.scss

Issue 29587584: Issue 5635 - Implement website-default navbar component (Closed) Base URL: https://hg.adblockplus.org/website-defaults
Patch Set: Variable for adding horizontal padding, link button class Created Dec. 11, 2017, 3:11 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « static/js/navbar.js ('k') | static/scss/_variables.scss » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: static/scss/_navbar.scss
===================================================================
new file mode 100644
--- /dev/null
+++ b/static/scss/_navbar.scss
@@ -0,0 +1,181 @@
+// This file is part of help.eyeo.com.
+// Copyright (C) 2017 Eyeo GmbH
+//
+// help.eyeo.com is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// help.eyeo.com is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with help.eyeo.com. If not, see <http://www.gnu.org/licenses/>.
+
+/*******************************************************************************
+ * Navbar component
+ ******************************************************************************/
+
+.navbar
+{
+ @extend .clearfix;
+}
+
+/* .navbar .navbar-container
+ ****************************************************************************/
+
+.navbar-container
+{
+ @if ($add-horizontal-navbar-padding)
juliandoucette 2017/12/13 16:17:38 NIT/Suggest: Check if $navbar-padding-x (or simila
ire 2017/12/14 10:26:36 I ended up with this solution for a couple of reas
+ {
+ @extend .container;
+ }
+ @else
+ {
+ width: $container-width;
juliandoucette 2017/12/13 16:17:37 TOL: It might be cleaner to create a container mix
ire 2017/12/14 10:26:34 Great idea! Done.
+ max-width: 100%;
+ margin-right: auto;
+ margin-left: auto;
+ }
+}
+
+/* .navbar .navbar-branding
+ ****************************************************************************/
+
+.navbar-branding
+{
+ padding-top: $navbar-padding;
+ padding-bottom: $navbar-padding;
+
+ @if ($add-horizontal-navbar-padding != true)
+ {
+ padding-right: $navbar-padding;
+ padding-left: $navbar-padding;
+ }
+}
+
+.navbar-branding img
+{
+ height: $navbar-branding-height;
+ vertical-align: text-top;
+}
+
+/* .navbar .toggle-navbar-collapse
+ ****************************************************************************/
+
+.toggle-navbar-collapse
+{
+ display: none;
+ padding-top: $navbar-padding + ($navbar-padding / 2);
juliandoucette 2017/12/13 16:17:37 This doesn't scale with the toggle button height.
+ padding-bottom: $navbar-padding + ($navbar-padding / 2);
+
+ @if ($add-horizontal-navbar-padding != true)
+ {
+ padding-right: $navbar-padding;
+ padding-left: $navbar-padding;
+ }
+}
+
+.js .toggle-navbar-collapse
+{
+ display: block;
+
+ @media (min-width: $tablet-breakpoint)
+ {
+ display: none;
+ }
+}
+
+/* .navbar .navbar-collapse
+ ****************************************************************************/
+
+.navbar-collapse
+{
+ clear: both;
+ padding-top: 0;
juliandoucette 2017/12/13 16:17:36 Why is this necessary?
ire 2017/12/14 10:26:36 Looks like it isn't :/ Must've been from a previou
+
+ @media (min-width: $tablet-breakpoint)
+ {
+ float: right;
+ clear: none;
+ }
+}
+
+[dir="rtl"] .navbar-collapse
+{
+ float: left;
+}
+
+.js .navbar-collapse
+{
+ display: none;
+
+ @media (min-width: $tablet-breakpoint)
+ {
+ display: block;
+ }
+}
+
+.expanded .navbar-collapse
+{
+ display: block;
+ width: 100%;
+
+ @media (min-width: $tablet-breakpoint)
+ {
+ width: auto;
+ }
+}
+
+/* .navbar .navbar-nav
+ ****************************************************************************/
+
+.navbar .navbar-nav
+{
+ @if ($add-horizontal-navbar-padding)
juliandoucette 2017/12/13 16:17:36 A vertical padding dependant on horizontal padding
ire 2017/12/14 10:26:37 Yes, that vertical padding is only needed if there
juliandoucette 2017/12/14 12:55:41 Acknowledged.
+ {
+ padding-bottom: $navbar-padding / 2;
+ }
+
+ @media (min-width: $tablet-breakpoint)
+ {
+ padding-bottom: 0;
juliandoucette 2017/12/13 16:17:37 This is only necessary if the previous condition i
ire 2017/12/14 10:26:36 Done.
+
+ @if ($add-horizontal-navbar-padding)
+ {
+ margin-right: -($navbar-padding / 2);
+ margin-left: -($navbar-padding / 2);
+ }
+ }
+}
+
+.navbar .navbar-nav li
+{
+ @media (min-width: $tablet-breakpoint)
+ {
+ display: inline-block;
+ }
+}
+
+.navbar .navbar-nav a
+{
+ display: block;
+ padding-top: $navbar-padding / 2;
+ padding-bottom: $navbar-padding / 2;
+
+ @if ($add-horizontal-navbar-padding != true)
+ {
+ padding-right: $navbar-padding;
+ padding-left: $navbar-padding;
+ }
+
+ @media (min-width: $tablet-breakpoint)
+ {
+ padding-top: $navbar-padding + ($navbar-padding / 2);
juliandoucette 2017/12/13 16:17:36 It seems like both the navbar nav items and the to
ire 2017/12/14 10:26:34 I've made some changes to address this
juliandoucette 2017/12/14 12:55:41 Would you mind explaining your logic?
ire 2017/12/16 09:51:35 Sure :) The issue previously was that if the $nav
+ padding-right: $navbar-padding / 2;
+ padding-bottom: $navbar-padding + ($navbar-padding / 2);
+ padding-left: $navbar-padding / 2;
+ }
+}
« no previous file with comments | « static/js/navbar.js ('k') | static/scss/_variables.scss » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld