From ad0f4978dd15c6c440db7c7a81db4bb968e6c8bf Mon Sep 17 00:00:00 2001 From: Kevin Ross Date: Mon, 21 Dec 2015 17:14:18 -0600 Subject: [PATCH] default cards look okay for now --- scss/_cards.scss | 69 ++--------------------------- scss/_variables.scss | 9 ++-- scss/variables/bootstrap/_card.scss | 13 ++++++ 3 files changed, 19 insertions(+), 72 deletions(-) create mode 100644 scss/variables/bootstrap/_card.scss diff --git a/scss/_cards.scss b/scss/_cards.scss index 75d6e971..f581be31 100644 --- a/scss/_cards.scss +++ b/scss/_cards.scss @@ -1,66 +1,3 @@ -// -//.card { -// -// /***** Make height equal to width (http://stackoverflow.com/a/6615994) ****/ -// -// display: inline-block; -// position: relative; -// width: 100%; -// .card-height-indicator { -// margin-top: 100%; -// } -// .card-content { -// position: absolute; -// top: 0; -// bottom: 0; -// left: 0; -// right: 0; -// } -// -// /**************************************************************************/ -// -// border-radius: $border-radius; -// color: $mdb-card-body-text; -// background: $mdb-card-body-background; -// -// @include shadow-z-2(); -// -// .card-image { -// height: 60%; -// position: relative; -// overflow: hidden; -// img { -// width: 100%; -// height: 100%; -// border-top-left-radius: 2px; -// border-top-right-radius: 2px; -// pointer-events: none; -// } -// .card-image-headline { -// position: absolute; -// bottom: 16px; -// left: 18px; -// font-size: 2em; -// color: $mdb-card-image-headline; -// } -// } -// -// .card-body { -// height: 30%; -// padding: 18px; -// } -// -// .card-footer { -// height: 10%; -// padding: 18px; -// button { -// position: relative; -// bottom: 25px; -// width: auto; -// margin: 0 !important; -// &:first-child { -// left: -15px; -// } -// } -// } -//} +.card { + // defaults for now +} diff --git a/scss/_variables.scss b/scss/_variables.scss index 4e7d1fe2..9d6f9966 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -18,12 +18,14 @@ $mdb-label-color-inner-focus: $gray !default; // e.g. radio label or text-muted //--- // Customized BS variables $enable-flex: true; +@import "variables/bootstrap/components"; @import "variables/bootstrap/spacing"; + @import "variables/bootstrap/body"; @import "variables/bootstrap/brand"; @import "variables/bootstrap/buttons"; +@import "variables/bootstrap/card"; @import "variables/bootstrap/code"; -@import "variables/bootstrap/components"; @import "variables/bootstrap/forms"; @import "variables/bootstrap/nav"; @import "variables/bootstrap/state"; @@ -72,11 +74,6 @@ $mdb-label-top-margin-lg: 1rem !default; // 16px $mdb-form-line-height-sm: 1 !default; // set as 1x font-size so that padding is easier calculated to match the spec. $mdb-label-top-margin-sm: .75rem !default; // 12px -// Card -$mdb-card-body-text: $gray-dark !default; -$mdb-card-body-background: #fff !default; -$mdb-card-image-headline: #fff !default; - $text-disabled: #a8a8a8 !default; $background-disabled: #eaeaea !default; diff --git a/scss/variables/bootstrap/_card.scss b/scss/variables/bootstrap/_card.scss new file mode 100644 index 00000000..089ac6ab --- /dev/null +++ b/scss/variables/bootstrap/_card.scss @@ -0,0 +1,13 @@ +// Cards +//$card-spacer-x: 1.25rem !default; +//$card-spacer-y: .75rem !default; +//$card-border-width: 1px !default; +//$card-border-radius: $border-radius !default; +//$card-border-color: #e5e5e5 !default; +//$card-border-radius-inner: $card-border-radius !default; +//$card-cap-bg: #f5f5f5 !default; +//$card-bg: #fff !default; +// +//$card-link-hover-color: #fff !default; +// +//$card-deck-margin: .625rem !default;