From 5a49b025e46abca1311a7ba29c2cda8f5b444610 Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Wed, 28 Jul 2021 17:57:21 +0200 Subject: [PATCH] feat: separate button and card border radius --- src/scss/_definitions.scss | 7 ++++--- src/scss/components/_cards.scss | 10 +++++----- src/scss/components/_previews.scss | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/scss/_definitions.scss b/src/scss/_definitions.scss index f9e684d..79741c4 100644 --- a/src/scss/_definitions.scss +++ b/src/scss/_definitions.scss @@ -25,7 +25,8 @@ $lineheight_quarter: $lineheight/4; $card-header-margin: $lineheight; -$border-radius: 12px; +$card-radius: 12px; +$btn-radius: 0px; $border-size: 0px; $fontweight_big: 300; @@ -103,7 +104,7 @@ $screen-xxl-min: 1600px; border: $border-size solid rgba(0, 0, 0, 0.3) } -@mixin border-radius() { +@mixin border-radius($border-radius) { border-radius: $border-radius $border-radius $border-radius $border-radius; } @@ -112,7 +113,7 @@ $screen-xxl-min: 1600px; z-index:1; overflow: visible; @include borders(); - @include border-radius(); + @include border-radius($btn-radius); background-color:transparent; diff --git a/src/scss/components/_cards.scss b/src/scss/components/_cards.scss index 7b90bfc..e054ffe 100644 --- a/src/scss/components/_cards.scss +++ b/src/scss/components/_cards.scss @@ -9,7 +9,7 @@ $card-bigpad: $lineheight; $card-smallpad: $lineheight_half; @mixin card($size) { - @include border-radius(); + @include border-radius($card-radius); background-color: $color-background-alt; box-shadow: $large-shadow; border: none; @@ -53,12 +53,12 @@ $card-smallpad: $lineheight_half; @include button-style($size); border-radius:0; &:first-child { - border-top-left-radius: $border-radius; - border-top-right-radius: $border-radius; + border-top-left-radius: $card-radius; + border-top-right-radius: $card-radius; } &:last-child { - border-bottom-left-radius: $border-radius; - border-bottom-right-radius: $border-radius; + border-bottom-left-radius: $card-radius; + border-bottom-right-radius: $card-radius; } h1, h2, h3, h4, h5, h6, h7, h8, h9, h10 { diff --git a/src/scss/components/_previews.scss b/src/scss/components/_previews.scss index c525862..9d4259d 100644 --- a/src/scss/components/_previews.scss +++ b/src/scss/components/_previews.scss @@ -79,7 +79,7 @@ $preview-height: 8*$lineheight; padding-top: $card-header-margin/2; backdrop-filter: none; transition: background-color 0.3s; - @include border-radius(); + @include border-radius($card-radius); h1, h2, h3, h4, h5, h6 { color: $color-font-light; @@ -119,7 +119,7 @@ $preview-height: 8*$lineheight; background-size: cover; min-height:100%; min-width:100%; - @include border-radius(); + @include border-radius($card-radius); h1, h2, h3, h4, h5, h6 { margin-bottom:0px; @@ -153,7 +153,7 @@ $preview-height: 8*$lineheight; color: $color-font-light; height:165px; overflow: hidden; - @include border-radius(); + @include border-radius($card-radius); .metadata-pills { height:165px;