Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

little v3 changes #2110

Merged
merged 4 commits into from
May 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions build/config/postcss.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
'use strict'

module.exports = (ctx) => ({
map: ctx.file.dirname.includes('examples') ? false : {
inline: false,
annotation: true,
sourcesContent: true
},
plugins: {
autoprefixer: {
cascade: false
}
}
})
47 changes: 43 additions & 4 deletions build/npm/Plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ const Plugins = [
},
// Font Awesome
{
from: 'node_modules/font-awesome/css',
to : 'plugins/font-awesome/css'
from: 'node_modules/@fortawesome/fontawesome-free/css',
to : 'plugins/fontawesome-free/css'
},
{
from: 'node_modules/font-awesome/fonts',
to : 'plugins/font-awesome/fonts'
from: 'node_modules/@fortawesome/fontawesome-free/webfonts',
to : 'plugins/fontawesome-free/webfonts'
},
// Chart.js 2
{
Expand All @@ -45,6 +45,45 @@ const Plugins = [
{
from: 'node_modules/datatables.net-bs4/css',
to: 'plugins/datatables'
},

// Doc Assets
// AdminLTE Dist
{
from: 'dist/css',
to : 'docs/assets/css'
},
{
from: 'dist/js',
to : 'docs/assets/js'
},
// jQuery
{
from: 'node_modules/jquery/dist',
to : 'docs/assets/plugins/jquery'
},
// Popper
{
from: 'node_modules/popper.js/dist',
to : 'docs/assets/plugins/popper'
},
// Bootstrap
{
from: 'node_modules/bootstrap/dist/js',
to : 'docs/assets/plugins/bootstrap/js'
},
// Font Awesome
{
from: 'node_modules/@fortawesome/fontawesome-free/css',
to : 'docs/assets/plugins/fontawesome-free/css'
},
{
from: 'node_modules/@fortawesome/fontawesome-free/webfonts',
to : 'docs/assets/plugins/fontawesome-free/webfonts'
},
{
from: 'plugins/slimScroll',
to : 'docs/assets/plugins/slimScroll'
}
]

Expand Down
3 changes: 3 additions & 0 deletions build/scss/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@
font-size: 12px;
// Icons within the btn
> .fa,
> .fas,
> .far,
> .fab,
> .glyphicon,
> .ion {
font-size: 20px;
Expand Down
12 changes: 10 additions & 2 deletions build/scss/_cards.scss
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,10 @@
z-index: 50;
background: rgba(255, 255, 255, 0.7);
@include border-radius($border-radius);
> .fa {
> .fa,
> .fas,
> .far,
> .fab {
position: absolute;
top: 50%;
left: 50%;
Expand Down Expand Up @@ -253,7 +256,12 @@
float: right;
color: theme-color("danger");
// icons
> .fa, > .glyphicon, > .ion {
> .fa,
> .fas,
> .far,
> .fab,
> .glyphicon,
> .ion {
margin-right: 5px;
cursor: pointer;
}
Expand Down
32 changes: 32 additions & 0 deletions build/scss/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ body,
.wrapper {
position: relative;

& .content-wrapper {
min-height: calc(100vh - 112px);
}

.layout-boxed & {
@include box-shadow(0 0 10px rgba(0, 0, 0, .3));

Expand All @@ -20,6 +24,34 @@ body,
margin: 0 auto;
max-width: $boxed-layout-max-width;
}

& .main-sidebar {
left: inherit;
}
}

.layout-top-nav & {
margin-left: 0;


& .main-sidebar {
bottom: inherit;
height: inherit;
}

.brand-image {
height: 33px;
}

& .main-sidebar{
display: none;
}

& .content-wrapper,
& .main-header,
& .main-footer {
margin-left: 0;
}
}
}

Expand Down
5 changes: 5 additions & 0 deletions build/scss/_mailbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,18 @@
.mailbox-attachment-size {
color: #999;
font-size: 12px;
> span {
display: inline-block;
padding-top: 0.75rem;
}
}

.mailbox-attachment-icon {
text-align: center;
font-size: 65px;
color: #666;
padding: 20px 10px;
max-height: 132.5px;
&.has-img {
padding: 0;
> img {
Expand Down
13 changes: 12 additions & 1 deletion build/scss/_main-sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@
position: absolute;
right: 1rem;
top: 12px;

&:nth-child(2) {
right: 2.5rem;
}
}

.menu-open {
Expand All @@ -81,7 +85,7 @@
}

> .nav-link {
.right {
i.right {
@include rotate(-90deg);
}
}
Expand All @@ -96,6 +100,13 @@
width: $sidebar-nav-icon-width;
font-size: 1.2rem;
margin-right: .2rem;

&.fa,
&.fas,
&.far,
&.fab {
font-size: 1.1rem;
}
}

.float-right {
Expand Down
13 changes: 12 additions & 1 deletion build/scss/_miscellaneous.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ a.text-muted:hover {
}
}

// Background colors
// Background colors (theme colors)
@each $name, $color in $theme-colors {
.bg-#{$name} {
&,
Expand All @@ -39,6 +39,17 @@ a.text-muted:hover {
}
}

// Background colors (colors)
@each $name, $color in $colors {
.bg-#{$name} {
background-color: #{$color};
&,
a {
color: color-yiq($color) !important;
}
}
}

.bg-gray {
color: #000;
background-color: $gray-500;
Expand Down
37 changes: 34 additions & 3 deletions build/scss/_navs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,41 @@
.nav-link {
color: $gray-600;

&:not(.active) {
&:not(.dropdown-toggle):hover {
color: theme-color("primary")
&:not(.active):hover {
color: theme-color("primary")
}
}
.nav-item {
&.dropdown.show {
.nav-link:hover {
color: $dropdown-link-active-color;
}
}
}
}


//
// Color variants
//
@each $color, $value in $theme-colors {
@if $color==dark or $color==light {
.navbar-#{$color} {
background-color: $value;
}
}
}

@each $color, $value in $theme-colors {
@if $color!=dark and $color!=light {
.navbar-#{$color} {
background-color: $value;
}
}
}

@each $color, $value in $colors {
.navbar-#{$color} {
background-color: $value;
}
}
31 changes: 25 additions & 6 deletions build/scss/_small-box.scss
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,40 @@

// the icon
.icon {
transition: all $transition-speed linear;
position: absolute;
top: -10px;
right: 10px;
z-index: 0;
font-size: 90px;
color: rgba(0, 0, 0, 0.15);

> i {
transition: all $transition-speed linear;
position: absolute;
top: 15px;
right: 15px;
font-size: 90px;

&.fa,
&.fas,
&.far,
&.fab {
font-size: 70px;
top: 20px;
}
}

}

// Small box hover state
&:hover {
text-decoration: none;
// Animate icons on small box hover
.icon {
.icon > i {
font-size: 95px;

&.fa,
&.fas,
&.far,
&.fab {
font-size: 75px;
}
}
}
}
Expand Down
Loading