Skip to content
This repository was archived by the owner on Jan 24, 2024. It is now read-only.

Commit c1c7988

Browse files
tanhongittanhongit
authored
Merge pull request #3 from tanhongit/develop
Develop
2 parents 70a16fb + 3cf5ff1 commit c1c7988

28 files changed

+397
-383
lines changed

‎.stylelintrc‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"ignoreFiles": [
3+
"src/style/scss/material-dashboard/_utilities.scss"
4+
],
5+
"rules": {
6+
"indentation": 2,
7+
"max-empty-lines": 2,
8+
"comment-empty-line-before": null,
9+
"rule-empty-line-before": null,
10+
"no-descending-specificity": null,
11+
"no-eol-whitespace": null
12+
}
13+
}

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
# laravel-generator-ui
1+
# laravel-generator-ui
2+
3+
[![Latest Version](https://img.shields.io/github/release/tanhongit/laravel-generator-ui.svg?style=flat-square)](https://github.com/tanhongit/laravel-generator-ui/releases)

‎dist/main.css‎

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/main.css.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/main.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/main.js.LICENSE.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
/*!**************************************!*\
22
!*** ./src/js/material-dashboard.js ***!
33
\**************************************/
4+
5+
/*!**********************************************!*\
6+
!*** ./src/style/css/material-dashboard.css ***!
7+
\**********************************************/

‎dist/main.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/style/scss/material-dashboard/_avatars.scss‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,30 @@
55
// General styles
66

77
.avatar {
8-
color: $white;
9-
display: inline-flex;
10-
align-items: center;
11-
justify-content: center;
12-
font-size: $avatar-font-size;
13-
border-radius: $border-radius-pill;
14-
height: $avatar-height;
15-
width: $avatar-width;
8+
color: $white;
9+
display: inline-flex;
10+
align-items: center;
11+
justify-content: center;
12+
font-size: $avatar-font-size;
13+
border-radius: $border-radius-pill;
14+
height: $avatar-height;
15+
width: $avatar-width;
1616
transition: all .2s ease-in-out;
1717

18+
img {
19+
width: 100%;
20+
}
21+
22+
&.rounded-circle {
1823
img {
19-
width: 100%;
24+
@extend .rounded-circle;
2025
}
26+
}
2127

22-
&.rounded-circle {
23-
img {
24-
@extend .rounded-circle;
25-
}
26-
}
27-
28-
+ .avatar-content {
29-
display: inline-block;
30-
margin-left: $avatar-content-margin;
31-
}
28+
+ .avatar-content {
29+
display: inline-block;
30+
margin-left: $avatar-content-margin;
31+
}
3232

3333

3434
&.avatar-raised {
@@ -52,47 +52,47 @@
5252
// Avatar size variations
5353

5454
.avatar-xxl {
55-
width: $avatar-xxl-width !important;
56-
height: $avatar-xxl-height !important;
55+
width: $avatar-xxl-width !important;
56+
height: $avatar-xxl-height !important;
5757

5858
&.avatar-raised {
5959
margin-top: -$avatar-xxl-height * 0.5;
6060
}
6161
}
6262

6363
.avatar-xl {
64-
width: $avatar-xl-width !important;
65-
height: $avatar-xl-height !important;
64+
width: $avatar-xl-width !important;
65+
height: $avatar-xl-height !important;
6666

6767
&.avatar-raised {
6868
margin-top: -$avatar-xl-height * 0.5;
6969
}
7070
}
7171

7272
.avatar-lg {
73-
width: $avatar-lg-width !important;
74-
height: $avatar-lg-height !important;
75-
font-size: $font-size-sm;
73+
width: $avatar-lg-width !important;
74+
height: $avatar-lg-height !important;
75+
font-size: $font-size-sm;
7676

7777
&.avatar-raised {
7878
margin-top: -$avatar-lg-height * 0.5;
7979
}
8080
}
8181

8282
.avatar-sm {
83-
width: $avatar-sm-width !important;
84-
height: $avatar-sm-height !important;
85-
font-size: $font-size-sm;
83+
width: $avatar-sm-width !important;
84+
height: $avatar-sm-height !important;
85+
font-size: $font-size-sm;
8686

8787
&.avatar-raised {
8888
margin-top: -$avatar-sm-height * 0.5;
8989
}
9090
}
9191

9292
.avatar-xs {
93-
width: $avatar-xs-width !important;
94-
height: $avatar-xs-height !important;
95-
font-size: $font-size-xs;
93+
width: $avatar-xs-width !important;
94+
height: $avatar-xs-height !important;
95+
font-size: $font-size-xs;
9696

9797
&.avatar-raised {
9898
margin-top: -$avatar-xs-height * 0.5;
@@ -106,18 +106,18 @@
106106
// General styles
107107

108108
.avatar-group {
109-
.avatar {
110-
position: relative;
111-
z-index: $avatar-group-zindex;
112-
border: $avatar-group-border solid $card-bg;
109+
.avatar {
110+
position: relative;
111+
z-index: $avatar-group-zindex;
112+
border: $avatar-group-border solid $card-bg;
113113

114-
&:hover {
115-
z-index: $avatar-group-zindex-hover;
116-
}
117-
}
114+
&:hover {
115+
z-index: $avatar-group-zindex-hover;
116+
}
117+
}
118118

119-
.avatar + .avatar {
120-
margin-left: $avatar-group-double;
119+
.avatar + .avatar {
120+
margin-left: $avatar-group-double;
121121

122-
}
122+
}
123123
}

‎src/style/scss/material-dashboard/_breadcrumbs.scss‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,46 +3,46 @@
33
//
44

55
.breadcrumb-item {
6-
font-size: $font-size-sm;
7-
&.text-white{
8-
&::before {
9-
color: $white;
10-
}
6+
font-size: $font-size-sm;
7+
&.text-white{
8+
&::before {
9+
color: $white;
1110
}
11+
}
1212

1313
}
1414

1515
.breadcrumb-dark {
16-
background-color: $breadcrumb-dark-bg;
16+
background-color: $breadcrumb-dark-bg;
1717

18-
.breadcrumb-item {
19-
font-weight: 600;
18+
.breadcrumb-item {
19+
font-weight: 600;
2020

21-
a {
22-
color: $breadcrumb-dark-color;
21+
a {
22+
color: $breadcrumb-dark-color;
2323

24-
&:hover {
25-
color: $breadcrumb-dark-hover-color;
26-
}
27-
}
24+
&:hover {
25+
color: $breadcrumb-dark-hover-color;
26+
}
27+
}
2828

29-
+ .breadcrumb-item {
30-
&::before {
31-
color: $breadcrumb-dark-divider-color;
32-
}
33-
}
29+
+ .breadcrumb-item {
30+
&::before {
31+
color: $breadcrumb-dark-divider-color;
32+
}
33+
}
3434

35-
&.active {
36-
color: $breadcrumb-dark-active-color;
37-
}
35+
&.active {
36+
color: $breadcrumb-dark-active-color;
3837
}
38+
}
3939
}
4040

4141

4242
// Links
4343

4444
.breadcrumb-links {
45-
padding: 0;
46-
margin: 0;
47-
background: transparent;
45+
padding: 0;
46+
margin: 0;
47+
background: transparent;
4848
}

‎src/style/scss/material-dashboard/_dropdown.scss‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
}
2424
}
2525
&:after{
26-
transition: $dropdown-toggle-arrow-transition;
26+
transition: $dropdown-toggle-arrow-transition;
2727
}
2828
}
2929
}
@@ -202,7 +202,6 @@
202202
}
203203

204204

205-
206205
.dropdown.nav-item .dropdown-menu-animation {
207206
display: block;
208207
height: 0;
@@ -286,7 +285,7 @@
286285
}
287286

288287
@include media-breakpoint-down(xl) {
289-
.dropdown-lg-responsive {
290-
min-width: $dropdown-lg-width-responsive;
291-
}
288+
.dropdown-lg-responsive {
289+
min-width: $dropdown-lg-width-responsive;
290+
}
292291
}

0 commit comments

Comments
 (0)