From e6cf7a0f7f57ba682f478813e39f60b8bf1ded6c Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 15 Jun 2020 16:37:15 -0400
Subject: [PATCH] lessToSass
---
themes/bootprint3/scss/bootprint.scss | 4 +-
themes/bootprint3/scss/variables.scss | 56 ++++++++--------
themes/bootstrap3/scss/bootstrap.scss | 2 +-
.../scss/components/autocomplete.scss | 10 +--
.../bootstrap3/scss/components/offcanvas.scss | 2 +-
themes/bootstrap3/scss/components/search.scss | 6 +-
.../bootstrap3/scss/components/variables.scss | 64 +++++++++----------
themes/sandal/scss/common.scss | 8 +--
themes/sandal/scss/variables.scss | 16 ++---
9 files changed, 84 insertions(+), 84 deletions(-)
diff --git a/themes/bootprint3/scss/bootprint.scss b/themes/bootprint3/scss/bootprint.scss
index a061553dce0..a17e5b23148 100644
--- a/themes/bootprint3/scss/bootprint.scss
+++ b/themes/bootprint3/scss/bootprint.scss
@@ -10,8 +10,8 @@
@import "search";
@import "forms";
-$brand-primary: #619144; /* a11y overrides $brand-primary in sass */
-$active-orange: #E70;
+$brand-primary: #619144 !default; /* a11y overrides $brand-primary in sass */
+$active-orange: #E70 !default;
/* --- Bootstrap MODS ---*/
@import "common";
diff --git a/themes/bootprint3/scss/variables.scss b/themes/bootprint3/scss/variables.scss
index dd2080deb69..45a408d1e85 100644
--- a/themes/bootprint3/scss/variables.scss
+++ b/themes/bootprint3/scss/variables.scss
@@ -1,39 +1,39 @@
-$brand-primary: #619144;
+$brand-primary: #619144 !default;
-$font-size-base: 13px;
+$font-size-base: 13px !default;
-$padding-base-vertical : 3px;
-$padding-base-horizontal : 5px;
-$padding-large-vertical : 8px;
-$padding-large-horizontal: 5px;
-$padding-small-vertical : 1px;
-$padding-small-horizontal: 2px;
-$padding-xs-horizontal : 1px;
+$padding-base-vertical : 3px !default;
+$padding-base-horizontal : 5px !default;
+$padding-large-vertical : 8px !default;
+$padding-large-horizontal: 5px !default;
+$padding-small-vertical : 1px !default;
+$padding-small-horizontal: 2px !default;
+$padding-xs-horizontal : 1px !default;
-$border-radius-base : 3px;
-$border-radius-large: 5px;
-$border-radius-small: 2px;
+$border-radius-base : 3px !default;
+$border-radius-large: 5px !default;
+$border-radius-small: 2px !default;
-$input-border-focus: $brand-primary;
+$input-border-focus: $brand-primary !default;
-$legend-border-color: #777; // $gray-light
+$legend-border-color: #777 !default; // $gray-light
-$grid-gutter-width: 14px;
+$grid-gutter-width: 14px !default;
-$container-desktop : 952px;
-$container-large-desktop: 952px;
+$container-desktop : 952px !default;
+$container-large-desktop: 952px !default;
-$navbar-height : 65px;
-$navbar-margin-bottom: 0px;
-$nav-link-padding : 5px;
+$navbar-height : 65px !default;
+$navbar-margin-bottom: 0px !default;
+$nav-link-padding : 5px !default;
-$pagination-active-bg : #5bc0de; // $brand-info
-$pagination-active-border: #5bc0de; // $brand-info
+$pagination-active-bg : #5bc0de !default; // $brand-info
+$pagination-active-border: #5bc0de !default; // $brand-info
-$panel-body-padding: 5px;
+$panel-body-padding: 5px !default;
-$breadcrumb-padding-vertical : 6px;
-$breadcrumb-padding-horizontal: 20px;
-$breadcrumb-bg : #FFF;
-$breadcrumb-color : #777; // $gray-light
-$breadcrumb-active-color : #333; // $gray-dark
\ No newline at end of file
+$breadcrumb-padding-vertical : 6px !default;
+$breadcrumb-padding-horizontal: 20px !default;
+$breadcrumb-bg : #FFF !default;
+$breadcrumb-color : #777 !default; // $gray-light
+$breadcrumb-active-color : #333 !default; // $gray-dark
\ No newline at end of file
diff --git a/themes/bootstrap3/scss/bootstrap.scss b/themes/bootstrap3/scss/bootstrap.scss
index 7c0c8a17aa7..434caed1a04 100644
--- a/themes/bootstrap3/scss/bootstrap.scss
+++ b/themes/bootstrap3/scss/bootstrap.scss
@@ -3,7 +3,7 @@
@import "vendor/font-awesome/font-awesome";
<#LESS */
/* #SCSS> */
-$fa-font-path: "../../bootstrap3/css/fonts";
+$fa-font-path: "../../bootstrap3/css/fonts" !default;
@import "vendor/bootstrap";
@import "vendor/font-awesome/font-awesome";
/* <#SCSS */
diff --git a/themes/bootstrap3/scss/components/autocomplete.scss b/themes/bootstrap3/scss/components/autocomplete.scss
index 78714f48835..4d72a36ed4f 100644
--- a/themes/bootstrap3/scss/components/autocomplete.scss
+++ b/themes/bootstrap3/scss/components/autocomplete.scss
@@ -1,9 +1,9 @@
/* https://github.com/vufind-org/autocomplete.js 1.0b */
-$autocomplete-item-bg : #fff;
-$autocomplete-active-bg : $brand-primary;
-$autocomplete-hover-bg : lighten($brand-primary, 40%);
-$autocomplete-border : lightgray;
-$autocomplete-secondary : darkgray; // item description
+$autocomplete-item-bg : #fff !default;
+$autocomplete-active-bg : $brand-primary !default;
+$autocomplete-hover-bg : lighten($brand-primary, 40%) !default;
+$autocomplete-border : lightgray !default;
+$autocomplete-secondary : darkgray !default; // item description
.autocomplete-results {
position: absolute;
diff --git a/themes/bootstrap3/scss/components/offcanvas.scss b/themes/bootstrap3/scss/components/offcanvas.scss
index 39097702eb5..8d39bd481bd 100644
--- a/themes/bootstrap3/scss/components/offcanvas.scss
+++ b/themes/bootstrap3/scss/components/offcanvas.scss
@@ -1,4 +1,4 @@
-$offcanvas-offset: 80vw; // Width of open menu
+$offcanvas-offset: 80vw !default; // Width of open menu
.offcanvas-overlay { display: none; }
diff --git a/themes/bootstrap3/scss/components/search.scss b/themes/bootstrap3/scss/components/search.scss
index 33da24a21a2..880836f33f9 100644
--- a/themes/bootstrap3/scss/components/search.scss
+++ b/themes/bootstrap3/scss/components/search.scss
@@ -1,7 +1,7 @@
// Thumbnail sizes for media items: search results, list entries, record views
-$thumbnail-width-small: 60px;
-$thumbnail-width-medium: 100px;
-$thumbnail-width-large: 160px;
+$thumbnail-width-small: 60px !default;
+$thumbnail-width-medium: 100px !default;
+$thumbnail-width-large: 160px !default;
// Hide these on mobile
@media (max-width: 767px) {
diff --git a/themes/bootstrap3/scss/components/variables.scss b/themes/bootstrap3/scss/components/variables.scss
index 5603a0c5826..da161c60fe9 100644
--- a/themes/bootstrap3/scss/components/variables.scss
+++ b/themes/bootstrap3/scss/components/variables.scss
@@ -1,6 +1,6 @@
// Make sure Font Awesome icons are loaded properly
/* #LESS>
-$fa-font-path: "../../../../../../themes/bootstrap3/css/fonts";
+$fa-font-path: "../../../../../../themes/bootstrap3/css/fonts" !default;
<#LESS */
/**
@@ -8,47 +8,47 @@ $fa-font-path: "../../../../../../themes/bootstrap3/css/fonts";
* with comments and their defaults. See /themes/bootstrap3/less/vendor/bootstrap/variables.less for more.
*/
-// $padding-base-vertical: 6px; // Buttons, tabs, and other padding
-// $padding-base-horizontal: 12px;
+// $padding-base-vertical: 6px !default; // Buttons, tabs, and other padding
+// $padding-base-horizontal: 12px !default;
-// $navbar-height: 50px;
+// $navbar-height: 50px !default;
-// $border-radius-base: 4px;
+// $border-radius-base: 4px !default;
/* ------ COLORS ------ */
-// $gray-base: #000;
-// $gray-darker: lighten($gray-base, 13.5%); // #222
-// $gray-dark: lighten($gray-base, 20.0%); // #333
-// $gray: lighten($gray-base, 33.5%); // #555
-// $gray-light: lighten($gray-base, 46.7%); // #777
-// $gray-lighter: lighten($gray-base, 93.5%); // #eee
+// $gray-base: #000 !default;
+// $gray-darker: lighten($gray-base, 13.5%) !default; // #222
+// $gray-dark: lighten($gray-base, 20.0%) !default; // #333
+// $gray: lighten($gray-base, 33.5%) !default; // #555
+// $gray-light: lighten($gray-base, 46.7%) !default; // #777
+// $gray-lighter: lighten($gray-base, 93.5%) !default; // #eee
//
-// $brand-primary: darken(#428bca, 6.5%); // #337ab7 (primary buttons, links, and active elements)
-// $brand-success: #5cb85c;
-// $brand-info: #5bc0de;
-// $brand-warning: #f0ad4e;
-// $brand-danger: #d9534f;
+// $brand-primary: darken(#428bca, 6.5%) !default; // #337ab7 (primary buttons, links, and active elements)
+// $brand-success: #5cb85c !default;
+// $brand-info: #5bc0de !default;
+// $brand-warning: #f0ad4e !default;
+// $brand-danger: #d9534f !default;
-// $list-group-border: #ddd; // Borders on menus and sidebars
+// $list-group-border: #ddd !default; // Borders on menus and sidebars
-// $text-color: $gray-dark;
-// $link-color: $brand-primary;
-// $link-hover-color: darken($link-color, 15%);
+// $text-color: $gray-dark !default;
+// $link-color: $brand-primary !default;
+// $link-hover-color: darken($link-color, 15%) !default;
// Define colors for form feedback states and, by default, alerts.
-// $state-success-text: #3c763d;
-// $state-success-bg: #dff0d8;
-// $state-success-border: darken(adjust-hue($state-success-bg, -10), 5%);
+// $state-success-text: #3c763d !default;
+// $state-success-bg: #dff0d8 !default;
+// $state-success-border: darken(adjust-hue($state-success-bg, -10), 5%) !default;
//
-// $state-info-text: #31708f;
-// $state-info-bg: #d9edf7;
-// $state-info-border: darken(adjust-hue($state-info-bg, -10), 7%);
+// $state-info-text: #31708f !default;
+// $state-info-bg: #d9edf7 !default;
+// $state-info-border: darken(adjust-hue($state-info-bg, -10), 7%) !default;
//
-// $state-warning-text: #8a6d3b;
-// $state-warning-bg: #fcf8e3;
-// $state-warning-border: darken(adjust-hue($state-warning-bg, -10), 5%);
+// $state-warning-text: #8a6d3b !default;
+// $state-warning-bg: #fcf8e3 !default;
+// $state-warning-border: darken(adjust-hue($state-warning-bg, -10), 5%) !default;
//
-// $state-danger-text: #a94442;
-// $state-danger-bg: #f2dede;
-// $state-danger-border: darken(adjust-hue($state-danger-bg, -10), 5%);
+// $state-danger-text: #a94442 !default;
+// $state-danger-bg: #f2dede !default;
+// $state-danger-border: darken(adjust-hue($state-danger-bg, -10), 5%) !default;
diff --git a/themes/sandal/scss/common.scss b/themes/sandal/scss/common.scss
index 0ed8798050c..f835a95b6db 100644
--- a/themes/sandal/scss/common.scss
+++ b/themes/sandal/scss/common.scss
@@ -1,6 +1,6 @@
/* ------ Border radius changes ------ */
-$list-group-border-radius: 0;
-$border-radius-large: 0; // modal
+$list-group-border-radius: 0 !default;
+$border-radius-large: 0 !default; // modal
/* ------ Common element changes ------ */
.help-block {
@@ -99,8 +99,8 @@ select.form-control {
.label { font-weight: 400; }
-$pagination-border: transparent;
-$pagination-hover-border: transparent;
+$pagination-border: transparent !default;
+$pagination-hover-border: transparent !default;
.pagination {
@include clearfix();
display: table;
diff --git a/themes/sandal/scss/variables.scss b/themes/sandal/scss/variables.scss
index 294c2fcb7b7..8e18e8bbbd7 100644
--- a/themes/sandal/scss/variables.scss
+++ b/themes/sandal/scss/variables.scss
@@ -1,13 +1,13 @@
-$reduced-font-size: 14px;
-$img-path: "../../sandal/images/";
+$reduced-font-size: 14px !default;
+$img-path: "../../sandal/images/" !default;
-$banner-height: 60px;
-$banner-height-sm: 40px;
-$search-tab-height: 2rem;
+$banner-height: 60px !default;
+$banner-height-sm: 40px !default;
+$search-tab-height: 2rem !default;
-$result-checkbox-width: 28px;
-$result-checkbox-height: 80px;
-$result-sm-icon-size: 1.5rem;
+$result-checkbox-width: 28px !default;
+$result-checkbox-height: 80px !default;
+$result-sm-icon-size: 1.5rem !default;
/* ------ Mixins ------ */
@mixin full-width(){ // Break out of the container
--
GitLab