From b2cc438310247b7ca8404d996cd5dad12dc93a3e Mon Sep 17 00:00:00 2001 From: GoatCode <49639925+goat-code-cgn@users.noreply.github.com> Date: Wed, 1 May 2019 16:51:25 +0200 Subject: [PATCH 1/5] Add !default to sb-admin-2 SCSS variables Added `!default` to all sb-admin-2 SCSS variables so they can be overwritten and customized when importing the SCSS in an own project. --- scss/_variables.scss | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 96ed77a..3902810 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -28,8 +28,8 @@ $teal: #20c9a6 !default; $cyan: #36b9cc !default; // Custom Colors -$brand-google: #ea4335; -$brand-facebook: #3b5998; +$brand-google: #ea4335 !default; +$brand-facebook: #3b5998 !default; // Set Contrast Threshold $yiq-contrasted-threshold: 195 !default; @@ -50,27 +50,27 @@ $box-shadow: 0 0.15rem 1.75rem 0 rgba($gray-900, .15) !default; // Borders Radius $border-radius: 0.35rem !default; -$border-color: darken($gray-200, 2%); +$border-color: darken($gray-200, 2%) !default; // Spacing Variables // Change below variable if the height of the navbar changes -$topbar-base-height: 4.375rem; +$topbar-base-height: 4.375rem !default; // Change below variable to change the width of the sidenav -$sidebar-base-width: 14rem; +$sidebar-base-width: 14rem !default; // Change below variable to change the width of the sidenav when collapsed -$sidebar-collapsed-width: 6.5rem; +$sidebar-collapsed-width: 6.5rem !default; // Card -$card-cap-bg: $gray-100; -$card-border-color: $border-color; +$card-cap-bg: $gray-100 !default; +$card-border-color: $border-color !default; // Adjust column spacing for symmetry -$spacer: 1rem; -$grid-gutter-width: $spacer * 1.5; +$spacer: 1rem !default; +$grid-gutter-width: $spacer * 1.5 !default; // Transitions $transition-collapse: height .15s ease !default; // Dropdowns -$dropdown-font-size: 0.85rem; -$dropdown-border-color: $border-color; +$dropdown-font-size: 0.85rem !default; +$dropdown-border-color: $border-color !default; From e6a626a4491c66507f97d02685a3e3800a1f6e62 Mon Sep 17 00:00:00 2001 From: GoatCode <49639925+goat-code-cgn@users.noreply.github.com> Date: Thu, 2 May 2019 11:12:20 +0200 Subject: [PATCH 2/5] Update _login.scss --- scss/_login.scss | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scss/_login.scss b/scss/_login.scss index b942f42..829715d 100644 --- a/scss/_login.scss +++ b/scss/_login.scss @@ -2,20 +2,20 @@ // Toshi the dog from https://unsplash.com/@charlesdeluvio - what a funny dog... .bg-login-image { - background: url('https://source.unsplash.com/K4mSJ7kc0As/600x800'); - background-position: center; + background: url($login-image); + background-position: center center; background-size: cover; } .bg-register-image { - background: url('https://source.unsplash.com/Mv9hjnEUHR4/600x800'); - background-position: center; + background: url($login-image); + background-position: center center; background-size: cover; } .bg-password-image { - background: url('https://source.unsplash.com/oWTW-jNGl9I/600x800'); - background-position: center; + background: url($login-image); + background-position: center center; background-size: cover; } From 872d85d7586d44a3362c635b902addf56f0ce8a1 Mon Sep 17 00:00:00 2001 From: GoatCode <49639925+goat-code-cgn@users.noreply.github.com> Date: Thu, 2 May 2019 11:13:22 +0200 Subject: [PATCH 3/5] Update _variables.scss --- scss/_variables.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scss/_variables.scss b/scss/_variables.scss index 3902810..57f04a3 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -74,3 +74,6 @@ $transition-collapse: height .15s ease !default; // Dropdowns $dropdown-font-size: 0.85rem !default; $dropdown-border-color: $border-color !default; + +// Images +$login-image: 'https://source.unsplash.com/K4mSJ7kc0As/600x800'; From 5b0989eaa9bc8784cfde4d50abe88f78c4fe029a Mon Sep 17 00:00:00 2001 From: GoatCode <49639925+goat-code-cgn@users.noreply.github.com> Date: Thu, 2 May 2019 11:20:19 +0200 Subject: [PATCH 4/5] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d3adc04..936c13b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "title": "SB Admin 2", "name": "startbootstrap-sb-admin-2", - "version": "4.0.3", + "version": "4.0.4", "scripts": { "start": "gulp watch" }, From 77c35fe8b3d5494d954214409791a61f563f363b Mon Sep 17 00:00:00 2001 From: GoatCode <49639925+goat-code-cgn@users.noreply.github.com> Date: Thu, 2 May 2019 11:54:29 +0200 Subject: [PATCH 5/5] Update _variables.scss --- scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 57f04a3..aee3f0b 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -76,4 +76,4 @@ $dropdown-font-size: 0.85rem !default; $dropdown-border-color: $border-color !default; // Images -$login-image: 'https://source.unsplash.com/K4mSJ7kc0As/600x800'; +$login-image: 'https://source.unsplash.com/K4mSJ7kc0As/600x800' !default;