Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 36 additions & 14 deletions plugins/CoreHome/stylesheets/layout.less
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,29 @@ ul.browser-default {
ul.right.hide-on-med-and-down {
margin-right: 4px;

.navbar-icon {
padding: 8px;
}
.navbar-label {
padding: 4px;
}
.navbar-label, .navbar-icon {
position: relative;
z-index: 1;
border-radius: 8px;

/* Hover & active background */
&::after {
content: '';
position: absolute;
inset: 0;
z-index: -1;
border-radius: 8px;
background: transparent;
opacity: 0.051;
}
}

> li[role="menuitem"].active {
background: transparent;

Expand All @@ -77,7 +100,10 @@ ul.browser-default {

.navbar-icon,
.navbar-label {
background-color: @theme-color-background-tinyContrast;
&::after {
// contrast + opacity to create an effect that work in light and dark mode, with our without white-label customization
background: @color-mode-black;
}
}
}

Expand All @@ -89,32 +115,29 @@ ul.browser-default {
background: transparent;
}

.navbar-icon {
padding: 8px;
}
.navbar-label {
padding: 4px;
}
.navbar-label, .navbar-icon {
border-radius: 8px;
}

&:hover .navbar-icon,
&:hover .navbar-label,
&:focus .navbar-icon,
&:focus .navbar-label {
background-color: @theme-color-background-tinyContrast;
&::after {
// contrast + opacity to create an effect that work in light and dark mode, with our without white-label customization
background: light-dark(black, white);
}
}
}
}

.languageSelection {
&:hover {
background-color: @theme-color-background-tinyContrast;
background-color: @color-mode-black;
}
}

ul:not(#mobile-top-menu) {
a {
color: @theme-color-header-text;
}

.languageSelection {
.title {
color: @theme-color-header-text;
Expand All @@ -124,7 +147,6 @@ ul.browser-default {
}

ul a {
color: @theme-color-header-text;
text-decoration: none;
font-size: 14px;
padding: 0 8px;
Expand Down
Comment thread
chippison marked this conversation as resolved.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion plugins/Login/stylesheets/login.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
***********************/
#loginPage {
nav {
background-color: @color-white;
background-color: @theme-color-header-background;
}
#logo {
padding-top: 6px;
Expand Down
3 changes: 2 additions & 1 deletion plugins/Morpheus/stylesheets/base.less
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/* base.less is a standalone Less file */

@import "base/colors";
@import "base/mixins";
@import "base/mode-colors";

/* General styles */
@import "general/_default.less";
@import "general/_utils.less";
Expand Down
8 changes: 8 additions & 0 deletions plugins/Morpheus/stylesheets/base/mode-colors.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Mode color
@color-mode-black: #000;
@color-mode-white: #fff;

.inDarkMode({
@color-mode-black: #fff;
@color-mode-white: #000;
});
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions tests/UI/expected-screenshots/Menus_mobile_top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions tests/UI/expected-screenshots/Theme_home.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions tests/UI/expected-screenshots/Theme_home_dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Comment thread
chippison marked this conversation as resolved.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading