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

Develop #3

Merged
tanhongit merged 4 commits into from
Mar 12, 2023
Merged

Develop #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
832d8a2
update build dist
tanhongit Mar 12, 2023
f77778b
add map for main css
tanhongit Mar 12, 2023
4e81bda
add styleintrc config for webpack
tanhongit Mar 12, 2023
3cf5ff1
fix styleintrc config
tanhongit Mar 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .stylelintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
Copy link
Member Author

@tanhongit tanhongit Mar 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add stylelintrc config for template

"ignoreFiles": [
"src/style/scss/material-dashboard/_utilities.scss"
],
"rules": {
"indentation": 2,
"max-empty-lines": 2,
"comment-empty-line-before": null,
"rule-empty-line-before": null,
"no-descending-specificity": null,
"no-eol-whitespace": null
}
}
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
# laravel-generator-ui
# laravel-generator-ui

[![Latest Version](https://img.shields.io/github/release/tanhongit/laravel-generator-ui.svg?style=flat-square)](https://github.com/tanhongit/laravel-generator-ui/releases)
6 changes: 2 additions & 4 deletions dist/main.css
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/main.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/main.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions dist/main.js.LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/*!**************************************!*\
!*** ./src/js/material-dashboard.js ***!
\**************************************/

/*!**********************************************!*\
!*** ./src/style/css/material-dashboard.css ***!
\**********************************************/
2 changes: 1 addition & 1 deletion dist/main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

86 changes: 43 additions & 43 deletions src/style/scss/material-dashboard/_avatars.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,30 @@
// General styles

.avatar {
color: $white;
display: inline-flex;
align-items: center;
justify-content: center;
font-size: $avatar-font-size;
border-radius: $border-radius-pill;
height: $avatar-height;
width: $avatar-width;
color: $white;
display: inline-flex;
align-items: center;
justify-content: center;
font-size: $avatar-font-size;
border-radius: $border-radius-pill;
height: $avatar-height;
width: $avatar-width;
transition: all .2s ease-in-out;

img {
width: 100%;
}

&.rounded-circle {
img {
width: 100%;
@extend .rounded-circle;
}
}

&.rounded-circle {
img {
@extend .rounded-circle;
}
}

+ .avatar-content {
display: inline-block;
margin-left: $avatar-content-margin;
}
+ .avatar-content {
display: inline-block;
margin-left: $avatar-content-margin;
}


&.avatar-raised {
Expand All @@ -52,47 +52,47 @@
// Avatar size variations

.avatar-xxl {
width: $avatar-xxl-width !important;
height: $avatar-xxl-height !important;
width: $avatar-xxl-width !important;
height: $avatar-xxl-height !important;

&.avatar-raised {
margin-top: -$avatar-xxl-height * 0.5;
}
}

.avatar-xl {
width: $avatar-xl-width !important;
height: $avatar-xl-height !important;
width: $avatar-xl-width !important;
height: $avatar-xl-height !important;

&.avatar-raised {
margin-top: -$avatar-xl-height * 0.5;
}
}

.avatar-lg {
width: $avatar-lg-width !important;
height: $avatar-lg-height !important;
font-size: $font-size-sm;
width: $avatar-lg-width !important;
height: $avatar-lg-height !important;
font-size: $font-size-sm;

&.avatar-raised {
margin-top: -$avatar-lg-height * 0.5;
}
}

.avatar-sm {
width: $avatar-sm-width !important;
height: $avatar-sm-height !important;
font-size: $font-size-sm;
width: $avatar-sm-width !important;
height: $avatar-sm-height !important;
font-size: $font-size-sm;

&.avatar-raised {
margin-top: -$avatar-sm-height * 0.5;
}
}

.avatar-xs {
width: $avatar-xs-width !important;
height: $avatar-xs-height !important;
font-size: $font-size-xs;
width: $avatar-xs-width !important;
height: $avatar-xs-height !important;
font-size: $font-size-xs;

&.avatar-raised {
margin-top: -$avatar-xs-height * 0.5;
Expand All @@ -106,18 +106,18 @@
// General styles

.avatar-group {
.avatar {
position: relative;
z-index: $avatar-group-zindex;
border: $avatar-group-border solid $card-bg;
.avatar {
position: relative;
z-index: $avatar-group-zindex;
border: $avatar-group-border solid $card-bg;

&:hover {
z-index: $avatar-group-zindex-hover;
}
}
&:hover {
z-index: $avatar-group-zindex-hover;
}
}

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

}
}
}
50 changes: 25 additions & 25 deletions src/style/scss/material-dashboard/_breadcrumbs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,46 +3,46 @@
//

.breadcrumb-item {
font-size: $font-size-sm;
&.text-white{
&::before {
color: $white;
}
font-size: $font-size-sm;
&.text-white{
&::before {
color: $white;
}
}

}

.breadcrumb-dark {
background-color: $breadcrumb-dark-bg;
background-color: $breadcrumb-dark-bg;

.breadcrumb-item {
font-weight: 600;
.breadcrumb-item {
font-weight: 600;

a {
color: $breadcrumb-dark-color;
a {
color: $breadcrumb-dark-color;

&:hover {
color: $breadcrumb-dark-hover-color;
}
}
&:hover {
color: $breadcrumb-dark-hover-color;
}
}

+ .breadcrumb-item {
&::before {
color: $breadcrumb-dark-divider-color;
}
}
+ .breadcrumb-item {
&::before {
color: $breadcrumb-dark-divider-color;
}
}

&.active {
color: $breadcrumb-dark-active-color;
}
&.active {
color: $breadcrumb-dark-active-color;
}
}
}


// Links

.breadcrumb-links {
padding: 0;
margin: 0;
background: transparent;
padding: 0;
margin: 0;
background: transparent;
}
9 changes: 4 additions & 5 deletions src/style/scss/material-dashboard/_dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
}
}
&:after{
transition: $dropdown-toggle-arrow-transition;
transition: $dropdown-toggle-arrow-transition;
}
}
}
Expand Down Expand Up @@ -202,7 +202,6 @@
}



.dropdown.nav-item .dropdown-menu-animation {
display: block;
height: 0;
Expand Down Expand Up @@ -286,7 +285,7 @@
}

@include media-breakpoint-down(xl) {
.dropdown-lg-responsive {
min-width: $dropdown-lg-width-responsive;
}
.dropdown-lg-responsive {
min-width: $dropdown-lg-width-responsive;
}
}
23 changes: 11 additions & 12 deletions src/style/scss/material-dashboard/_forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,29 @@
margin-left: 0;
}

