Skip to content

Commit 69e09ae

Browse files
committed
updating used variable colours to use theme colours
- updating TagManager - fixing for multi-line menu items - update based on feedback
1 parent 6a32f17 commit 69e09ae

8 files changed

Lines changed: 143 additions & 129 deletions

File tree

plugins/CoreHome/stylesheets/layout.less

Lines changed: 99 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ nav {
125125

126126
#root {
127127
.pageWrap {
128-
width: 100%;
128+
width: calc(~'100% - 18px'); // 100% - pageWrap margin
129129
height: fit-content;
130130
padding-left: 9px;
131131
padding-right: 9px;
@@ -142,12 +142,17 @@ nav {
142142
min-width: 0;
143143
}
144144

145-
.layoutWithSidebar--hasSidebar .page > .pageWrap {
146-
width: calc(~'100% - 18px'); // 100% - pageWrap margin
147-
}
145+
.top_controls {
146+
min-height: 51px;
147+
position: relative;
148+
background-color: @theme-color-background-base;
149+
height: auto;
150+
margin-bottom: 8px;
151+
margin-top: 8px;
152+
visibility: hidden;
153+
opacity: 0;
154+
padding-left: 18px;
148155

149-
.top_controls,
150-
.layoutWithSidebar .top_controls {
151156
.icon-arrowup:before, .icon-arrowdown:before {
152157
padding: 17px 0 0 0;
153158
display: inline-block;
@@ -157,6 +162,51 @@ nav {
157162
display: none;
158163
}
159164
}
165+
166+
@media all and (max-width: 600px) {
167+
height: auto;
168+
padding-left: 0;
169+
170+
.piwikTopControl {
171+
position: static !important;
172+
float: none;
173+
margin: 0 23px 10px 17px !important;
174+
display: block !important;
175+
}
176+
177+
.piwikSelector {
178+
> a.title {
179+
max-width: none;
180+
}
181+
182+
display: block;
183+
}
184+
}
185+
186+
.quickAccessPlaceholder {
187+
width: 0;
188+
visibility: hidden;
189+
display: inline-block;
190+
position: relative;
191+
margin-right: -1px;
192+
}
193+
194+
.piwikTopControl {
195+
display: inline-block;
196+
float: none;
197+
position: relative;
198+
margin-right: 14px;
199+
margin-top: 10px;
200+
margin-bottom: 10px;
201+
vertical-align: top;
202+
font-size: 11px;
203+
}
204+
205+
@media print {
206+
.quick-access {
207+
display: none !important;
208+
}
209+
}
160210
}
161211

162212
@media only screen and (min-width: 993px) {
@@ -169,7 +219,7 @@ nav {
169219
flex: 0 0 224px;
170220
background-color: @theme-color-menu-contrast-background;
171221
box-shadow: none !important;
172-
padding: 16px 16px;
222+
padding: 16px 12px;
173223
}
174224

175225
.layoutWithSidebarContent {
@@ -187,18 +237,28 @@ nav {
187237
#secondNavBar {
188238
width: 0 !important;
189239
.quick-access {
190-
display: none;
240+
margin-left: 16px;
241+
z-index: 1000;
242+
position: fixed;
243+
top: 15px;
244+
width: 268px;
245+
246+
opacity: 0;
247+
visibility: hidden;
248+
pointer-events: none;
249+
transform: translateX(-24px);
250+
transition: opacity 50ms ease-out;
191251
}
192252

193253
&.mobileLeftMenuOpen {
194254
width: auto !important;
195255

196-
> .quick-access {
197-
margin-left: 16px;
198-
display: block;
199-
z-index: 1000;
200-
position: fixed;
201-
top: 15px;
256+
.quick-access {
257+
opacity: 1;
258+
visibility: visible;
259+
pointer-events: auto;
260+
transform: translateX(0);
261+
transition: opacity 380ms ease, transform 380ms ease;
202262
}
203263
.sidenav > .no-padding:first-child {
204264
padding-top: 65px !important;
@@ -211,26 +271,6 @@ nav {
211271
}
212272
}
213273

214-
@media all and (max-width: 600px) {
215-
.top_controls {
216-
height: auto;
217-
218-
.piwikTopControl {
219-
position: static !important;
220-
float: none;
221-
margin: 0 23px 10px 17px !important;
222-
display: block !important;
223-
}
224-
225-
.piwikSelector {
226-
> a.title {
227-
max-width: none;
228-
}
229-
230-
display: block;
231-
}
232-
}
233-
}
234274
#ajaxLoadingDiv {
235275
margin-bottom: 10px;
236276
}
@@ -244,7 +284,7 @@ nav {
244284
padding-right: 8px;
245285
display: inline;
246286
font-size: 16px;
247-
color: @left-menu-item-icon-color;
287+
color: @theme-color-text-contrast;
248288
}
249289

250290
.reporting-menu-sub-icon {
@@ -261,36 +301,42 @@ nav {
261301

262302
.item {
263303
width: 100%;
264-
height: 42px;
304+
min-height: 42px;
265305
padding: 8px 12px;
266306
word-wrap: break-word;
267307
word-break: break-word;
268308
display: flex;
269309
align-items: center;
270310
.font-default(14px, 20px);
271-
color: @left-menu-item-color;
311+
color: @theme-color-text-lighter;
272312
border-radius: 8px;
273313
cursor: pointer;
274314
text-decoration: none;
275315
&:hover, &:focus {
276316
outline: 0;
277317
}
278318
&:focus-visible {
279-
color: @left-menu-item-color;
319+
color: @theme-color-text-lighter;
280320
background-color: @theme-color-background-base;
281-
outline: 1px solid @left-menu-item-hover-text-color;
321+
outline: 1px solid @theme-color-link;
282322
}
283323
&:hover {
284324
background-color: @theme-color-background-base;
285325
}
326+
.menu-icon {
327+
align-self: flex-start;
328+
flex: 0 0 auto;
329+
margin-top: 5px;
330+
}
286331
}
287332

288333
.item-help-icon {
289334
display:none;
290335
opacity: 0.2;
291336
position: absolute;
292-
right: 21px;
337+
right: 0;
293338
top: 0;
339+
padding: 10px;
294340
line-height: 13px;
295341
height: calc(100%);
296342
align-items: center;
@@ -333,36 +379,35 @@ nav {
333379
width: 100%;
334380
margin-left: auto;
335381
margin-right: auto;
382+
336383
.item {
337384
.font-default(13px, 16px);
338385
padding: 10px 22px 10px 36px;
339-
height: 36px;
386+
min-height: 36px;
340387
width: 98%;
388+
border-radius: 8px;
389+
}
390+
&:hover, &.active {
391+
background-color: @theme-color-background-base;
392+
border-radius: 8px;
341393
}
342394
&.active {
343395
> .menuDropdown,
344396
> .item {
345-
color: @left-menu-item-hover-text-color;
397+
color: @theme-color-link;
346398
background-color: @theme-color-background-base;
347399
text-decoration: none;
348400
border-radius: 8px;
349401
}
350402
}
351403
}
352-
li:hover{
353-
background-color: @theme-color-background-base;
354-
border-radius: 8px;
355-
.item {
356-
border-radius: 8px;
357-
}
358-
}
359404
}
360405
}
361406
li.active, li:hover {
362407
>.item {
363-
color: @left-menu-item-hover-text-color;
408+
color: @theme-color-link;
364409
.menu-icon {
365-
color: @left-menu-item-hover-text-color;
410+
color: @theme-color-link;
366411
}
367412
}
368413
}
@@ -392,7 +437,7 @@ nav {
392437
}
393438

394439
.title {
395-
color: @left-menu-item-color;
440+
color: @theme-color-text-lighter;
396441
padding: 10px 10px 10px 36px;
397442
font-size: 13px;
398443
font-weight: normal;
@@ -403,7 +448,7 @@ nav {
403448
justify-content: space-between;
404449

405450
&:hover, &:focus {
406-
color: @left-menu-item-hover-text-color;
451+
color: @theme-color-link;
407452
}
408453

409454
&:after {
@@ -461,29 +506,6 @@ nav {
461506
padding: 0;
462507
}
463508
}
464-
.top_controls {
465-
visibility: hidden;
466-
opacity: 0;
467-
padding-left: 18px;
468-
469-
.quickAccessPlaceholder {
470-
width: 0;
471-
visibility: hidden;
472-
display: inline-block;
473-
position: relative;
474-
margin: 0;
475-
}
476-
@media screen and (max-width: 600px){
477-
visibility: hidden;
478-
opacity: 0;
479-
padding-left: 0;
480-
}
481-
482-
.piwikTopControl {
483-
margin-top: 10px;
484-
margin-bottom: 10px;
485-
}
486-
}
487509
}
488510

489511
.badge-menu-item-container {
@@ -516,7 +538,7 @@ nav {
516538
margin-left: 10px;
517539
}
518540

519-
#root, #standalone {
541+
#standalone {
520542
.top_controls {
521543
min-height: 51px;
522544
position: relative;
@@ -579,12 +601,6 @@ nav {
579601
.layoutWithSidebar--hasSidebar .page > .pageWrap {
580602
width: calc(~'100% - 18px') !important; // 100% - pageWrap margin
581603
}
582-
583-
.top_controls{
584-
.quick-access {
585-
display: none !important;
586-
}
587-
}
588604
}
589605
#content.home,
590606
#content.admin {

0 commit comments

Comments
 (0)