Skip to content

Commit 77218ac

Browse files
committed
Adjust content padding
Adjust header buttons
1 parent 5ac4fcf commit 77218ac

File tree

9 files changed

+69
-26
lines changed

9 files changed

+69
-26
lines changed

src/_common/_styles/layout.scss

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,25 @@
3939

4040
.section {
4141
display: block;
42-
margin-bottom: 30px;
42+
margin-bottom: $content-padding-y-md - $card-margin-bottom;
43+
44+
45+
@include media(xl) {
46+
margin-bottom: $content-padding-y-xl - $card-margin-bottom;
47+
}
48+
49+
@include media(lg) {
50+
margin-bottom: $content-padding-y-lg - $card-margin-bottom;
51+
}
52+
53+
@include media(md) {
54+
margin-bottom: $content-padding-y-md - $card-margin-bottom;
55+
}
56+
57+
@include media-down(sm) {
58+
margin-bottom: $content-padding-y-sm - $card-margin-bottom;
59+
}
60+
4361

4462
&:last-of-type {
4563
margin-bottom: 0;

src/_common/card/card.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
box-shadow: none;
77
}
88

9-
margin-bottom: 10px;
9+
margin-bottom: $card-margin-bottom;
1010
border-radius: 0;
1111
border: none;
1212

src/_variables.scss

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,17 @@ $dropbown-color-border: fade-out($color-text-light, 0.9) !default;
6969
$dropdown-link-hover-color-bg: #f5f5f5 !default;
7070

7171
// Content
72-
$content-padding-x-lg: 50px !default;
73-
$content-padding-y-lg: 50px !default;
72+
$content-padding-x-xl: 40px !default;
73+
$content-padding-y-xl: 35px !default;
7474

75-
$content-padding-x-md: 30px !default;
76-
$content-padding-y-md: 40px !default;
75+
$content-padding-x-lg: 35px !default;
76+
$content-padding-y-lg: 30px !default;
77+
78+
$content-padding-x-md: 20px !default;
79+
$content-padding-y-md: 25px !default;
7780

7881
$content-padding-x-sm: 20px !default;
79-
$content-padding-y-sm: 25px !default;
82+
$content-padding-y-sm: 20px !default;
8083

8184
$content-padding-x-xs: 10px !default;
8285
$content-padding-y-xs: 15px !default;
@@ -87,6 +90,8 @@ $card-padding-x: 15px !default;
8790
$card-padding-x-xl: 20px !default;
8891
$card-padding-x-sm: 10px !default;
8992

93+
$card-margin-bottom: 10px;
94+
9095
// Item list
9196
$item-list-color-border: lighten($color-divider, 6%) !default;
9297

src/app/_common/header/buttons/buttons.hbs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
<div class="header-block header-block-buttons" >
22
<a href="https://github.com/modularcode/modular-admin-html"
3-
class="btn btn-oval btn-sm rounded-s header-btn">
3+
class="btn btn-sm header-btn">
44
<i class="fa fa-github-alt"></i>
5-
View on GitHub
5+
<span>View on GitHub</span>
66
</a>
7+
8+
<a href="https://github.com/modularcode/modular-admin-html/stargazers"
9+
class="btn btn-sm header-btn">
10+
<i class="fa fa-star"></i>
11+
<span>Star Us</span>
12+
</a>
13+
714
<a href="https://github.com/modularcode/modular-admin-html/releases/download/v{{pkg.version}}/modular-admin-html-{{pkg.version}}.zip"
8-
class="btn btn-oval btn-sm rounded-s header-btn">
15+
class="btn btn-sm header-btn">
916
<i class="fa fa-cloud-download"></i>
10-
Download .zip
17+
<span>Download .zip</span>
1118
</a>
1219
{{!-- <button type="button" class="btn btn-default btn-sm rounded-s buttons header-btn">
1320
<i class="fa fa-share-alt"></i>

src/app/_common/header/buttons/buttons.scss

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,22 @@
99
border: 1px solid lighten($color-text, 10%);
1010
color: lighten($color-text, 10%);
1111
margin: 0 5px;
12+
border-radius: 0.2rem;
13+
// border-radius: 25px;
1214

1315
&:hover,
1416
&:focus {
1517
border: 1px solid darken($color-text, 10%);
1618
color: darken($color-text, 10%);
1719
}
18-
}
1920

20-
@include media-down(sm) {
21-
display: none;
21+
22+
@include media-down(sm) {
23+
span {
24+
display: none;
25+
}
26+
}
2227
}
28+
29+
2330
}

src/app/_common/header/collapse/collapse.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
.header .header-block-collapse {
22

3-
// padding-left: 0;
43
padding-right: 5px;
54

5+
@include media-down(sm) {
6+
width: 155px;
7+
}
8+
69
.collapse-btn {
710
background: none;
811
border: none;
@@ -17,5 +20,4 @@
1720
padding-right: 10px;
1821
vertical-align: initial;
1922
}
20-
2123
}

src/app/_common/header/header.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
display: flex;
1111
align-items: center;
12+
justify-content: space-between;
1213

1314

1415
@include media-down(md) {
@@ -25,8 +26,6 @@
2526
}
2627

2728
.header-block {
28-
margin-right: 15px;
29-
3029
@include media-down(sm) {
3130
padding: 5px;
3231
}

src/app/_common/header/nav/nav.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
.header .header-block-nav {
22
margin-left: auto;
33
white-space: nowrap;
4+
padding-right: 15px;
5+
6+
@include media-down(sm) {
7+
padding-right: 25px;
8+
}
49

510
@include clearfix();
611

src/app/app.scss

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,29 @@
1919
min-height: 100vh;
2020

2121
@include media(xl) {
22-
$padding-x: $content-padding-x-lg;
23-
$padding-y: $content-padding-y-lg;
22+
$padding-x: $content-padding-x-xl;
23+
$padding-y: $content-padding-y-xl;
2424

2525
padding: $header-height + $padding-y $padding-x $footer-height + $padding-y $padding-x;
2626
}
2727

2828
@include media(lg) {
29-
$padding-x: $content-padding-x-md;
30-
$padding-y: $content-padding-y-md;
29+
$padding-x: $content-padding-x-lg;
30+
$padding-y: $content-padding-y-lg;
3131

3232
padding: $header-height + $padding-y $padding-x $footer-height + $padding-y $padding-x;
3333
}
3434

3535
@include media(md) {
36-
$padding-x: $content-padding-x-sm;
37-
$padding-y: $content-padding-y-sm;
36+
$padding-x: $content-padding-x-md;
37+
$padding-y: $content-padding-y-md;
3838

3939
padding: $header-height + $padding-y $padding-x $footer-height + $padding-y $padding-x;
4040
}
4141

4242
@include media-down(sm) {
43-
$padding-x: $content-padding-x-xs;
44-
$padding-y: $content-padding-y-xs;
43+
$padding-x: $content-padding-x-sm;
44+
$padding-y: $content-padding-y-sm;
4545

4646
padding: $header-height-xs + $padding-y $padding-x $footer-height + $padding-y $padding-x;
4747
}

0 commit comments

Comments
 (0)