Skip to content

Commit 19ce6ca

Browse files
committed
Valeriia's feedback on top_controls spacing
1 parent dc43bfd commit 19ce6ca

5 files changed

Lines changed: 36 additions & 55 deletions

File tree

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

Lines changed: 34 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,9 @@ nav {
141141
width: calc(~'100% - 224px - 18px'); // 100% - menu width - pageWrap margin
142142
}
143143

144-
&>.top_controls {
145-
.icon-arrowup:before, .icon-arrowdown:before {
146-
padding: 17px 0 0 0;
147-
display: inline-block;
144+
& > .top_controls {
145+
.icon-arrowup:before,
146+
.icon-arrowdown:before {
148147
cursor: pointer;
149148

150149
@media screen and (max-width: 600px) {
@@ -170,34 +169,18 @@ nav {
170169
}
171170

172171
@media all and (max-width: 600px) {
173-
.top_controls {
174-
height: auto;
175-
176-
.piwikTopControl {
177-
float: none;
178-
margin: 0 23px 10px 17px !important;
179-
display: block !important;
172+
.piwikSelector {
173+
> a.title {
174+
max-width: none;
180175
}
176+
}
181177

182-
.piwikSelector {
183-
> a.title {
184-
max-width: none;
185-
}
186-
}
187-
188-
.quick-access {
189-
width: auto !important;
190-
191-
input {
192-
padding-left: 15px !important;
193-
}
178+
.quickAccessInside {
179+
flex: auto;
180+
}
194181

195-
.icon-search {
196-
position: absolute;
197-
left: unset;
198-
right: 36px;
199-
}
200-
}
182+
.quick-access {
183+
width: auto !important;
201184
}
202185
}
203186

@@ -435,7 +418,7 @@ nav {
435418
opacity: 0;
436419
padding-left: 16px;
437420

438-
@media screen and (max-width: 600px){
421+
@media screen and (max-width: 600px) {
439422
visibility: hidden;
440423
opacity: 0;
441424
padding-left: 0;
@@ -444,13 +427,13 @@ nav {
444427
.quick-access {
445428
position: absolute;
446429
width: 208px;
447-
margin-left: 0;
430+
margin-right: 8px;
448431

449-
@media screen and (max-width: 600px){
432+
@media screen and (max-width: 600px) {
450433
z-index: 1000;
451434
position: absolute;
452435
width: 208px;
453-
margin-left: 16px;
436+
margin-right: 0;
454437
}
455438

456439
.dropdown {
@@ -473,11 +456,6 @@ nav {
473456
color: #a9a9a9;
474457
}
475458
}
476-
477-
.piwikTopControl {
478-
margin-top: 10px;
479-
margin-bottom: 10px;
480-
}
481459
}
482460
}
483461

@@ -500,20 +478,27 @@ nav {
500478

501479
#root, #standalone {
502480
.top_controls {
503-
min-height: 51px;
504481
position: relative;
505-
background-color: @theme-color-background-base;
482+
display: flex;
483+
justify-content: flex-start;
484+
align-items: center;
485+
flex-wrap: wrap;
486+
gap: 8px;
487+
506488
height: auto;
507-
margin-bottom: 8px;
508-
margin-top: 8px;
489+
min-height: 51px;
490+
margin-top: 24px;
491+
margin-bottom: 24px;
492+
493+
@media all and (max-width: 600px) {
494+
flex-direction: column;
495+
align-items: stretch;
496+
padding: 0 23px 0 17px;
497+
}
509498

510499
.piwikTopControl {
511-
display: inline-block;
512-
float: none;
513500
position: relative;
514-
margin-right: 14px;
515-
vertical-align: top;
516-
font-size: 11px;
501+
font-size: 14px;
517502
}
518503
}
519504
}
@@ -548,9 +533,9 @@ nav {
548533
width: calc(~'100% - 18px') !important; // 100% - pageWrap margin
549534
}
550535

551-
.top_controls{
536+
.top_controls {
552537
.quick-access {
553-
display: none !important;
538+
display: none !important;
554539
}
555540
}
556541
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
.piwikSelector {
1919
position: relative;
20-
display: flex;
20+
display: inline-flex;
2121
border: @_selector-button_border;
2222
border-radius: @_selector-button_border-radius;
2323
box-shadow: @_selector-button_box-shadow;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
></div>
3434

3535
<span class="icon icon-arrowup"></span>
36-
<div style="clear:right"></div>
3736
{% else %}
3837
<span class="icon icon-arrowup"></span>
3938
{% endif %}

ā€Žplugins/MultiSites/vue/src/AllWebsitesDashboard/AllWebsitesDashboard.lessā€Ž

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88

99
@media all and (max-width: 600px) { /* 1120px + padding */
1010
min-height: auto;
11-
12-
.piwikTopControl {
13-
margin: 0 !important;
14-
}
1511
}
1612

1713
.row {

ā€Žplugins/SegmentEditor/stylesheets/segmentation.lessā€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ div.scrollable {
198198
}
199199

200200
.segmentEditorPanel .segmentListContainer {
201+
flex: auto;
201202
line-height: 14px;
202203
}
203204

0 commit comments

Comments
Ā (0)
⚔