From 9856aa0026a45ec5f2185423c91a16fd46ba1422 Mon Sep 17 00:00:00 2001 From: Sean Johnson Date: Wed, 13 Feb 2019 18:21:01 -0700 Subject: [PATCH 1/2] Added card-handle and card-type. Added disabled. Added divider. --- src/styl/card/card-settings.styl | 17 ++++++++++++++++- src/styl/card/card.styl | 32 ++++++++++++++++++++++++++++++++ src/styl/core/mixins.styl | 18 ++++++++++++++++++ test/views/card.hbs | 4 ++-- 4 files changed, 68 insertions(+), 3 deletions(-) diff --git a/src/styl/card/card-settings.styl b/src/styl/card/card-settings.styl index 7540cdc..8038718 100644 --- a/src/styl/card/card-settings.styl +++ b/src/styl/card/card-settings.styl @@ -15,4 +15,19 @@ $card-gap ?= $default-margin-layout; $card-min-width ?= 300px; $card-max-width ?= 1fr; -$card-control-margin ?= $default-spacing; \ No newline at end of file +$card-control-margin ?= $default-spacing; + +$card-success-background-color ?= $success-color; +$card-success-color ?= $success-color-alt; +$card-success-border-color ?= $success-color; +$card-info-background-color ?= $info-color; +$card-info-color ?= $info-color-alt; +$card-info-border-color ?= $info-color; +$card-warning-background-color ?= $warning-color; +$card-warning-color ?= $warning-color-alt; +$card-warning-border-color ?= $warning-color; +$card-danger-background-color ?= $danger-color; +$card-danger-color ?= $danger-color-alt; +$card-danger-border-color ?= $danger-color; + +$card-handle-width ?= 3px; \ No newline at end of file diff --git a/src/styl/card/card.styl b/src/styl/card/card.styl index 4b60712..9c3a3a2 100644 --- a/src/styl/card/card.styl +++ b/src/styl/card/card.styl @@ -46,6 +46,38 @@ $card-header-margin = -($card-border-width + $card-padding); } } + &.card-type-success { + border-color: $card-success-border-color; + } + + &.card-type-info { + border-color: $card-info-border-color; + } + + &.card-type-warning { + border-color: $card-warning-border-color; + } + + &.card-type-danger { + border-color: $card-danger-border-color; + } + + &.card-handle-top { + border-top-width: $card-handle-width; + } + + &.card-handle-right { + border-right-width: $card-handle-width; + } + + &.card-handle-bottom { + border-bottom-width: $card-handle-width; + } + + &.card-handle-left { + border-left-width: $card-handle-width; + } + & > header, & > footer, .card-title { diff --git a/src/styl/core/mixins.styl b/src/styl/core/mixins.styl index 13995dc..b4a7720 100644 --- a/src/styl/core/mixins.styl +++ b/src/styl/core/mixins.styl @@ -103,4 +103,22 @@ relative() { border-left-width: $default-border-width; border-left-color: $default-border-color; border-left-style: solid; +} + +.divider, +.divider-horizontal { + border-width: $default-border-width 0 0 0; + border-color: $default-border-color; + border-style: solid; +} + +.divider-vertical { + border-width: 0 $default-border-width 0 0; + border-color: $default-border-color; + border-style: solid; +} + +&.disabled { + filter: contrast(40%) brightness(110%); + cursor: default; } \ No newline at end of file diff --git a/test/views/card.hbs b/test/views/card.hbs index 167e0bd..dc38b2e 100644 --- a/test/views/card.hbs +++ b/test/views/card.hbs @@ -15,7 +15,7 @@ -
+
Card Header
Card Content
@@ -57,7 +57,7 @@
Card Footer
-
+
Card Header
Card Content
From 992f457cfd5a3767f0e176eaae907c123cc9f3e3 Mon Sep 17 00:00:00 2001 From: Sean Johnson Date: Wed, 13 Feb 2019 18:30:07 -0700 Subject: [PATCH 2/2] Updated package version to 0.7.11. --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index e6d67cf..b8be728 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "artistry", - "version": "0.7.10", + "version": "0.7.11", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index e6bdb38..53c01f9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "artistry", - "version": "0.7.10", + "version": "0.7.11", "author": "Sean Johnson ", "private": false, "repository": "https://www.github.com/sjohnsonaz/artistry.git",