Skip to content

Commit

Permalink
[FIX] breadcrumbs and subnav UI fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
dmh committed Jun 13, 2016
1 parent 439f5d9 commit 8253f71
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 11 deletions.
2 changes: 1 addition & 1 deletion dev/styles/main/icons/icons.less
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
// =======================================
.icon-t3-mobile:before {content: "\e953";} // tel icon
.icon-t3-mail:before {content: "\e934";} // mail icon
.icon-t3-home:before {content: "\e29e";} // home icon
.icon-t3-home:before {content: "\e93b";} // home icon
.icon-t3-sitemap:before {content: "\eb";} // sitemap icon
.icon-t3-login:before {content: "\e967";} // login icon
.icon-t3-map:before {content: "\44";} // map icon
Expand Down
7 changes: 4 additions & 3 deletions dev/styles/main/nav/breadcrumbs.less
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@
}

.breadcrumbs__list-item {
font-size: 16px;
font-size: 14px;
display: inline-block;
color: @breadcrumbs-link-color;
text-transform: uppercase;
}
.breadcrumbs__list-item .icon-t3-home {
padding-right: 5px;
}

.breadcrumbs__list-link{
color: @breadcrumbs-link-color;
Expand All @@ -44,5 +47,3 @@
}
// =========================================================
// =========================================================


10 changes: 9 additions & 1 deletion dev/styles/main/nav/subNavigation.less
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}
.sub-navigation__link {
display: block;
padding: 15px 15px 15px 20px;
padding: 13px 14px 13px 20px;
color: @sub-navigation-link-color;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
Expand All @@ -28,6 +28,12 @@
transition: all 0.1s linear;
border: 1px solid shade(@sub-navigation-border, 5%);
border-width: 0 0 1px 0;
font-size: 15px;
}
@media (min-width: 1200px) {
.sub-navigation__link {
font-size: 16px;
}
}

.sub-navigation__link._sub-level-2 {
Expand Down Expand Up @@ -59,6 +65,7 @@
padding-left: 34px;
background-color: shade(@sub-navigation-background, 9%);
border-color: shade(@sub-navigation-border, 14%);
text-transform: uppercase;
}

.no-touch .sub-navigation__link._sub-level-4:hover {
Expand All @@ -69,6 +76,7 @@
padding-left: 41px;
background-color: shade(@sub-navigation-background, 12%);
border-color: shade(@sub-navigation-border, 17%);
text-transform: uppercase;
}

.no-touch .sub-navigation__link._sub-level-5:hover {
Expand Down
12 changes: 6 additions & 6 deletions dev/templates/parts/nav/breadcrumbs.hbs
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<div class="breadcrumbs">
<div class="breadcrumbs__wrp container">
<ol class="breadcrumbs__list">
<li class="breadcrumbs__list-item"><span class="icons icon-t3-home"></span> <a class="breadcrumbs__list-link" href="index.html">Home</a></li>
<li class="breadcrumbs__list-item"><span class="icons icon-t3-home"></span><a class="breadcrumbs__list-link" href="index.html"><span>Home</span></a></li>

{{#forEach pages }}

{{#if ../page.parent1}}
{{#is menuLevel 1}}
{{#is ../../../page.parent1 basename}}
{{#is data.hideInBreadcrumbs false}}
<li class="breadcrumbs__list-item"><a class="breadcrumbs__list-link" href="{{basename}}.html">{{capitalizeFirst data.title}}</a></li>
<li class="breadcrumbs__list-item"><a class="breadcrumbs__list-link" href="{{basename}}.html"><span>{{capitalizeFirst data.title}}</span></a></li>
{{/is}}
{{/is}}
{{/is}}
Expand All @@ -19,7 +19,7 @@
{{#is menuLevel 2}}
{{#is ../../../page.parent2 basename}}
{{#is data.hideInBreadcrumbs false}}
<li class="breadcrumbs__list-item"><a class="breadcrumbs__list-link" href="{{basename}}.html">{{capitalizeFirst data.title}}</a></li>
<li class="breadcrumbs__list-item"><a class="breadcrumbs__list-link" href="{{basename}}.html"><span>{{capitalizeFirst data.title}}</span></a></li>
{{/is}}
{{/is}}
{{/is}}
Expand All @@ -29,7 +29,7 @@
{{#is menuLevel 3}}
{{#is ../../../page.parent3 basename}}
{{#is data.hideInBreadcrumbs false}}
<li class="breadcrumbs__list-item"><a class="breadcrumbs__list-link" href="{{basename}}.html">{{capitalizeFirst data.title}}</a></li>
<li class="breadcrumbs__list-item"><a class="breadcrumbs__list-link" href="{{basename}}.html"><span>{{capitalizeFirst data.title}}</span></a></li>
{{/is}}
{{/is}}
{{/is}}
Expand All @@ -39,7 +39,7 @@
{{#is menuLevel 4}}
{{#is ../../../page.parent4 basename}}
{{#is data.hideInBreadcrumbs false}}
<li class="breadcrumbs__list-item"><a class="breadcrumbs__list-link" href="{{basename}}.html">{{capitalizeFirst data.title}}</a></li>
<li class="breadcrumbs__list-item"><a class="breadcrumbs__list-link" href="{{basename}}.html"><span>{{capitalizeFirst data.title}}</span></a></li>
{{/is}}
{{/is}}
{{/is}}
Expand All @@ -48,7 +48,7 @@
{{/forEach}}

{{#is page.data.hideInBreadcrumbs false}}
<li class="breadcrumbs__list-item _active">{{title}}</li>
<li class="breadcrumbs__list-item _active"><span>{{title}}</span></li>
{{/is}}
</ol>
</div>
Expand Down

0 comments on commit 8253f71

Please sign in to comment.