Skip to content

Commit 2d53451

Browse files
committed
Fixed 'Header' for mobile and tablets.
1 parent bb2267c commit 2d53451

File tree

8 files changed

+30
-12
lines changed

8 files changed

+30
-12
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Sing App Angular Dashboard - Ngx Admin Template (5.2.2 Full version) with Angular 8.0 Final Release support
1+
# Sing App Angular Dashboard - Ngx Admin Template (5.2.3 Full version) with Angular 8.0 Final Release support
22

33
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 8.0.3.
44

changelog.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## [5.2.3]
4+
5+
### Fixed
6+
7+
- Fixed 'Header' for mobile and tablets.
8+
39
## [5.2.2]
410

511
### Updated

src/app/layout/layout.template.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<app-sidebar id="sidebar" role="navigation" class="sidebar"></app-sidebar>
2-
<app-navbar (toggleSidebarEvent)="toggleSidebarListener($event)"
3-
(toggleChatEvent)="toggleChatListener()" class="page-controls navbar navbar-dashboard"></app-navbar>
2+
<app-navbar
3+
(toggleSidebarEvent)="toggleSidebarListener($event)"
4+
(toggleChatEvent)="toggleChatListener()"
5+
class="page-controls navbar navbar-dashboard"
6+
></app-navbar>
47
<app-chat-sidebar class="chat-sidebar"></app-chat-sidebar>
58
<theme-helper></theme-helper>
69
<div class="content-wrap" id="content-wrap">

src/app/layout/navbar/navbar.template.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</a>
1111
<!-- shown on xs & sm screen. collapses and expands navigation -->
1212
<a (click)="toggleSidebar('collapse')" class="d-lg-none nav-link" href="#" data-html="true" title="Show/hide<br>sidebar" data-placement="bottom">
13-
<span class="rounded rounded-lg bg-gray text-white d-md-none"><i class="la la-bars la-lg"></i></span>
13+
<span class="rounded rounded-lg text-gray d-md-none"><i class="la la-bars la-lg"></i></span>
1414
<i class="ml-3 la la-bars la-lg d-none d-md-block d-lg-none"></i>
1515
</a>
1616
</li>
@@ -21,19 +21,19 @@
2121
<li class="nav-item">
2222
<!-- toggles chat -->
2323
<a class="nav-link" href="#" (click)="toggleChat()">
24-
<span class="rounded rounded-lg bg-gray text-white"><i class="la la-globe la-lg"></i></span>
24+
<span class="rounded rounded-lg text-gray"><i class="la la-globe la-lg"></i></span>
2525
</a>
2626
</li>
2727
</ul>
28-
<a class="navbar-brand d-md-none" [routerLink]=" ['/app/dashboard'] ">
29-
<i class="la la-circle la-sm text-gray mr-n-sm"></i>
30-
<i class="la la-circle la-sm text-warning"></i>
28+
<div class="navbar-brand d-md-none navbar-m display-flex align-items-center justify-content-center" [routerLink]=" ['/app/dashboard'] ">
29+
<i class="fa fa-circle fa-xs text-primary mr-n-sm"></i>
30+
<i class="fa fa-circle fa-xs text-orange"></i>
3131
&nbsp;
3232
{{config.name}}
3333
&nbsp;
34-
<i class="la la-circle la-sm text-warning mr-n-sm"></i>
35-
<i class="la la-circle la-sm text-gray"></i>
36-
</a>
34+
<i class="fa fa-circle fa-xs text-orange mr-n-sm"></i>
35+
<i class="fa fa-circle fa-xs text-primary"></i>
36+
</div>
3737
<!-- this part is hidden for xs screens -->
3838
<!-- search form! link it to your search server -->
3939
<form class="navbar-form d-none d-md-block mr-auto" role="search">

src/app/pages/login/login.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export class LoginService {
6565
const token = res.token;
6666
this.receiveToken(token);
6767
}, err => {
68-
this.loginError(err.response.data);
68+
this.loginError('Something was wrong. Try again');
6969
});
7070

7171
} else {

src/app/styles/_bootstrap-override.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -933,6 +933,10 @@ legend {
933933

934934
.navbar-nav > .nav-item > .nav-link {
935935
padding: $nav-link-padding-y $nav-link-padding-x;
936+
937+
@media (max-width: 768px) {
938+
padding: $nav-link-padding-y 0.8rem;
939+
}
936940
}
937941

938942
.navbar-nav {

src/app/styles/_libs-override.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
vertical-align: middle;
2828
}
2929

30+
.fa-xs {
31+
font-size: 0.625em;
32+
}
33+
3034
.fa-sm {
3135
font-size: $font-size-sm;
3236
}

src/app/styles/_variables.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ $theme-colors: (
6363
'success': $teal,
6464
'info': $purple,
6565
'warning': $yellow,
66+
'orange': $orange,
6667
'danger': $red,
6768
'dark': $gray-800,
6869
'inverse': $gray-700,

0 commit comments

Comments
 (0)