Skip to content

Commit b3ff69a

Browse files
committed
Header buttons
1 parent 5da0f06 commit b3ff69a

6 files changed

Lines changed: 26 additions & 19 deletions

File tree

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
<div class="header-block header-block-buttons">
2-
<a href="https://github.com/modularcode/modular-admin-html" class="btn btn-primary-outline btn-sm rounded-s header-btn">
1+
<div class="header-block header-block-buttons" >
2+
<a href="https://github.com/modularcode/modular-admin-html"
3+
class="btn btn-default btn-sm rounded-s header-btn">
34
<i class="fa fa-github-alt"></i>
45
View on GitHub
56
</a>
6-
<a href="https://github.com/modularcode/modular-admin-html/archive/master.zip" class="btn btn-primary-outline btn-sm rounded-s header-btn">
7+
<a href="https://github.com/modularcode/modular-admin-html/releases/download/v{{pkg.version}}/modular-admin-html-{{pkg.version}}.zip"
8+
class="btn btn-default btn-sm rounded-s header-btn">
79
<i class="fa fa-cloud-download"></i>
810
Download .zip
911
</a>
10-
<button type="button" class="btn btn-primary-outline btn-sm rounded-s buttons header-btn">
12+
{{!-- <button type="button" class="btn btn-default btn-sm rounded-s buttons header-btn">
1113
<i class="fa fa-share-alt"></i>
1214
Share
13-
</button>
15+
</button> --}}
1416
</div>

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,16 @@
22
text-align: center;
33
margin-left: auto;
44
margin-right: auto;
5+
white-space: nowrap;
56

6-
.header-btn {
7-
border: 1px solid $color-text;
8-
color: $color-text;
9-
}
10-
11-
.header-btn:hover {
12-
border: 1px solid $color-primary;
13-
color: #ffffff;
14-
}
7+
.btn.header-btn {
8+
background-color: transparent;
9+
border: none;
10+
color: lighten($color-text, 10%);
1511

16-
.header-btn:focus {
17-
border: 1px solid $color-primary;
18-
color: #ffffff;
12+
&:hover,
13+
&:focus {
14+
color: darken($color-text, 10%);
15+
}
1916
}
2017
}

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.header .header-block-nav {
22
margin-left: auto;
3+
white-space: nowrap;
34

45
@include clearfix();
56

@@ -14,10 +15,13 @@
1415
list-style: none;
1516
}
1617

18+
& > ul {
19+
display: table;
20+
}
21+
1722
// First level items
1823
& > ul > li {
19-
// display: inline-block;
20-
float: left;
24+
display: table-cell;
2125
position: relative;
2226

2327
&:before {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929

3030
.notifications-dropdown-menu {
31+
white-space: normal;
3132
left: auto;
3233
right: 0;
3334
min-width: 350px;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
left: auto;
3636
right: 0;
3737
min-width: 180px;
38+
white-space: normal;
3839

3940
&:before {
4041
position: absolute;

src/app/_common/header/search/search.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.header .header-block-search {
22
$line-height: $header-height - 30px;
3+
margin-right: auto;
34

45
// float: left;
56
padding-left: $content-padding-x-md;
@@ -46,6 +47,7 @@
4647
border: none;
4748
padding-left: 25px;
4849
height: 40px;
50+
max-width: 150px;
4951

5052
@include media-down(sm) {
5153
max-width: 140px;

0 commit comments

Comments
 (0)