Skip to content

Style adjustments to needed to position utility nav links #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benjaminapetersen merged 1 commit into from
Mar 16, 2016
Merged

Style adjustments to needed to position utility nav links #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions assets/app/styles/_navbar-alt.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,19 +114,22 @@
cursor: pointer;
line-height: 1;
max-height: (@navbar-pf-alt-height - @navbar-pf-alt-border-width); // to keep Firefox from oversizing icons
padding: 21px 14px;
padding-left: 14px;
padding-right: 14px;
padding-top: @navbar-padding-vertical;
padding-bottom: @navbar-padding-vertical;
position: relative;
color: @navbar-pf-alt-color;
margin-right: 0;
max-height: none;
.username, .status-issue {
display: inline-block;
font-weight: 300;
line-height: 1;
max-width: 100px;
padding: 0 2px;
position: relative;
top: -2px;
vertical-align: bottom;
}
&:hover, &:focus {
background-color: transparent;
Expand All @@ -146,7 +149,6 @@
height: 12px;
}
.status-icon {
font-size: 18px;
padding-right: 2px;
}
}
Expand All @@ -161,6 +163,13 @@
}
}

@media (min-width: @screen-sm-min) {
.navbar-pf-alt .nav-item-iconic {
display: block;
padding: 21px 14px;
}
}

// System status
.navbar-pf-alt {
.system-status-mobile {
Expand Down
5 changes: 2 additions & 3 deletions assets/app/views/directives/header/_navbar-utility.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,10 @@
<li
extension-point
extension-name="nav-system-status"
extension-types="dom"
style="padding: 21px 14px;"></li><!-- TODO: rip out inline styles!! -->
extension-types="dom"></li>

<li uib-dropdown>
<a uib-dropdown-toggle class="nav-item-iconic" id="dropdownMenu1">
<a uib-dropdown-toggle class="nav-item-iconic" id="dropdownMenu1" href="#">
<span title="Help" class="fa pficon-help" aria-hidden="true"></span>
<span class="sr-only">Help</span>
<span class="caret" aria-hidden="true"></span>
Expand Down
5 changes: 3 additions & 2 deletions assets/app/views/directives/header/default-header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@

<navbar-utility class="collapse navbar-collapse"></navbar-utility>

<div
<div row
extension-point
extension-name="nav-system-status-mobile"
extension-types="dom"></div>
extension-types="dom"
class="navbar-flex-btn"></div>

</div>
</nav>
5 changes: 3 additions & 2 deletions assets/app/views/directives/header/project-header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@
</a>
</div>

<div
<div row
extension-point
extension-name="nav-system-status-mobile"
extension-types="dom"></div>
extension-types="dom"
class="navbar-flex-btn"></div>

</div>
</div> <!-- /navbar-project-menu -->
Expand Down