diff --git a/.gitignore b/.gitignore
index 5e9eb66c94..311a2a6b97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
/node_modules
/public/hot
/public/storage
+public/images
/storage/*.key
/vendor
/.idea
diff --git a/resources/assets/img/logo-symbol.png b/resources/assets/img/logo-symbol.png
new file mode 100755
index 0000000000..98a1946340
Binary files /dev/null and b/resources/assets/img/logo-symbol.png differ
diff --git a/resources/assets/js/backend/before.js b/resources/assets/js/backend/before.js
index cde7acf125..18f059bae0 100644
--- a/resources/assets/js/backend/before.js
+++ b/resources/assets/js/backend/before.js
@@ -6,5 +6,5 @@
// Loaded before CoreUI app.js
require('../bootstrap');
-require('../../../../node_modules/pace/pace.min');
+require('pace');
require('../plugins');
diff --git a/resources/assets/sass/backend/_bootstrap-variables.scss b/resources/assets/sass/backend/_bootstrap-variables.scss
index d05c98744e..9a9c272107 100755
--- a/resources/assets/sass/backend/_bootstrap-variables.scss
+++ b/resources/assets/sass/backend/_bootstrap-variables.scss
@@ -76,6 +76,7 @@ $font-size-base: 0.875rem;
// Breadcrumbs
$breadcrumb-bg: #fff;
+$breadcrumb-margin-bottom: 1.5rem;
// Cards
diff --git a/resources/assets/sass/backend/_core-variables.scss b/resources/assets/sass/backend/_core-variables.scss
index ad1d48285c..e43dfb122a 100755
--- a/resources/assets/sass/backend/_core-variables.scss
+++ b/resources/assets/sass/backend/_core-variables.scss
@@ -1 +1,2 @@
-// Core Overrides
+// core overrides
+$navbar-brand-logo: url('../../img/logo-symbol.png');
diff --git a/resources/assets/sass/backend/_global-overrides.scss b/resources/assets/sass/backend/_global-overrides.scss
deleted file mode 100644
index 165ca5c086..0000000000
--- a/resources/assets/sass/backend/_global-overrides.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-// Global overrides
-
-$simple-line-font-path : "~simple-line-icons/fonts/";
-$fa-font-path: "~font-awesome/fonts/";
\ No newline at end of file
diff --git a/resources/assets/sass/backend/app.scss b/resources/assets/sass/backend/app.scss
index 6ef71ebad6..087a302328 100755
--- a/resources/assets/sass/backend/app.scss
+++ b/resources/assets/sass/backend/app.scss
@@ -1,24 +1,24 @@
-/**
+/*!
* CoreUI - Open Source Bootstrap Admin Template
- * @version v1.0.0-alpha.6
+ * @version v1.0.6
* @link http://coreui.io
* Copyright (c) 2017 creativeLabs Ćukasz Holeczek
* @license MIT
*/
-// Variable Overrides
-@import "global-overrides";
+// Override Boostrap variables
@import "bootstrap-variables";
+
// Font Awesome
@import "~font-awesome/scss/font-awesome";
+
+// Simple Line Icons
@import "~simple-line-icons/scss/simple-line-icons";
// Bootstrap
@import "~bootstrap/scss/bootstrap";
-// Import vendors styles
-@import "vendors/vendors";
// Override core variables
@import "core-variables";
@@ -27,4 +27,4 @@
@import "core/core";
// Custom styles
-@import "custom";
\ No newline at end of file
+@import "custom";
diff --git a/resources/assets/sass/backend/core/_animate.scss b/resources/assets/sass/backend/core/_animate.scss
old mode 100755
new mode 100644
index e23d91e9d1..c0a244bae2
--- a/resources/assets/sass/backend/core/_animate.scss
+++ b/resources/assets/sass/backend/core/_animate.scss
@@ -1,33 +1,17 @@
// scss-lint:disable all
-@charset "UTF-8";
-
.animated {
- -webkit-animation-duration: 1s;
animation-duration: 1s;
- -webkit-animation-fill-mode: both;
- animation-fill-mode: both;
+ // animation-fill-mode: both;
}
.animated.infinite {
- -webkit-animation-iteration-count: infinite;
animation-iteration-count: infinite;
}
.animated.hinge {
- -webkit-animation-duration: 2s;
animation-duration: 2s;
}
-@-webkit-keyframes fadeIn {
- from {
- opacity: 0;
- }
-
- to {
- opacity: 1;
- }
-}
-
@keyframes fadeIn {
from {
opacity: 0;
@@ -39,6 +23,5 @@
}
.fadeIn {
- -webkit-animation-name: fadeIn;
animation-name: fadeIn;
}
diff --git a/resources/assets/sass/backend/core/_breadcrumb-menu.scss b/resources/assets/sass/backend/core/_breadcrumb-menu.scss
old mode 100755
new mode 100644
index 4e70539160..dbbe07e0b2
--- a/resources/assets/sass/backend/core/_breadcrumb-menu.scss
+++ b/resources/assets/sass/backend/core/_breadcrumb-menu.scss
@@ -1,19 +1,19 @@
.breadcrumb-menu {
- position: absolute;
- top: 0;
- right: $breadcrumb-padding-x;
+ margin-left: auto;
&::before {
display: none;
}
- .btn {
- padding-top: $breadcrumb-padding-y;
- padding-bottom: $breadcrumb-padding-y;
+ .btn-group {
+ vertical-align: top;
}
.btn {
+ padding: 0 $input-btn-padding-x;
color: $text-muted;
+ vertical-align: top;
+ border: 0;
&:hover, &.active {
color: $body-color;
diff --git a/resources/assets/sass/backend/core/_breadcrumb.scss b/resources/assets/sass/backend/core/_breadcrumb.scss
old mode 100755
new mode 100644
index 55ece3a614..d8a003dc64
--- a/resources/assets/sass/backend/core/_breadcrumb.scss
+++ b/resources/assets/sass/backend/core/_breadcrumb.scss
@@ -1,6 +1,4 @@
.breadcrumb {
position: relative;
- margin-bottom: 1.5 * $spacer;
-
@include borders($breadcrumb-borders);
}
diff --git a/resources/assets/sass/backend/core/_callout.scss b/resources/assets/sass/backend/core/_callout.scss
old mode 100755
new mode 100644
index ddd3e2260f..b98ebac53d
--- a/resources/assets/sass/backend/core/_callout.scss
+++ b/resources/assets/sass/backend/core/_callout.scss
@@ -11,10 +11,10 @@
.chart-wrapper {
position: absolute;
- top: 18px;
+ top: 10px;
left: 50%;
float: right;
- width: 60%;
+ width: 50%;
}
}
@@ -45,7 +45,7 @@
}
@each $color, $value in $theme-colors {
- &.callout-#{$color} {
+ .callout-#{$color} {
border-left-color: $value;
h4 {
diff --git a/resources/assets/sass/backend/core/_footer.scss b/resources/assets/sass/backend/core/_footer.scss
old mode 100755
new mode 100644
index 2d678c8ced..e01595a1b9
--- a/resources/assets/sass/backend/core/_footer.scss
+++ b/resources/assets/sass/backend/core/_footer.scss
@@ -1,7 +1,8 @@
.app-footer {
- min-height: $footer-height;
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
padding: 0 $spacer;
- line-height: $footer-height;
color: $footer-color;
background: $footer-bg;
@include borders($footer-borders);
diff --git a/resources/assets/sass/backend/core/_layout.scss b/resources/assets/sass/backend/core/_layout.scss
old mode 100755
new mode 100644
index ad6dda29d5..8a050031ee
--- a/resources/assets/sass/backend/core/_layout.scss
+++ b/resources/assets/sass/backend/core/_layout.scss
@@ -65,22 +65,22 @@ app-root {
// Sidebar
//
.sidebar-hidden {
-
.sidebar {
margin-left: - $sidebar-width;
}
}
.sidebar-fixed {
-
.sidebar {
position: fixed;
+ z-index: $zindex-sticky - 1;
width: $sidebar-width;
- height: 100%;
+ height: calc(100vh - #{$navbar-height});
+ // margin-top: - $navbar-height;
- .sidebar-nav {
- height: calc(100vh - #{$navbar-height});
- }
+ // .sidebar-nav {
+ // height: calc(100vh - #{$navbar-height});
+ // }
}
.main, .app-footer {
@@ -88,7 +88,6 @@ app-root {
}
&.sidebar-hidden {
-
.main, .app-footer {
margin-left: 0;
}
@@ -99,12 +98,7 @@ app-root {
.sidebar {
position: fixed;
z-index: $zindex-sticky - 1;
- height: 100%;
-
-
- .sidebar-nav {
- height: calc(100vh - #{$navbar-height});
- }
+ height: calc(100vh - #{$navbar-height});
}
}
@@ -115,14 +109,12 @@ app-root {
}
&.sidebar-hidden {
-
.sidebar {
margin-left: - $sidebar-compact-width;
}
}
&.sidebar-fixed {
-
.main, .app-footer {
margin-left: $sidebar-compact-width;
}
@@ -132,7 +124,6 @@ app-root {
}
&.sidebar-hidden {
-
.main, .app-footer {
margin-left: 0;
}
@@ -146,14 +137,12 @@ app-root {
}
&.sidebar-hidden {
-
.sidebar {
margin-left: - $sidebar-minimized-width;
}
}
&.sidebar-fixed {
-
.main, .app-footer {
margin-left: $sidebar-minimized-width;
}
@@ -163,7 +152,6 @@ app-root {
}
&.sidebar-hidden {
-
.main, .app-footer {
margin-left: 0;
}
@@ -176,14 +164,12 @@ app-root {
// Aside Menu
//
.aside-menu-hidden {
-
.aside-menu {
margin-right: - $aside-menu-width;
}
}
.aside-menu-fixed {
-
.aside-menu {
position: fixed;
right: 0;
@@ -199,7 +185,6 @@ app-root {
}
&.aside-menu-hidden {
-
.main, .app-footer {
margin-right: 0;
}
@@ -223,7 +208,6 @@ app-root {
// Breadcrumb
//
.breadcrumb-fixed {
-
.main {
$breadcrumb-height: 2 * $breadcrumb-padding-y + $font-size-base + 1.5 * $spacer;
padding-top: $breadcrumb-height;
@@ -283,12 +267,13 @@ app-root {
// Footer
//
.footer-fixed {
-
.app-footer {
position: fixed;
+ right: 0;
bottom: 0;
+ left: 0;
z-index: $zindex-sticky;
- width: 100%;
+ height: $footer-height;
}
.app-body {
@@ -306,6 +291,9 @@ app-root {
.aside-menu {
transition: margin-left $layout-transition-speed, margin-right $layout-transition-speed, width $layout-transition-speed, flex $layout-transition-speed;
}
+.sidebar-nav {
+ transition: width $layout-transition-speed;
+}
.breadcrumb {
transition: left $layout-transition-speed, right $layout-transition-speed, width $layout-transition-speed;
}
@@ -315,12 +303,13 @@ app-root {
//
@include media-breakpoint-down(md) {
-
- .app-header {
+ .app-header.navbar {
position: fixed !important;
z-index: $zindex-sticky;
width: 100%;
text-align: center;
+ background-color: $navbar-brand-bg;
+ @include borders($navbar-brand-border);
.navbar-toggler {
@if (lightness( $navbar-brand-bg ) > 40) {
@@ -341,15 +330,29 @@ app-root {
margin-top: $navbar-height;
}
+ .breadcrumb-fixed {
+ .main:nth-child(2) .breadcrumb {
+ right: auto;
+ left: auto;
+ width: 100%;
+ }
+ }
+
.sidebar {
position: fixed;
+ z-index: $zindex-sticky - 1;
width: $mobile-sidebar-width;
- height: 100%;
+ height: calc(100vh - #{$navbar-height});
margin-left: - $mobile-sidebar-width;
.sidebar-nav,
.nav {
- width: $mobile-sidebar-width !important;
+ width: $mobile-sidebar-width;
+ min-height: calc(100vh - #{$navbar-height});
+ }
+
+ .sidebar-minimizer {
+ display: none;
}
}
@@ -368,14 +371,9 @@ app-root {
}
.sidebar-mobile-show {
-
.sidebar {
width: $mobile-sidebar-width;
margin-left: 0;
-
- .sidebar-nav {
- height: calc(100vh - #{$navbar-height});
- }
}
.main {
@@ -383,11 +381,4 @@ app-root {
margin-left: $mobile-sidebar-width !important;
}
}
-
- .breadcrumb-fixed {
- .main .breadcrumb {
- right: 0 !important;
- left: 0 !important;
- }
- }
}
diff --git a/resources/assets/sass/backend/core/_navbar.scss b/resources/assets/sass/backend/core/_navbar.scss
old mode 100755
new mode 100644
index 8d321e80cf..221ab1263e
--- a/resources/assets/sass/backend/core/_navbar.scss
+++ b/resources/assets/sass/backend/core/_navbar.scss
@@ -22,7 +22,17 @@
}
.navbar-toggler {
- color: $navbar-color;
+ min-width: 50px;
+ padding: $navbar-toggler-padding-y 0;
+
+ &:hover .navbar-toggler-icon {
+ background-image: $navbar-toggler-icon-hover;
+ }
+ }
+
+ .navbar-toggler-icon {
+ height: 23px;
+ background-image: $navbar-toggler-icon;
}
.navbar-nav {
@@ -101,3 +111,17 @@
.navbar-divider {
background-color: rgba(0,0,0,.075);
}
+
+@include media-breakpoint-up(lg) {
+ .brand-minimized {
+ .app-header.navbar {
+ .navbar-brand {
+ width: $navbar-brand-minimized-width;
+ background-color: $navbar-brand-minimized-bg;
+ background-image: $navbar-brand-minimized-logo;
+ background-size: $navbar-brand-minimized-logo-size;
+ @include borders($navbar-brand-minimized-border);
+ }
+ }
+ }
+}
diff --git a/resources/assets/sass/backend/core/_rtl.scss b/resources/assets/sass/backend/core/_rtl.scss
old mode 100755
new mode 100644
index 22bda316c7..28db385962
--- a/resources/assets/sass/backend/core/_rtl.scss
+++ b/resources/assets/sass/backend/core/_rtl.scss
@@ -44,20 +44,17 @@
// Sidebar
//
.sidebar-hidden {
-
.sidebar {
margin-right: - $sidebar-width;
}
}
.sidebar-fixed {
-
.main, .app-footer {
margin-right: $sidebar-width;
}
&.sidebar-hidden {
-
.main, .app-footer {
margin-right: 0;
}
@@ -70,20 +67,18 @@
}
&.sidebar-hidden {
-
.sidebar {
- margin-left: - $sidebar-minimized-width;
+ margin-right: - $sidebar-minimized-width;
+ margin-left: 0;
}
}
&.sidebar-fixed {
-
.main, .app-footer {
- margin-left: $sidebar-minimized-width;
+ margin-right: $sidebar-minimized-width;
}
&.sidebar-hidden {
-
.main, .app-footer {
margin-left: 0;
}
@@ -95,15 +90,13 @@
// Aside Menu
//
.aside-menu-hidden {
-
.aside-menu {
- // margin-right: 0;
+ margin-right: 0;
margin-left: - $aside-menu-width;
}
}
.aside-menu-fixed {
-
.aside-menu {
right: auto;
left: 0;
@@ -115,7 +108,6 @@
}
&.aside-menu-hidden {
-
.main, .app-footer {
margin-left: 0;
}
@@ -138,15 +130,12 @@
// Sidebar Menu
.sidebar {
.sidebar-nav {
- direction: ltr;
- * {
- direction: rtl;
- }
.nav {
.nav-item {
.nav-link {
- [class^="icon-"], [class*=" icon-"] {
- margin-right: -4px;
+ direction: rtl;
+ i {
+ margin: 0 0 0 ($sidebar-nav-link-padding-x / 2);
}
.badge {
float: left;
@@ -158,13 +147,14 @@
position: absolute;
right: auto !important;
left: $sidebar-nav-link-padding-x;
+ transform: rotate(180deg);
}
}
}
&.nav-dropdown {
&.open {
> .nav-link.nav-dropdown-toggle::before {
- transform: rotate(90deg);
+ transform: rotate(270deg);
}
}
}
@@ -173,6 +163,30 @@
}
}
+ .sidebar-minimized .sidebar {
+ .nav-link {
+ padding-right: 0;
+ i {
+ float: right;
+ padding: 0;
+ margin: 0;
+ }
+ .badge {
+ right: auto;
+ left: 15px;
+ }
+ }
+ .nav > .nav-dropdown {
+
+ &:hover {
+ > .nav-dropdown-items {
+ right: $sidebar-minimized-width;
+ left: 0;
+ }
+ }
+ }
+ }
+
// Horizontal bars
.horizontal-bars {
@@ -249,6 +263,12 @@
border: 0 solid $border-color;
border-right-width: .25rem;
+ @each $color, $value in $theme-colors {
+ &.callout-#{$color} {
+ border-right-color: $value;
+ }
+ }
+
.chart-wrapper {
left: 0;
float: left;
@@ -258,10 +278,4 @@
.callout-default {
border-right-color: $text-muted;
}
-
- @each $color, $value in $theme-colors {
- &.callout-#{$color} {
- border-right-color: $value;
- }
- }
}
diff --git a/resources/assets/sass/backend/core/_sidebar.scss b/resources/assets/sass/backend/core/_sidebar.scss
old mode 100755
new mode 100644
index df64989047..b77cd5f852
--- a/resources/assets/sass/backend/core/_sidebar.scss
+++ b/resources/assets/sass/backend/core/_sidebar.scss
@@ -1,7 +1,8 @@
// scss-lint:disable NestingDepth, SelectorDepth
.sidebar {
+ display: flex;
+ flex-direction: column;
padding: $sidebar-padding;
- overflow: hidden;
color: $sidebar-color;
background: $sidebar-bg;
@include borders($sidebar-borders);
@@ -24,31 +25,47 @@
}
}
+ // Will be added soon
+ // .sidebar-brand { }
+
+ .sidebar-header {
+ flex: 0 0 $sidebar-header-height;
+ padding: $sidebar-header-padding-y $sidebar-header-padding-x;
+ text-align: center;
+ background: $sidebar-header-bg;
+ }
+
+ .sidebar-form .form-control {
+ color: $sidebar-form-color;
+ background: $sidebar-form-bg;
+ border: $sidebar-form-border;
+
+ &::placeholder {
+ color: $sidebar-form-placeholder-color;
+ }
+ }
+
.sidebar-nav {
position: relative;
+ flex: 1;
overflow-x: hidden;
overflow-y: auto;
-ms-overflow-style: -ms-autohiding-scrollbar;
@include sidebar-width($sidebar-borders, $sidebar-width);
&::-webkit-scrollbar {
-
position: absolute;
width: 10px;
margin-left: -10px;
-webkit-appearance: none;
}
- // &::-webkit-scrollbar-button { }
-
&::-webkit-scrollbar-track {
background-color: lighten($sidebar-bg, 5%);
border-right: 1px solid darken($sidebar-bg, 5%);
border-left: 1px solid darken($sidebar-bg, 5%);
}
- // &::-webkit-scrollbar-track-piece { }
-
&::-webkit-scrollbar-thumb {
height: 50px;
background-color: darken($sidebar-bg, 10%);
@@ -57,181 +74,219 @@
border-style: solid;
border-width: 1px 2px;
}
-
- // &::-webkit-scrollbar-corner { }
-
- // &::-webkit-resizer { }
}
.nav {
@include sidebar-width($sidebar-borders, $sidebar-width);
- flex-direction: column !important;
-
- .nav-title {
- padding: $sidebar-nav-title-padding-y $sidebar-nav-title-padding-x;
- font-size: 11px;
- font-weight: 600;
- color: $sidebar-nav-title-color;
- text-transform: uppercase;
+ flex-direction: column;
+ min-height: 100%;
+ }
+
+ .nav-title {
+ padding: $sidebar-nav-title-padding-y $sidebar-nav-title-padding-x;
+ font-size: 11px;
+ font-weight: 600;
+ color: $sidebar-nav-title-color;
+ text-transform: uppercase;
+ }
+
+ .nav-divider, .divider {
+ height: 10px;
+ }
+
+ .nav-item {
+ position: relative;
+ margin: 0;
+ transition: background .3s ease-in-out;
+ }
+
+ .nav-dropdown-items {
+ max-height: 0;
+ padding: 0;
+ margin: 0;
+ overflow-y: hidden;
+ transition: max-height .3s ease-in-out;
+
+ .nav-item {
+ padding: 0;
+ list-style: none;
}
+ }
- .divider {
- height: 10px;
+ .nav-link {
+ display: block;
+ padding: $sidebar-nav-link-padding-y $sidebar-nav-link-padding-x;
+ color: $sidebar-nav-link-color;
+ text-decoration: none;
+ background: $sidebar-nav-link-bg;
+ @include borders($sidebar-nav-link-borders);
+ @if $enable-sidebar-nav-rounded {
+ border-radius: $border-radius;
}
- .nav-item {
- position: relative;
- margin: 0;
- transition: background .3s ease-in-out;
+ i {
+ display: inline-block;
+ width: 20px;
+ margin: 0 ($sidebar-nav-link-padding-x / 2) 0 0;
+ font-size: 14px;
+ color: $sidebar-nav-link-icon-color;
+ text-align: center;
+ }
- ul {
- max-height: 0;
- padding: 0;
- margin: 0;
- overflow-y: hidden;
- transition: max-height .3s ease-in-out;
+ .badge {
+ float: right;
+ margin-top: 2px;
+ }
- li {
- padding: 0;
- list-style: none;
- }
- }
+ &.active {
+ color: $sidebar-nav-link-active-color;
+ background: $sidebar-nav-link-active-bg;
+ @include borders($sidebar-nav-link-active-borders);
- .nav-link {
- display: block;
- padding: $sidebar-nav-link-padding-y $sidebar-nav-link-padding-x;
- color: $sidebar-nav-link-color;
- text-decoration: none;
- background: $sidebar-nav-link-bg;
- @include borders($sidebar-nav-link-borders);
- @if $enable-sidebar-nav-rounded {
- border-radius: $border-radius;
- }
+ i {
+ color: $sidebar-nav-link-active-icon-color;
+ }
+ }
- &:hover {
- color: $sidebar-nav-link-hover-color !important;
- background: $sidebar-nav-link-hover-bg !important;
- @include borders($sidebar-nav-link-hover-borders);
+ &:hover {
+ color: $sidebar-nav-link-hover-color;
+ background: $sidebar-nav-link-hover-bg;
+ @include borders($sidebar-nav-link-hover-borders);
- i {
- color: $sidebar-nav-link-hover-icon-color;
- }
- }
+ i {
+ color: $sidebar-nav-link-hover-icon-color;
+ }
- &.active {
- color: $sidebar-nav-link-active-color;
- background: $sidebar-nav-link-active-bg;
- @include borders($sidebar-nav-link-active-borders);
+ &.nav-dropdown-toggle::before {
+ background-image: $sidebar-nav-dropdown-indicator-hover;
+ }
+ }
+ @each $color, $value in $theme-colors {
+ &.nav-link-#{$color} {
+ background: $value;
+ i {
+ color: rgba(255,255,255,.7);
+ }
+ &:hover {
+ background: darken($value,5%) !important;
i {
- color: $sidebar-nav-link-active-icon-color;
+ color: #fff;
}
}
+ }
+ }
+ }
- [class^="icon-"], [class*=" icon-"] {
- display: inline-block;
- margin-top: -4px;
- vertical-align: middle;
- }
+ // ex. Components
+ .nav-dropdown-toggle {
+ position: relative;
- i {
- width: 20px;
- margin: 0 ($sidebar-nav-link-padding-x / 2) 0 0;
- font-size: 14px;
- color: $sidebar-nav-link-icon-color;
- text-align: center;
- }
+ &::before {
+ position: absolute;
+ top: 50%;
+ right: $sidebar-nav-link-padding-x;
+ display: block;
+ width: 8px;
+ height: 8px;
+ padding: 0;
+ margin-top: -4px;
+ content: "";
+ background-image: $sidebar-nav-dropdown-indicator;
+ background-repeat: no-repeat;
+ background-position: center;
+ transition: transform .3s;
+ }
+ }
- .badge {
- float: right;
- margin-top: 2px;
- // margin-left: 10px;
- }
+ // ex.
+ .nav-dropdown.open {
+ background: $sidebar-nav-dropdown-bg;
+ @include borders($sidebar-nav-dropdown-borders);
+ @if $enable-sidebar-nav-rounded {
+ border-radius: $border-radius;
+ }
+ > .nav-dropdown-items {
+ max-height: 1000px;
+ }
- &.nav-dropdown-toggle {
+ .nav-link {
+ color: $sidebar-nav-dropdown-color;
+ border-left: 0 !important;
+ }
- &::before {
- position: absolute;
- top: ($sidebar-nav-link-padding-y + ($font-size-base / 4));
- right: $sidebar-nav-link-padding-x;
- display: block;
- width: ($font-size-base);
- height: ($font-size-base);
- padding: 0;
- font-size: $font-size-base;
- line-height: ($font-size-base * 3 / 4);
- text-align: center;
- content: "\2039";
- transition: .3s;
- }
- }
- }
+ > .nav-link.nav-dropdown-toggle::before {
+ transform: rotate(-90deg);
+ }
- &.nav-dropdown {
- &.open {
- background: $sidebar-nav-dropdown-bg;
- @include borders($sidebar-nav-dropdown-borders);
- @if $enable-sidebar-nav-rounded {
- border-radius: $border-radius;
- }
- > ul, > ol {
- // display: inline;
- max-height: 1000px;
- }
+ .nav-dropdown.open {
+ border-left: 0;
+ }
+ }
- .nav-link {
- color: $sidebar-nav-dropdown-color;
- border-left: 0 !important;
- }
+ .nav-label {
+ display: block;
+ padding: ($sidebar-nav-link-padding-y / 8) $sidebar-nav-link-padding-x;
+ color: $sidebar-nav-title-color;
- > .nav-link.nav-dropdown-toggle::before {
- transform: rotate(-90deg);
- }
+ &:hover {
+ color: $sidebar-color;
+ text-decoration: none;
+ }
- .nav-dropdown.open {
- border-left: 0;
- }
- }
- &.nt {
- transition: 0s !important;
- > ul, > ol {
- transition: 0s !important;
- }
- .nav-link {
- &.nav-dropdown-toggle {
+ i {
+ width: 20px;
+ margin: -3px ($sidebar-nav-link-padding-x / 2) 0 0;
+ font-size: 10px;
+ color: $sidebar-nav-link-icon-color;
+ text-align: center;
+ vertical-align: middle;
+ }
+ }
- &::before {
- transition: 0s !important;
- }
- }
- }
- }
- }
+ @if (lightness( $sidebar-bg ) < 40) {
+ .progress {
+ background-color: lighten($sidebar-bg, 15%) !important;
+ }
+ }
- .nav-label {
- display: block;
- padding: ($sidebar-nav-link-padding-y / 8) $sidebar-nav-link-padding-x;
- color: $sidebar-nav-title-color;
+ .sidebar-footer {
+ flex: 0 0 $sidebar-footer-height;
+ padding: $sidebar-footer-padding-y $sidebar-footer-padding-x;
+ background: $sidebar-footer-bg;
+ @include borders($sidebar-footer-borders);
+ }
- &:hover {
- color: $sidebar-color;
- text-decoration: none;
- }
+ .sidebar-minimizer {
+ position: relative;
+ flex: 0 0 $sidebar-minimizer-height;
+ background-color: $sidebar-minimizer-bg;
+ border: 0;
+ @include borders($sidebar-minimizer-borders);
- i {
- width: 20px;
- margin: -3px ($sidebar-nav-link-padding-x / 2) 0 0;
- font-size: 10px;
- color: $sidebar-nav-link-icon-color;
- text-align: center;
- vertical-align: middle;
- }
- }
+ &::before {
+ position: absolute;
+ top: 0;
+ right: 0;
+ width: $sidebar-minimizer-height;
+ height: $sidebar-minimizer-height;
+ content: "";
+ background-image: $sidebar-minimizer-indicator;
+ background-repeat: no-repeat;
+ background-position: center;
+ background-size: $sidebar-minimizer-height / 4;
+ transition: .3s;
+ }
- @if (lightness( $sidebar-bg ) < 40) {
- .progress {
- background-color: lighten($sidebar-bg, 15%) !important;
- }
+ &:focus,
+ &.focus {
+ outline: 0;
+ }
+
+ &:hover {
+ background-color: $sidebar-minimizer-hover-bg;
+ &::before {
+ background-image: $sidebar-minimizer-hover-indicator;
}
}
}
@@ -283,6 +338,7 @@
}
}
+ // Minimized Sidebar
.sidebar-minimized {
.hidden-cn {
display: none;
@@ -290,10 +346,6 @@
.sidebar {
z-index: $zindex-sticky - 1;
- &:hover {
- overflow: visible;
- }
-
.sidebar-nav {
overflow: visible;
@include sidebar-width($sidebar-borders, $sidebar-minimized-width);
@@ -301,122 +353,99 @@
.nav {
@include sidebar-width($sidebar-borders, $sidebar-minimized-width);
+ }
- .nav-title, .divider {
- display: none;
- }
-
- .nav-item {
- width: $sidebar-minimized-width;
- overflow: hidden;
- border-left: 0 !important;
+ .nav-divider, .divider,
+ .nav-title,
+ .sidebar-footer,
+ .sidebar-form,
+ .sidebar-header {
+ display: none;
+ }
- ul {
- background: $sidebar-bg;
- }
+ .sidebar-minimizer::before {
+ width: 100%;
+ transform: rotate(-180deg);
+ }
- .nav-link {
- position: relative;
- padding-left: 0;
- margin: 0;
- white-space: nowrap;
- border-left: 0 !important;
+ .nav-item {
+ width: $sidebar-minimized-width;
+ overflow: hidden;
+ border-left: 0 !important;
- &.nav-dropdown-toggle {
+ &:hover {
+ width: $sidebar-width + $sidebar-minimized-width;
+ overflow: visible;
- &::before {
- display: none;
- }
- }
+ > .nav-link {
+ background: $sidebar-nav-link-hover-bg;
i {
- display: block;
- float: left;
- width: $sidebar-minimized-height;
- padding: 0;
- margin: 0 !important;
- font-size: 18px;
- }
-
- .badge {
- position: absolute;
- // top: 14px;
- right: 15px;
- display: none;
- }
-
- &:hover {
- width: $sidebar-width;
-
- .badge {
- display: inline;
- }
+ color: $sidebar-nav-link-hover-color;
}
}
+ }
+ }
- ul {
- position: absolute;
- left: $sidebar-minimized-width;
+ .nav-link {
+ position: relative;
+ padding-left: 0;
+ margin: 0;
+ white-space: nowrap;
+ border-left: 0 !important;
- li {
- position: relative;
- padding: 0;
+ i {
+ display: block;
+ float: left;
+ width: $sidebar-minimized-height;
+ // padding: 0;
+ // margin: 0 !important;
+ font-size: 18px;
+ }
- .nav-link {
- width: $sidebar-width - $sidebar-minimized-width;
- }
+ .badge {
+ position: absolute;
+ right: 15px;
+ display: none;
+ }
- ul, ol {
- position: absolute;
- top: 0;
- left: 100%;
- }
- }
- }
+ &:hover {
+ width: $sidebar-width + $sidebar-minimized-width;
+ background: $sidebar-nav-link-hover-bg;
- &.nav-dropdown {
- &.open {
- background: $sidebar-nav-link-active-bg;
- > .nav-link i {
- color: $sidebar-nav-link-active-icon-color;
- }
- > ul, > ol {
- display: none;
- }
- }
+ .badge {
+ display: inline;
}
+ }
- &:hover {
- width: $sidebar-width + $sidebar-minimized-width;
- overflow: visible;
- background: $sidebar-nav-link-hover-bg;
- transition: 0s;
-
- > .nav-link {
- width: $sidebar-width + $sidebar-minimized-width;
- }
+ &.nav-dropdown-toggle::before {
+ display: none;
+ }
+ }
- > ul, > ol {
- display: inline;
- max-height: 10000px;
- transition: 0s;
+ .nav-dropdown-items {
+ .nav-item {
+ width: $sidebar-width;
- li {
- width: $sidebar-width;
+ .nav-link {
+ width: $sidebar-width;
+ }
+ }
+ }
- .nav-link {
- width: $sidebar-width;
- }
- }
- }
+ .nav > .nav-dropdown {
+ > .nav-dropdown-items {
+ display: none;
+ max-height: 1000px;
+ background: $sidebar-bg;
+ }
- &.nav-dropdown {
- &.open {
- > ul, > ol {
- display: inline;
- }
- }
- }
+ &:hover {
+ background: $sidebar-nav-link-hover-bg;
+ > .nav-dropdown-items {
+ position: absolute;
+ left: $sidebar-minimized-width;
+ display: inline;
}
}
}
diff --git a/resources/assets/sass/backend/core/_temp.scss b/resources/assets/sass/backend/core/_temp.scss
old mode 100755
new mode 100644
index 63cb04b724..e4097127b7
--- a/resources/assets/sass/backend/core/_temp.scss
+++ b/resources/assets/sass/backend/core/_temp.scss
@@ -16,25 +16,12 @@
// Open state for the dropdown
.open, .show {
- // Show the menu
- > .dropdown-menu {
- display: block;
- }
- > .dropdown-menu-right {
- right: 0;
- left: auto; // Reset the default from `.dropdown-menu`
- }
// Remove the outline when :focus is triggered
> a {
outline: 0;
}
}
-//
-//.modal-open .modal {
-// display: block;
-//}
-
// navbar dropdown fix
.navbar .dropdown-toggle {
@extend .nav-link;
diff --git a/resources/assets/sass/backend/core/_variables.scss b/resources/assets/sass/backend/core/_variables.scss
old mode 100755
new mode 100644
index 4a6d5d852e..5bf69e8a1a
--- a/resources/assets/sass/backend/core/_variables.scss
+++ b/resources/assets/sass/backend/core/_variables.scss
@@ -1,3 +1,4 @@
+// scss-lint:disable all
// Core Admin Variables
$enable-sidebar-nav-rounded: false !default;
@@ -47,7 +48,7 @@ $navbar-border: (
) !default;
$navbar-brand-width: 155px !default;
$navbar-brand-bg: #fff !default;
-$navbar-brand-logo: url('/img/backend/logo.png') !default;
+$navbar-brand-logo: url('../img/logo.png') !default;
$navbar-brand-logo-size: 70px auto !default;
$navbar-brand-border: (
bottom: (
@@ -57,11 +58,20 @@ $navbar-brand-border: (
)
) !default;
+$navbar-brand-minimized-width: 50px !default;
+$navbar-brand-minimized-bg: $navbar-brand-bg !default;
+$navbar-brand-minimized-logo: url('../../../img/logo-symbol.png') !default;
+$navbar-brand-minimized-logo-size: 24px !default;
+$navbar-brand-minimized-border: $navbar-brand-border !default;
+
$navbar-color: $gray-600 !default;
$navbar-hover-color: $gray-800 !default;
$navbar-active-color: $gray-800 !default;
$navbar-disabled-color: $gray-300 !default;
+$navbar-toggler-icon: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-color}' stroke-width='2.25' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E"), "#", "%23") !default;
+$navbar-toggler-icon-hover: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-hover-color}' stroke-width='2.25' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E"), "#", "%23") !default;
+
// Sidebar
$sidebar-width: 200px !default;
@@ -72,11 +82,23 @@ $sidebar-compact-width: 150px !default;
$sidebar-compact-height: $sidebar-compact-width !default;
$sidebar-color: #fff !default;
$sidebar-bg: $gray-800 !default;
-$sidebar-header-bg: rgba(0,0,0,.2) !default;
-$sidebar-footer-bg: rgba(0,0,0,.2) !default;
$sidebar-borders: none !default;
$mobile-sidebar-width: 220px !default;
+// Sidebar Header
+
+$sidebar-header-height: auto !default;
+$sidebar-header-bg: rgba(0,0,0,.2) !default;
+$sidebar-header-padding-y: .75rem !default;
+$sidebar-header-padding-x: 1rem !default;
+
+// Sidebar Form
+
+$sidebar-form-border: 0 !default;
+$sidebar-form-bg: darken($sidebar-bg,10%) !default;
+$sidebar-form-color: #fff !default;
+$sidebar-form-placeholder-color: rgba(255,255,255,.7) !default;
+
// Sidebar Navigation
$sidebar-nav-color: #fff !default;
@@ -87,7 +109,7 @@ $sidebar-nav-link-padding-y: .75rem !default;
$sidebar-nav-link-padding-x: 1rem !default;
$sidebar-nav-link-color: #fff !default;
$sidebar-nav-link-bg: transparent !default;
-$sidebar-nav-link-icon-color: $text-muted !default;
+$sidebar-nav-link-icon-color: $gray-600 !default;
$sidebar-nav-link-borders: 0 !default;
$sidebar-nav-link-hover-color: #fff !default;
@@ -103,6 +125,30 @@ $sidebar-nav-link-active-borders: 0 !default;
$sidebar-nav-dropdown-color: #fff !default;
$sidebar-nav-dropdown-bg: rgba(0,0,0,.2) !default;
$sidebar-nav-dropdown-borders: 0 !default;
+$sidebar-nav-dropdown-indicator-color:$gray-600 !default;
+$sidebar-nav-dropdown-indicator: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 11 14'%3E%3Cpath fill='#{$sidebar-nav-dropdown-indicator-color}' d='M9.148 2.352l-4.148 4.148 4.148 4.148q0.148 0.148 0.148 0.352t-0.148 0.352l-1.297 1.297q-0.148 0.148-0.352 0.148t-0.352-0.148l-5.797-5.797q-0.148-0.148-0.148-0.352t0.148-0.352l5.797-5.797q0.148-0.148 0.352-0.148t0.352 0.148l1.297 1.297q0.148 0.148 0.148 0.352t-0.148 0.352z'/%3E%3C/svg%3E"), "#", "%23") !default;
+$sidebar-nav-dropdown-indicator-hover-color:$sidebar-nav-link-hover-color;
+$sidebar-nav-dropdown-indicator-hover:str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 11 14'%3E%3Cpath fill='#{$sidebar-nav-dropdown-indicator-hover-color}' d='M9.148 2.352l-4.148 4.148 4.148 4.148q0.148 0.148 0.148 0.352t-0.148 0.352l-1.297 1.297q-0.148 0.148-0.352 0.148t-0.352-0.148l-5.797-5.797q-0.148-0.148-0.148-0.352t0.148-0.352l5.797-5.797q0.148-0.148 0.352-0.148t0.352 0.148l1.297 1.297q0.148 0.148 0.148 0.352t-0.148 0.352z'/%3E%3C/svg%3E"), "#", "%23") !default;
+
+// Sidebar Footer
+
+$sidebar-footer-height: auto !default;
+$sidebar-footer-bg: rgba(0,0,0,.2) !default;
+$sidebar-footer-padding-y: .75rem !default;
+$sidebar-footer-padding-x: 1rem !default;
+$sidebar-footer-borders: 0 !default;
+
+// Sidebar Minimizer
+
+$sidebar-minimizer-height: 50px !default;
+$sidebar-minimizer-bg: rgba(0,0,0,.2) !default;
+$sidebar-minimizer-borders: 0 !default;
+$sidebar-minimizer-indicator-color: $gray-600 !default;
+$sidebar-minimizer-indicator: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 11 14'%3E%3Cpath fill='#{$sidebar-minimizer-indicator-color}' d='M9.148 2.352l-4.148 4.148 4.148 4.148q0.148 0.148 0.148 0.352t-0.148 0.352l-1.297 1.297q-0.148 0.148-0.352 0.148t-0.352-0.148l-5.797-5.797q-0.148-0.148-0.148-0.352t0.148-0.352l5.797-5.797q0.148-0.148 0.352-0.148t0.352 0.148l1.297 1.297q0.148 0.148 0.148 0.352t-0.148 0.352z'/%3E%3C/svg%3E"), "#", "%23") !default;
+$sidebar-minimizer-hover-bg: rgba(0,0,0,.3) !default;
+$sidebar-minimizer-hover-indicator-color:$sidebar-nav-link-hover-color !default;
+$sidebar-minimizer-hover-indicator: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 11 14'%3E%3Cpath fill='#{$sidebar-minimizer-hover-indicator-color}' d='M9.148 2.352l-4.148 4.148 4.148 4.148q0.148 0.148 0.148 0.352t-0.148 0.352l-1.297 1.297q-0.148 0.148-0.352 0.148t-0.352-0.148l-5.797-5.797q-0.148-0.148-0.148-0.352t0.148-0.352l5.797-5.797q0.148-0.148 0.352-0.148t0.352 0.148l1.297 1.297q0.148 0.148 0.148 0.352t-0.148 0.352z'/%3E%3C/svg%3E"), "#", "%23") !default;
+
// Top Navigation
@@ -130,7 +176,6 @@ $top-nav-active-bg: theme-color("primary") !default;
$top-nav-height: $navbar-height - 15px !default;
// Breadcrumb
-
$breadcrumb-borders: (
bottom: (
size: 1px,
diff --git a/resources/assets/sass/backend/vendors/_vendors.scss b/resources/assets/sass/backend/vendors/_vendors.scss
deleted file mode 100755
index a68e987171..0000000000
--- a/resources/assets/sass/backend/vendors/_vendors.scss
+++ /dev/null
@@ -1 +0,0 @@
-// Import vendor/vendor-file and it will be included on npm run
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 937b78b1e5..821b5f4066 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -287,14 +287,14 @@ autoprefixer@^6.3.1:
postcss-value-parser "^3.2.3"
autoprefixer@^7.1.1:
- version "7.2.4"
- resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.4.tgz#29b367c03876a29bfd3721260d945e3545666c8d"
+ version "7.2.5"
+ resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.5.tgz#04ccbd0c6a61131b6d13f53d371926092952d192"
dependencies:
- browserslist "^2.10.2"
- caniuse-lite "^1.0.30000784"
+ browserslist "^2.11.1"
+ caniuse-lite "^1.0.30000791"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
- postcss "^6.0.15"
+ postcss "^6.0.16"
postcss-value-parser "^3.2.3"
aws-sign2@~0.6.0:
@@ -1051,11 +1051,11 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
caniuse-db "^1.0.30000639"
electron-to-chromium "^1.2.7"
-browserslist@^2.1.2, browserslist@^2.10.2:
- version "2.11.0"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.0.tgz#50350d6873a82ebe0f3ae5483658c571ae5f9d7d"
+browserslist@^2.1.2, browserslist@^2.11.1:
+ version "2.11.1"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.1.tgz#02fda29d9a2164b879100126e7b0d0b57e43a7bb"
dependencies:
- caniuse-lite "^1.0.30000784"
+ caniuse-lite "^1.0.30000789"
electron-to-chromium "^1.3.30"
buffer-crc32@~0.2.3:
@@ -1171,12 +1171,12 @@ caniuse-api@^1.5.2:
lodash.uniq "^4.5.0"
caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
- version "1.0.30000789"
- resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000789.tgz#5cf3fec75480041ab162ca06413153141e234325"
+ version "1.0.30000791"
+ resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000791.tgz#06787f56caef4300a17e35d137447123bdf536f9"
-caniuse-lite@^1.0.30000784:
- version "1.0.30000789"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000789.tgz#2e3d937b267133f63635ef7f441fac66360fc889"
+caniuse-lite@^1.0.30000789, caniuse-lite@^1.0.30000791:
+ version "1.0.30000791"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000791.tgz#8e35745efd483a3e23bb7d350990326d2319fc16"
capture-stack-trace@^1.0.0:
version "1.0.0"
@@ -1285,13 +1285,12 @@ clap@^1.0.9:
chalk "^1.1.3"
class-utils@^0.3.5:
- version "0.3.5"
- resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.5.tgz#17e793103750f9627b2176ea34cfd1b565903c80"
+ version "0.3.6"
+ resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
dependencies:
arr-union "^3.1.0"
define-property "^0.2.5"
isobject "^3.0.0"
- lazy-cache "^2.0.2"
static-extend "^0.1.1"
clean-css@4.1.x, clean-css@^4.1.3:
@@ -1307,11 +1306,11 @@ cli-table@^0.3.1:
colors "1.0.3"
cli-usage@^0.1.1:
- version "0.1.4"
- resolved "https://registry.yarnpkg.com/cli-usage/-/cli-usage-0.1.4.tgz#7c01e0dc706c234b39c933838c8e20b2175776e2"
+ version "0.1.7"
+ resolved "https://registry.yarnpkg.com/cli-usage/-/cli-usage-0.1.7.tgz#eaf1c9d5b91e22482333072a12127f05cd99a3ba"
dependencies:
- marked "^0.3.6"
- marked-terminal "^1.6.2"
+ marked "^0.3.12"
+ marked-terminal "^2.0.0"
cliui@^2.1.0:
version "2.1.0"
@@ -1425,10 +1424,14 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
dependencies:
delayed-stream "~1.0.0"
-commander@2.12.x, commander@^2.9.0, commander@~2.12.1:
+commander@2.12.x, commander@~2.12.1:
version "2.12.2"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
+commander@^2.9.0:
+ version "2.13.0"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
+
commander@~2.8.1:
version "2.8.1"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
@@ -1905,10 +1908,14 @@ delegates@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-depd@1.1.1, depd@~1.1.1:
+depd@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
+depd@~1.1.1:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+
des.js@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
@@ -1947,8 +1954,8 @@ dns-equal@^1.0.0:
resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
dns-packet@^1.0.1:
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.2.2.tgz#a8a26bec7646438963fc86e06f8f8b16d6c8bf7a"
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
dependencies:
ip "^1.1.0"
safe-buffer "^5.0.1"
@@ -2367,8 +2374,8 @@ extglob@^0.3.1:
is-extglob "^1.0.0"
extglob@^2.0.2:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.3.tgz#55e019d0c95bf873949c737b7e5172dba84ebb29"
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
dependencies:
array-unique "^0.3.2"
define-property "^1.0.0"
@@ -4104,8 +4111,8 @@ logalot@^2.0.0:
squeak "^1.0.0"
loglevel@^1.4.1:
- version "1.6.0"
- resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.0.tgz#ae0caa561111498c5ba13723d6fb631d24003934"
+ version "1.6.1"
+ resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
longest@^1.0.0, longest@^1.0.1:
version "1.0.1"
@@ -4172,9 +4179,9 @@ map-visit@^1.0.0:
dependencies:
object-visit "^1.0.0"
-marked-terminal@^1.6.2:
- version "1.7.0"
- resolved "https://registry.yarnpkg.com/marked-terminal/-/marked-terminal-1.7.0.tgz#c8c460881c772c7604b64367007ee5f77f125904"
+marked-terminal@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/marked-terminal/-/marked-terminal-2.0.0.tgz#5eaf568be66f686541afa52a558280310a31de2d"
dependencies:
cardinal "^1.0.0"
chalk "^1.1.3"
@@ -4182,7 +4189,7 @@ marked-terminal@^1.6.2:
lodash.assign "^4.2.0"
node-emoji "^1.4.1"
-marked@^0.3.6:
+marked@^0.3.12:
version "0.3.12"
resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.12.tgz#7cf25ff2252632f3fe2406bde258e94eee927519"
@@ -4958,8 +4965,8 @@ pngquant-bin@^3.0.0:
logalot "^2.0.0"
popper.js@^1.12.4:
- version "1.13.0"
- resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.13.0.tgz#e1e7ff65cc43f7cf9cf16f1510a75e81f84f4565"
+ version "1.12.9"
+ resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.12.9.tgz#0dfbc2dff96c451bb332edcfcfaaf566d331d5b3"
portfinder@^1.0.9:
version "1.0.13"
@@ -5243,7 +5250,7 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
source-map "^0.5.6"
supports-color "^3.2.3"
-postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.15, postcss@^6.0.8:
+postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.16, postcss@^6.0.8:
version "6.0.16"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.16.tgz#112e2fe2a6d2109be0957687243170ea5589e146"
dependencies:
@@ -5260,8 +5267,8 @@ preserve@^0.2.0:
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
prettier@^1.7.0:
- version "1.10.1"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.1.tgz#01423fea6957ea23618d37d339ef0e7f7c967fc6"
+ version "1.10.2"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.2.tgz#1af8356d1842276a99a5b5529c82dd9e9ad3cc93"
private@^0.1.6, private@^0.1.7, private@~0.1.5:
version "0.1.8"
@@ -5381,8 +5388,8 @@ randomatic@^1.1.3:
kind-of "^4.0.0"
randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
- version "2.0.5"
- resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79"
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
dependencies:
safe-buffer "^5.1.0"