.form-control {
box-shadow: none;
.form-control {
box-shadow: none;

&:not(:first-child) {
border-left: 0;
padding-left: 0;
}
&:not(:last-child) {
border-right: 0;
padding-right: 0;
}
&:not(:first-child) {
border-left: 0;
padding-left: 0;
}
&:not(:last-child) {
border-right: 0;
padding-right: 0;
}

& + .input-group-text {
border-left: 0;
border-right: $input-border-width solid $input-border-color;
}
}
}

.input-group-text {
border-right: 0;
}



&.focused {
box-shadow: $input-focus-box-shadow;
}
Expand Down
4 changes: 2 additions & 2 deletions src/style/scss/material-dashboard/_navbar-vertical.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@
padding-left: 0;
padding-right: 0; // Target IE 10 & 11
@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
min-height: none;
height: 100%;
min-height: none;
height: 100%;
}
}
// Fixes the vertical navbar to the left
Expand Down
4 changes: 2 additions & 2 deletions src/style/scss/material-dashboard/_navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@
.sidenav-toggler-inner{
.sidenav-toggler-line:first-child,
.sidenav-toggler-line:last-child {
width: $sidenav-toggler-line-active-width;
transform: $sidenav-toggler-line-transform;
width: $sidenav-toggler-line-active-width;
transform: $sidenav-toggler-line-transform;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/style/scss/material-dashboard/_ripple.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
}

@keyframes ripple {
100% {opacity: 0; transform: scale(2.5);}
100% {opacity: 0; transform: scale(2.5);}
}
Loading