Skip to content

Commit e8ee4de

Browse files
committed
update screenshots
- adding some hover and focus for the QuickAccess.vue - fixing 'f' shortcut by opening the menu - adding new theme variable for menu hovered so that we can still retain its #eff0f1 hover colour
1 parent 46950b8 commit e8ee4de

52 files changed

Lines changed: 290 additions & 152 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ā€Žcore/Plugin/ThemeStyles.phpā€Ž

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ class ThemeStyles
6060
'colorWidgetBackground' => 'theme-color-widget-background',
6161
'colorWidgetBorder' => 'theme-color-widget-border',
6262
'filterOnIllustration' => 'theme-filter-on-illustration',
63+
'colorMenuContrastBackgroundHover' => 'theme-color-menu-contrast-backgroundHover',
6364
];
6465

6566
/**
@@ -175,13 +176,18 @@ class ThemeStyles
175176
/**
176177
* @var string|array<string>
177178
*/
178-
public $colorMenuContrastTextSelected;
179+
public $colorMenuContrastTextSelected = ['#1976D2', '#ccc'];
179180

180181
/**
181182
* @var string|array<string>
182183
*/
183184
public $colorMenuContrastTextActive = ['#3450A3', '#fff'];
184185

186+
/**
187+
* @var string|array<string>
188+
*/
189+
public $colorMenuContrastBackgroundHover = ['#eff0f1', '#151819'];
190+
185191
/**
186192
* @var string|array<string>
187193
*/
@@ -277,7 +283,6 @@ public function __construct(string $themeMode)
277283
$this->themeMode = $themeMode;
278284
$this->colorFocusRingAlternative = $this->colorBrand;
279285
$this->colorMenuContrastText = $this->colorText;
280-
$this->colorMenuContrastTextSelected = $this->colorMenuContrastText;
281286
$this->colorMenuContrastBackground = $this->colorBackgroundContrast;
282287
$this->colorWidgetExportedBackgroundBase = $this->colorBackgroundContrast;
283288
$this->colorWidgetTitleText = $this->colorText;
887 Bytes
Loading

ā€Žplugins/CoreHome/stylesheets/layout.lessā€Ž

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@_layout-pageWrap-margin: 18px;
12

23
.card-content > .row:last-child {
34
margin-bottom: 0;
@@ -125,7 +126,7 @@ nav {
125126

126127
#root {
127128
.pageWrap {
128-
width: calc(~'100% - 18px'); // 100% - pageWrap margin
129+
width: calc(~'100% - @{_layout-pageWrap-margin}');
129130
height: fit-content;
130131
padding-left: 9px;
131132
padding-right: 9px;
@@ -183,14 +184,6 @@ nav {
183184
}
184185
}
185186

186-
.quickAccessPlaceholder {
187-
width: 0;
188-
visibility: hidden;
189-
display: inline-block;
190-
position: relative;
191-
margin-right: -1px;
192-
}
193-
194187
.piwikTopControl {
195188
display: inline-block;
196189
float: none;
@@ -267,7 +260,7 @@ nav {
267260
}
268261

269262
.pageWrap {
270-
width: calc(~'100% - 18px') !important; // 100% - pageWrap margin
263+
width: calc(~'100% - @{_layout-pageWrap-margin}') !important;
271264
}
272265
}
273266

@@ -317,11 +310,11 @@ nav {
317310
}
318311
&:focus-visible {
319312
color: @theme-color-text-lighter;
320-
background-color: @theme-color-background-base;
313+
background-color: @theme-color-menu-contrast-backgroundHover;
321314
outline: 1px solid @theme-color-link;
322315
}
323316
&:hover {
324-
background-color: @theme-color-background-base;
317+
background-color: @theme-color-menu-contrast-backgroundHover;
325318
}
326319
.menu-icon {
327320
align-self: flex-start;
@@ -384,22 +377,21 @@ nav {
384377
.font-default(13px, 16px);
385378
padding: 10px 22px 10px 36px;
386379
min-height: 36px;
387-
width: 98%;
388380
border-radius: 8px;
389381
text-decoration: none;
390382
transition: background-color 200ms linear;
391383
&:hover, &.active {
392384
text-decoration: none;
393385
color: @theme-color-menu-contrast-textActive;
394-
background-color: @theme-color-background-base;
386+
background-color: @theme-color-menu-contrast-backgroundHover;
395387
}
396388
}
397389

398390
&.active {
399391
> .menuDropdown,
400392
> .item {
401393
color: @theme-color-menu-contrast-textSelected;
402-
background-color: @theme-color-background-base;
394+
background-color: @theme-color-menu-contrast-backgroundHover;
403395
text-decoration: none;
404396
border-radius: 8px;
405397
}
@@ -597,7 +589,7 @@ nav {
597589

598590
#root{
599591
.layoutWithSidebar--hasSidebar .page > .pageWrap {
600-
width: calc(~'100% - 18px') !important; // 100% - pageWrap margin
592+
width: calc(~'100% - @{_layout-pageWrap-margin}') !important;
601593
}
602594
}
603595
#content.home,

ā€Žplugins/CoreHome/templates/_menu.twigā€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% macro menu(menu, anchorlink, cssClass, currentModule, currentAction, collapsible, isSuperUser, renderQuickAccess) %}
22
<div id="secondNavBar" class="{{ cssClass }} z-depth-1">
33
{% if renderQuickAccess|default(false) %}
4-
<div vue-entry="CoreHome.QuickAccess" class="piwikTopControl borderedControl"></div>
4+
<div vue-entry="CoreHome.QuickAccess" class="piwikTopControl"></div>
55
{% endif %}
66
<ul class="navbar {% if collapsible %}collapsible collapsible-accordion{% endif %} hide-on-med-and-down" aria-label="{{ 'CoreHome_MainNavigation'|translate|e('html_attr') }}" role="menu">
77
{% for level1,level2 in menu %}
Lines changed: 2 additions & 2 deletions
Loading

0 commit comments

Comments
Ā (0)
⚔