Skip to content
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.

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

Jump to bottom

Navigation header metric tweaks #2924

Merged
merged 4 commits into from Apr 6, 2018
Merged

Navigation header metric tweaks #2924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f3eacd6
How to geometry
nanaya Apr 6, 2018
dc7edad
Smaller logo and avatar to fit polish menu
nanaya Apr 6, 2018
a74fb7c
Bring the search button closer to the rest of menu
nanaya Apr 6, 2018
2eb16f4
Always visible scroll bar
nanaya Apr 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions resources/assets/less/bem/nav2.less
View file
Open in desktop
Expand Up @@ -23,11 +23,11 @@
@_menu-gutter: 10px;
@_link-padding-vertical: 6px;
@_link-highlight-margin-vertical: 2px;
@_padding-vertical: 10px;
@_padding-vertical: 15px;
@_padded-height: @nav2-menu-height + (@_padding-vertical * 2);

.own-layer();
padding: 0 @_padding-vertical;
padding: @_padding-vertical 0;
width: 100%;
height: @_padded-height;
display: flex;
Expand Down Expand Up @@ -69,10 +69,10 @@
top: 100%;
right: 0; // avoid overflow before repositioned
height: 0; // avoid covering page when the content is hidden
margin-top: -20px;
margin-top: -5px;

&--user {
margin-top: 5px;
margin-top: 20px;
}
}

Expand Down Expand Up @@ -117,7 +117,8 @@
background-image: url('/images/layout/osu-logo-white.svg');

.@{_top}__logo-link:hover & {
transform: scale(1.1);
// be careful of weird snapping at the end of animation on Firefox (with 1.1, ~60px).
transform: scale(1.11);
}

&--bg {
Expand All @@ -131,7 +132,7 @@
}

&__logo-link {
@__logo-whitespace: 6px;
@__logo-whitespace: 5px;
@_logo-size: (@nav2-menu-height + @__logo-whitespace * 2);
width: @_logo-size;
height: @_logo-size;
Expand Down Expand Up @@ -192,7 +193,6 @@
.circle(40px);
align-self: center;
padding: 0;
margin: 0 @_menu-gutter;
}
}

Expand All @@ -210,7 +210,7 @@
position: absolute;
top: 100%;
height: 0; // avoid covering page when the content is hidden
margin-top: -20px;
margin-top: -5px;
left: @_menu-gutter;
white-space: nowrap;
display: flex;
Expand Down
1 change: 1 addition & 0 deletions resources/assets/less/layout.less
View file
Open in desktop
Expand Up @@ -35,6 +35,7 @@ html, body {

body {
-ms-overflow-style: scrollbar;
overflow-y: scroll;
}

.content {
Expand Down
2 changes: 1 addition & 1 deletion resources/assets/less/variables.less
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@
@desktop: ~"(min-width: @{screen-sm-min})";
@mobile: ~"(max-width: @{screen-mobile-max})";

@nav2-menu-height: 70px;
@nav2-menu-height: 60px;
@nav2-header-height: 360px;

@bar-size: 3px;
Expand Down