From 49cd2c5987acf9d6dbb82f55e4c4a992ef2a175e Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 1 Jan 2019 18:47:41 +0530 Subject: [PATCH] feat: Customize bootstrap using css variables (wip) --- frappe/public/scss/bootstrap-4.scss | 18 +++++++++-- frappe/public/scss/variables.scss | 46 ++++++++++++++++++++++++----- 2 files changed, 55 insertions(+), 9 deletions(-) diff --git a/frappe/public/scss/bootstrap-4.scss b/frappe/public/scss/bootstrap-4.scss index 7d921a3e0d..96d94a1176 100644 --- a/frappe/public/scss/bootstrap-4.scss +++ b/frappe/public/scss/bootstrap-4.scss @@ -1,5 +1,4 @@ @import "variables"; -@import "~bootstrap/scss/bootstrap"; @import "multilevel-dropdown"; @@ -92,4 +91,19 @@ img { .text-underline { text-decoration: underline; -} \ No newline at end of file +} + +// .standard-image { +// width: 100%; +// height: 0; +// padding: 50% 0; +// display: inline-block; +// text-align: center; +// border-radius: 4px; +// font-size: 14px; +// line-height: 0px; +// color: #d1d8dd; +// border: 1px solid #d1d8dd; +// font-weight: normal; +// margin-top: -1px; +// } \ No newline at end of file diff --git a/frappe/public/scss/variables.scss b/frappe/public/scss/variables.scss index ec58e6a1f3..3cfbd81996 100644 --- a/frappe/public/scss/variables.scss +++ b/frappe/public/scss/variables.scss @@ -1,8 +1,40 @@ -// $midnight_blue: #18427B; -// $dark_purple: #191B69; -// $light_grey: #E2DBD4; -// $green: #8BBF46; -// $slate_grey: #7F8487; +@import "~bootstrap/scss/_functions"; +@import "~bootstrap/scss/_variables"; -// $primary: $green; -// $dark: $dark_purple; \ No newline at end of file +// Convert SASS variables to CSS Variables +$border-color: var(--border-color, $border-color); +$input-border-color: var(--input-border-color, $input-border-color); + +@import "~bootstrap/scss/_mixins"; +@import "~bootstrap/scss/_root"; +@import "~bootstrap/scss/_reboot"; +@import "~bootstrap/scss/_type"; +@import "~bootstrap/scss/_images"; +@import "~bootstrap/scss/_code"; +@import "~bootstrap/scss/_grid"; +@import "~bootstrap/scss/_tables"; +@import "~bootstrap/scss/_forms"; +@import "~bootstrap/scss/_buttons"; +@import "~bootstrap/scss/_transitions"; +@import "~bootstrap/scss/_dropdown"; +@import "~bootstrap/scss/_button-group"; +@import "~bootstrap/scss/_input-group"; +@import "~bootstrap/scss/_custom-forms"; +@import "~bootstrap/scss/_nav"; +@import "~bootstrap/scss/_navbar"; +@import "~bootstrap/scss/_card"; +@import "~bootstrap/scss/_breadcrumb"; +@import "~bootstrap/scss/_pagination"; +@import "~bootstrap/scss/_badge"; +@import "~bootstrap/scss/_jumbotron"; +@import "~bootstrap/scss/_alert"; +@import "~bootstrap/scss/_progress"; +@import "~bootstrap/scss/_media"; +@import "~bootstrap/scss/_list-group"; +@import "~bootstrap/scss/_close"; +@import "~bootstrap/scss/_modal"; +@import "~bootstrap/scss/_tooltip"; +@import "~bootstrap/scss/_popover"; +@import "~bootstrap/scss/_carousel"; +@import "~bootstrap/scss/_utilities"; +@import "~bootstrap/scss/_print";