From e079ac4da1cf1a08288cc092dd59271661d686f0 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Wed, 19 Sep 2018 11:33:20 +0200 Subject: [PATCH] CSS adjustments to dropdowns, cards, responsive --- src/styles/_config.sass | 1 - src/styles/_utils.sass | 19 +++++++++++++++++++ src/styles/components/_base.sass | 11 ----------- src/styles/components/_card.sass | 9 +++++++-- src/styles/components/_dropdown.sass | 1 - src/styles/components/_jumbotron.sass | 13 +++++++++++-- src/styles/components/_navbar.sass | 2 ++ 7 files changed, 39 insertions(+), 17 deletions(-) diff --git a/src/styles/_config.sass b/src/styles/_config.sass index 17ce9671..d43944e2 100644 --- a/src/styles/_config.sass +++ b/src/styles/_config.sass @@ -157,7 +157,6 @@ $tooltip-font-size: 0.83rem $tooltip-max-width: auto $tooltip-opacity: 1 -$nav-link-height: 37px $navbar-padding-x: 0 $navbar-padding-y: 0 diff --git a/src/styles/_utils.sass b/src/styles/_utils.sass index 68060f3e..e7968084 100644 --- a/src/styles/_utils.sass +++ b/src/styles/_utils.sass @@ -515,6 +515,25 @@ .ribbon +ribbon +=label-tiny + position: relative + + &:before + color: $color-danger + display: block + font-size: 8px + font-weight: bold + left: 100% + position: absolute + top: -4px + +.new + +label-tiny + + &:before + content: 'NEW' + + @mixin text-background($text-color, $background-color, $roundness, $padding) border-radius: $roundness padding: $padding diff --git a/src/styles/components/_base.sass b/src/styles/components/_base.sass index b4a8fa0c..a8151423 100644 --- a/src/styles/components/_base.sass +++ b/src/styles/components/_base.sass @@ -11,17 +11,6 @@ body max-width: 100% min-width: auto -.container - +media-xs - max-width: 100% - min-width: auto - padding: - left: 0 - right: 0 - - &.box - +container-box - .page-content background-color: $white diff --git a/src/styles/components/_card.sass b/src/styles/components/_card.sass index a84736da..facaccb5 100644 --- a/src/styles/components/_card.sass +++ b/src/styles/components/_card.sass @@ -33,6 +33,7 @@ &.card-deck-vertical @extend .flex-column + @extend .text-truncate flex-wrap: initial .card @@ -51,6 +52,9 @@ @extend .mr-2 max-width: 120px + .card-title + @extend .text-truncate + &.asset &.free &:after @@ -64,6 +68,7 @@ .card-body @extend .overflow-hidden + @extend .text-truncate flex-basis: 0 .card-padless @@ -102,9 +107,9 @@ .card-img-top background-color: $color-background - background-size: cover background-position: center - + background-size: cover + object-fit: cover $card-progress-height: 5px .progress diff --git a/src/styles/components/_dropdown.sass b/src/styles/components/_dropdown.sass index ea302693..4800f995 100644 --- a/src/styles/components/_dropdown.sass +++ b/src/styles/components/_dropdown.sass @@ -1,7 +1,6 @@ // Global, we want all menus to look like this. ul.dropdown-menu box-shadow: $dropdown-box-shadow - top: 95% // So there is less gap between the dropdown and the item. > li &:first-child > a diff --git a/src/styles/components/_jumbotron.sass b/src/styles/components/_jumbotron.sass index 4c84a02a..0cf59045 100644 --- a/src/styles/components/_jumbotron.sass +++ b/src/styles/components/_jumbotron.sass @@ -8,9 +8,12 @@ repeat: no-repeat size: cover margin-bottom: 0 - padding-top: 10em - padding-bottom: 10em position: relative + word-break: break-word + + +media-sm + padding-top: 10em + padding-bottom: 10em &:after background-color: rgba(black, .5) @@ -45,3 +48,9 @@ &:hover text-decoration: none + + .display-4 + font-size: $h2-font-size + + +media-sm + font-size: $display4-size diff --git a/src/styles/components/_navbar.sass b/src/styles/components/_navbar.sass index c5492a91..049a104d 100644 --- a/src/styles/components/_navbar.sass +++ b/src/styles/components/_navbar.sass @@ -179,6 +179,8 @@ $nav-secondary-bar-size: -2px &:hover, &.active color: $primary + font-weight: initial + @extend .bg-white &:after