From a525069599fa2c5d26d1f3368718e3943ffae172 Mon Sep 17 00:00:00 2001 From: Thorsten Griebenow Date: Fri, 9 Jun 2017 20:02:02 +0200 Subject: [PATCH 1/2] [BUGFIX] 135-Remove top border on Card layout --- Build/Assets/Scss/components/_card.scss | 70 ++++++++++++------------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/Build/Assets/Scss/components/_card.scss b/Build/Assets/Scss/components/_card.scss index 5cddaac..718de3d 100644 --- a/Build/Assets/Scss/components/_card.scss +++ b/Build/Assets/Scss/components/_card.scss @@ -44,40 +44,36 @@ // $card-spacing: 10px; $card-base-color: #000; -$card-border-color: lighten($card-base-color, 80); -$card-border-hover-color: lighten($card-base-color, 70); -$card-shadow-color: transparentize($card-base-color, 0.8); $card-shadow-hover-color: transparentize($card-base-color, 0.7); - +$card-shadow-color: $greySuperlightDarker; // // Component // .card { - display: flex; - padding: 15px; - box-shadow: 0 2px 0 $card-shadow-color; - border: 1px solid $card-border-color; - margin-bottom: ($card-spacing*2); - transition: all 0.2s ease-in-out; - transition-property: box-shadow, border, transform; + display: flex; + padding: 15px; + box-shadow: 0 3px 3px $card-shadow-color; + margin-bottom: ($card-spacing*2); + transition: all 0.2s ease-in-out; + transition-property: box-shadow, border, transform; + border: 0; - &:hover { - text-decoration: none; - border: 1px solid $card-border-hover-color; - transform: translate(0, -1px); - box-shadow: 0 3px 0 $card-shadow-hover-color; - } + &:hover { + text-decoration: none; + transform: translate(0, -1px); + box-shadow: 0 3px 0 $card-shadow-hover-color; + } } .card-container { - display: flex; - flex-wrap: wrap; - margin: $card-spacing #{ - $card-spacing}; + display: flex; + flex-wrap: wrap; + margin: $card-spacing #{ - $card-spacing}; - .card { - margin-left: $card-spacing; - margin-right: $card-spacing; - } + .card { + margin-left: $card-spacing; + margin-right: $card-spacing; + } } // @@ -86,33 +82,33 @@ $card-shadow-hover-color: transparentize($card-base-color, 0.7); .card-size-small, .card-size-medium, .card-size-large { - width: calc(100% - #{$card-spacing*2}); + width: calc(100% - #{$card-spacing*2}); } .card-size-small { - @include media-breakpoint-up(md) { - width: calc(33% - #{$card-spacing*2}); - } + @include media-breakpoint-up(md) { + width: calc(33% - #{$card-spacing*2}); + } } .card-size-medium { - @include media-breakpoint-up(sm) { - width: calc(50% - #{$card-spacing*2}); - } + @include media-breakpoint-up(sm) { + width: calc(50% - #{$card-spacing*2}); + } } .card-size-large { - @include media-breakpoint-up(sm) { - width: calc(100% - #{$card-spacing*2}); - } + @include media-breakpoint-up(sm) { + width: calc(100% - #{$card-spacing*2}); + } } .card .container { - margin: 0; + margin: 0; } // Always responsive images in cards .card img { - max-width: 100%; - height: auto; + max-width: 100%; + height: auto; } -- GitLab From 1e1f0045ca3eea165bc1d3236412ce3c5271bfee Mon Sep 17 00:00:00 2001 From: Thorsten Griebenow Date: Fri, 9 Jun 2017 20:20:49 +0200 Subject: [PATCH 2/2] [BUGFIX] 135-Remove top border on Card layout --- Build/Assets/Scss/components/_card.scss | 64 ++++++++++++------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/Build/Assets/Scss/components/_card.scss b/Build/Assets/Scss/components/_card.scss index 718de3d..d518b24 100644 --- a/Build/Assets/Scss/components/_card.scss +++ b/Build/Assets/Scss/components/_card.scss @@ -50,30 +50,30 @@ $card-shadow-color: $greySuperlightDarker; // Component // .card { - display: flex; - padding: 15px; - box-shadow: 0 3px 3px $card-shadow-color; - margin-bottom: ($card-spacing*2); - transition: all 0.2s ease-in-out; - transition-property: box-shadow, border, transform; - border: 0; + display: flex; + padding: 15px; + box-shadow: 0 3px 3px $card-shadow-color; + margin-bottom: ($card-spacing*2); + transition: all 0.2s ease-in-out; + transition-property: box-shadow, border, transform; + border: 0; - &:hover { - text-decoration: none; - transform: translate(0, -1px); - box-shadow: 0 3px 0 $card-shadow-hover-color; - } + &:hover { + text-decoration: none; + transform: translate(0, -1px); + box-shadow: 0 3px 0 $card-shadow-hover-color; + } } .card-container { - display: flex; - flex-wrap: wrap; - margin: $card-spacing #{ - $card-spacing}; + display: flex; + flex-wrap: wrap; + margin: $card-spacing #{ - $card-spacing}; - .card { - margin-left: $card-spacing; - margin-right: $card-spacing; - } + .card { + margin-left: $card-spacing; + margin-right: $card-spacing; + } } // @@ -82,33 +82,33 @@ $card-shadow-color: $greySuperlightDarker; .card-size-small, .card-size-medium, .card-size-large { - width: calc(100% - #{$card-spacing*2}); + width: calc(100% - #{$card-spacing*2}); } .card-size-small { - @include media-breakpoint-up(md) { - width: calc(33% - #{$card-spacing*2}); - } + @include media-breakpoint-up(md) { + width: calc(33% - #{$card-spacing*2}); + } } .card-size-medium { - @include media-breakpoint-up(sm) { - width: calc(50% - #{$card-spacing*2}); - } + @include media-breakpoint-up(sm) { + width: calc(50% - #{$card-spacing*2}); + } } .card-size-large { - @include media-breakpoint-up(sm) { - width: calc(100% - #{$card-spacing*2}); - } + @include media-breakpoint-up(sm) { + width: calc(100% - #{$card-spacing*2}); + } } .card .container { - margin: 0; + margin: 0; } // Always responsive images in cards .card img { - max-width: 100%; - height: auto; + max-width: 100%; + height: auto; } -- GitLab