Skip to content

Commit 782d172

Browse files
committed
fix(frontend/navbar): weird transition
1 parent da2a8c6 commit 782d172

File tree

5 files changed

+16
-9
lines changed

5 files changed

+16
-9
lines changed

frontend/app/components/sy-topnav/component.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ export default class SyTopnav extends Component {
1010
@tracked expand = false;
1111

1212
get navMobile() {
13-
return this.media.isMo || this.media.isXs || this.media.isSm;
13+
return this.media.isMo || this.media.isXs;
1414
}
1515
}

frontend/app/components/sy-topnav/template.hbs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<nav class="nav-top nav-top--fixed {{if this.expand 'nav-top--expand'}}">
1+
<nav class="nav-top nav-top--fixed {{if (and this.expand this.navMobile) 'nav-top--expand'}}">
22
<header class="nav-top-header">
33
<button
44
class="nav-toggle nav-top-toggle"
@@ -21,8 +21,8 @@
2121
<ul class="nav-top-list">
2222
<li class="nav-top-list-item">
2323
<LinkTo @route="index">
24-
<FaIcon @icon="clock" />
25-
Tracking
24+
<FaIcon @icon="clock" @size="lg" />
25+
<span>Tracking</span>
2626
</LinkTo>
2727
</li>
2828
{{#unless this.navMobile}}

frontend/app/styles/adcssy.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -2536,12 +2536,12 @@ code {
25362536
display: block;
25372537
max-height: 400px;
25382538
overflow-y: auto;
2539+
transition: max-height 0.7s;
25392540
}
25402541

25412542
.nav-top-body {
25422543
max-height: 0;
25432544
overflow: hidden;
2544-
transition: max-height 1.2s;
25452545
}
25462546

25472547
.nav-top-list {

frontend/app/styles/app.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ strong {
355355
margin-right: 10px;
356356
}
357357

358-
div>i {
358+
div > i {
359359
margin-right: 5px;
360360
}
361361
}
@@ -366,8 +366,8 @@ strong {
366366
border-bottom: 3px double $body-color;
367367
}
368368

369-
.table--absence-types>thead>tr>th,
370-
.table--absence-types>tbody>tr>td {
369+
.table--absence-types > thead > tr > th,
370+
.table--absence-types > tbody > tr > td {
371371
.grid {
372372
margin: 0;
373373
}

frontend/app/styles/components/nav-top.scss

+8-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ nav {
1313
display: block;
1414
}
1515

16+
.nav-top-list-item a {
17+
display: grid;
18+
grid-template-columns: 2em 1fr;
19+
align-items: center;
20+
}
21+
1622
@media #{$nav-top-mobile-width} {
1723
.nav-top-header-title {
1824
display: block;
@@ -37,10 +43,11 @@ nav {
3743
.nav-top-list-item a {
3844
padding: 0.6rem 0.8rem;
3945
border-radius: 0;
46+
display: revert;
4047
}
4148

4249
.nav-top-toggle {
4350
display: none;
4451
}
4552
}
46-
}
53+
}

0 commit comments

Comments
 (0)