Skip to content

Commit 3284c53

Browse files
authored
Fix CSS bugs in updated nav bar (#2479)
1 parent 05a5b78 commit 3284c53

5 files changed

Lines changed: 16 additions & 16 deletions

File tree

app/assets/stylesheets/base/_sizes.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ $size-18: 18px;
1212
$size-20: 20px;
1313
$size-22: 22px;
1414
$size-24: 24px;
15+
$size-25: 25px;
1516
$size-26: 26px;
1617
$size-28: 28px;
1718
$size-30: 30px;

app/assets/stylesheets/dashboard/dashboard_content.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.dashboardContent {
22
width: 100%;
33
box-sizing: border-box;
4-
padding: $size-0 25px 50px 25px;
4+
padding: $size-25 $size-25 $size-50 $size-25;
55
display: flex;
66
flex-direction: row;
77
margin-top: $nav-height;

app/assets/stylesheets/secret_share/secret_share_content.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.secretShareContent {
22
width: 100%;
33
box-sizing: border-box;
4-
padding: 50px 25px;
4+
padding: $size-50 $size-25;
55
background: $white-80;
66
margin-top: $nav-height;
77

client/app/components/Header/Header.scss

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
@import "~styles/_global";
22

3+
@mixin hideOnMobile {
4+
@media screen and (max-width: $medium) {
5+
display: none;
6+
}
7+
}
8+
39
@mixin linkStyle() {
410
a {
511
@include standardTransition;
@@ -40,9 +46,7 @@
4046
}
4147

4248
&HideInMobile {
43-
@media screen and (max-width: $medium) {
44-
display: none;
45-
}
49+
@include hideOnMobile;
4650
}
4751

4852
&Hamburger {
@@ -58,22 +62,19 @@
5862
}
5963

6064
&Locale {
61-
@include setMargin($size-0, $size-0, $size-0, $size-26);
65+
@include setMargin($size-0, $size-0, $size-0, $size-25);
6266

6367
display: flex;
6468
align-items: center;
65-
66-
@media screen and (max-width: $medium) {
67-
display: none;
68-
}
69+
@include hideOnMobile;
6970

7071
select {
7172
@include setPadding($size-12, $size-0, $size-12, $size-24);
7273
}
7374
}
7475

7576
&MobileLocale {
76-
@include setMargin($size-20, $size-0, $size-0, $size-0);
77+
@include setMargin($size-20, $size-0, $size-20, $size-0);
7778

7879
display: flex;
7980
justify-content: center;
@@ -129,7 +130,7 @@
129130

130131
&Desktop {
131132
width: 100%;
132-
padding: 25px $size-34;
133+
padding: $size-25 $size-34;
133134
box-sizing: border-box;
134135
margin-bottom: auto;
135136
display: flex;
@@ -171,9 +172,7 @@
171172
@include setMargin($size-0, $size-0, $size-0, $size-0);
172173
}
173174

174-
@media screen and (max-width: $medium) {
175-
display: none;
176-
}
175+
@include hideOnMobile;
177176
}
178177
}
179178
}

client/app/components/Resource/Resource.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
.resource {
44
position: relative;
55
width: 100%;
6-
padding: 25px $size-10;
6+
padding: $size-25 $size-10;
77

88
&::before {
99
content: '';

0 commit comments

Comments
 (0)