Skip to content

Commit 6f2606e

Browse files
committed
- Fix send message button in header
- Several fixes in user edit/add/list - Update badges/buttons - Change line color in timeline - Fix images in search result - Fix button in calendar - Change collapse box shadow - Fix titles in notification page
1 parent edc276f commit 6f2606e

File tree

11 files changed

+38
-32
lines changed

11 files changed

+38
-32
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Angular Material Admin Full (v 1.0.2) — Angular-UI Dashboard Template
1+
# Angular Material Admin Full — Angular-UI Dashboard Template
22

33
Built with [Angular](https://angular.io/), [Angular Material](https://material.angular.io/).
44
**No jQuery and Bootstrap!**

changelog.md

+12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Changelog
22

3+
## [1.0.3]
4+
5+
### Fixed
6+
- Fix send message button in header
7+
- Several fixes in user edit/add/list
8+
- Update badges/buttons
9+
- Change line color in timeline
10+
- Fix images in search result
11+
- Fix button in calendar
12+
- Change collapse box shadow
13+
- Fix titles in notification page
14+
315
## [1.0.2]
416

517
### Updated

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-material-admin",
3-
"version": "1.0.2",
3+
"version": "1.0.3",
44
"scripts": {
55
"ng": "ng",
66
"start": "ng serve",

src/app/app.module.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import { AppRoutingModule } from './app-routing.module';
1212
import { DashboardModule } from './modules/dashboard/dashboard.module';
1313
import { NotFoundComponent } from './shared/not-found/not-found.component';
1414
import { AuthModule } from './modules/auth/auth.module';
15-
import {CoreModule} from './modules/templates/core/core.module';
16-
import {CalendarModule, DateAdapter} from 'angular-calendar';
17-
import {adapterFactory} from 'angular-calendar/date-adapters/date-fns';
18-
import {MatIconModule} from '@angular/material/icon';
19-
import {MatMenuModule} from '@angular/material/menu';
20-
import {MatRadioModule} from '@angular/material/radio';
21-
import {MatSlideToggleModule} from '@angular/material/slide-toggle';
22-
import {FormsModule} from '@angular/forms';
15+
import { CoreModule } from './modules/templates/core/core.module';
16+
import { CalendarModule, DateAdapter } from 'angular-calendar';
17+
import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
18+
import { MatIconModule } from '@angular/material/icon';
19+
import { MatMenuModule } from '@angular/material/menu';
20+
import { MatRadioModule } from '@angular/material/radio';
21+
import { MatSlideToggleModule } from '@angular/material/slide-toggle';
22+
import { FormsModule } from '@angular/forms';
2323

2424
@NgModule({
2525
declarations: [

src/app/consts/routes.ts

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
export enum routes {
22
DASHBOARD = '/dashboard',
33

4-
//--- User module ---//
4+
// --- User module --- //
55

66
PROFILE = '/user/profile',
77
USER_LIST = '/user/list',
88
USER_ADD = '/user/add',
99
USER_EDIT = '/user/edit',
1010

11-
//--- E-commerce ---//
11+
// --- E-commerce ---//
1212

1313
MANAGEMENT = '/e-commerce/management',
1414
PRODUCT_EDIT = '/e-commerce/edit',
1515
PRODUCT_CREATE = '/e-commerce/create',
1616
PRODUCTS = '/e-commerce/products',
1717
PRODUCT = '/e-commerce/product',
1818

19-
//--- Documentation ---//
19+
// --- Documentation ---//
2020

2121
LIBS = '/documentation/libs',
2222
STRUCTURE = '/documentation/structure',
@@ -29,45 +29,45 @@ export enum routes {
2929
MAPS = '/documentation/maps',
3030
TABLES = '/documentation/tables',
3131

32-
//--- Core module ---//
32+
// --- Core module ---//
3333

3434
TYPOGRAPHY = '/core/typography',
3535
COLORS = '/core/colors',
3636
GRID = '/core/grid',
3737

38-
//--- Tables module ---//
38+
// --- Tables module ---//
3939

4040
TABLES_BASIC = '/tables/basic',
4141
TABLES_DYNAMIC = '/tables/dynamic',
4242

43-
//--- Forms module ---//
43+
// --- Forms module ---//
4444

4545
FORMS_ELEMENTS = '/forms/elements',
4646
FORMS_VALIDATION = '/forms/validation',
4747

48-
//--- Charts module ---//
48+
// --- Charts module ---//
4949

5050
BAR_CHARTS = '/charts/bar',
5151
LINE_CHARTS = '/charts/line',
5252
PIE_CHARTS = '/charts/pie',
5353
OVERVIEW_CHARTS = '/charts/overview',
5454

55-
//--- Maps module ---//
55+
// --- Maps module --- //
5656

5757
GOOGLE_MAP = '/maps/google',
5858
VECTOR_MAP = '/maps/vector',
5959

60-
//--- Extra module ---//
60+
// --- Extra module ---//
6161

6262
CALENDAR = '/extra/calendar',
6363
INVOICE = '/extra/invoice',
6464
LOGIN_PAGE = '/extra/login',
65-
ERROR_PAGE = '/extra/error',
65+
ERROR_PAGE = '/extra/errorpage',
6666
GALLERY = '/extra/gallery',
6767
SEARCH_RESULT = '/extra/search result',
6868
TIME_LINE = '/extra/time line',
6969

70-
//--- Ui Elements module ---//
70+
// --- Ui Elements module --- //
7171

7272
ICONS = '/ui/icons',
7373
BADGE = '/ui/badge',

src/app/modules/templates/extra/components/search-result-item/search-result-item.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<mat-card class="card">
22
<mat-card-content class="content">
3-
<img src="{{result.img}}" alt="{{result.img}}" class="img">
3+
<img src="{{result.img}}" alt="{{result.img}}" class="img" layout-fill>
44

55
<div class="description-wrapper">
66
<h3 class="title">{{result.title}}</h3>

src/app/modules/templates/extra/components/search-result-item/search-result-item.component.scss

-3
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717
}
1818

1919
.img {
20-
width: 20%;
21-
2220
@media (max-width: $small) {
23-
width: 50%;
2421
height: auto;
2522
}
2623
}

src/app/modules/templates/extra/containers/calendar-page/calendar-page.component.scss

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
.external-event {
4040
cursor: pointer;
4141
margin: 16px 0;
42+
padding: 16px;
4243
box-shadow: 0 3px 11px 0 $shadow-white, 0 3px 3px -2px $shadow-grey, 0 1px 8px 0 $shadow-dark-grey;
4344
}
4445

src/app/modules/templates/extra/containers/time-line-page/time-line-page.component.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
.line {
3131
width: 2px;
3232
height: 100%;
33-
background-color: $dark-grey;
33+
background-color: #bdbdbd;
3434
}
3535

3636
.line-wrapper {

src/app/modules/templates/forms/components/form-elements-page/form-elements-page.component.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
.forms-wrapper {
44
display: flex;
5-
margin-top: 36px;
5+
margin-top: 24px;
66
width: 100%;
77

88
@media (max-width: $small) {
@@ -25,7 +25,7 @@
2525
}
2626

2727
.left-from {
28-
margin-right: 18px;
28+
margin-right: 24px;
2929

3030
@media (max-width: $small) {
3131
margin-right: 0;

src/app/styles/mat-expansion-panel.scss

-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
@import 'src/app/styles/colors';
33

44
@mixin mat-expansion-panel {
5-
mat-expansion-panel.mat-expansion-panel:not([class*=mat-elevation-z]) {
6-
box-shadow: $card-shadow;
7-
}
8-
95
.mat-expansion-indicator::after {
106
color: $white;
117
}

0 commit comments

Comments
 (0)