diff --git a/assets/styles/base/_color.scss b/assets/styles/base/_color.scss index 4124c64bd4..f0cd9e3cbe 100644 --- a/assets/styles/base/_color.scss +++ b/assets/styles/base/_color.scss @@ -15,6 +15,7 @@ $hover-text: get-or-def($color, "hover-text", saturate($link, 20%)); $active-text: get-or-def($color, "active-text", contrast-color($active-bg)); $border: get-or-def($color, "border", $color); + $banner-bg: get-or-def($color, "banner", rgba($default, 0.15)); --#{$name}: #{$default}; --#{$name}-text: #{$default-text}; @@ -23,6 +24,7 @@ --#{$name}-active-bg: #{$active-bg}; --#{$name}-active-text: #{$active-text}; --#{$name}-border: #{$border}; + --#{$name}-banner-bg: #{$banner-bg}; @if $write-classes { .text-#{$name} { diff --git a/assets/styles/base/_helpers.scss b/assets/styles/base/_helpers.scss index 785243e9ed..d12fbcbc04 100644 --- a/assets/styles/base/_helpers.scss +++ b/assets/styles/base/_helpers.scss @@ -30,7 +30,7 @@ $spacing-property-map: ( } .spacer { - padding: 20px 0 0 0; + padding: 40px 0 0 0; } .pull-right { diff --git a/assets/styles/base/_typography.scss b/assets/styles/base/_typography.scss index 8fd8a59da4..a0a803958d 100644 --- a/assets/styles/base/_typography.scss +++ b/assets/styles/base/_typography.scss @@ -7,7 +7,7 @@ H1, H2, H3, H4, H5, H6 { font-style: normal; font-weight: 400; letter-spacing: 0em; - margin: 0; + margin: 0 0 10px 0; } H1 { @@ -24,19 +24,16 @@ H3 { H4 { font-size: 16px; - font-weight: 300; } H5 { font-size: 14px; - font-weight: 300; } H6 { font-size: 12px; letter-spacing: .25em; text-transform: uppercase; - font-weight: 300; } P { diff --git a/assets/styles/global/_form.scss b/assets/styles/global/_form.scss index 1678e07f2d..7514559c1f 100644 --- a/assets/styles/global/_form.scss +++ b/assets/styles/global/_form.scss @@ -36,6 +36,7 @@ TEXTAREA, &.view { border: none; background-color: transparent; + padding: 0; } &::placeholder { @@ -57,9 +58,9 @@ TEXTAREA, margin: $spacing 0 $spacing 0; } - &.no-resize::placeholder { - padding-top: 8px; - } + // &.no-resize::placeholder { + // padding-top: 8px; + // } } TEXTAREA { diff --git a/assets/styles/themes/_light.scss b/assets/styles/themes/_light.scss index b25567f2ef..c88e078d44 100644 --- a/assets/styles/themes/_light.scss +++ b/assets/styles/themes/_light.scss @@ -20,14 +20,14 @@ $lighter : #F4F5FA; //light body bg $lightest : #FFFFFF; -$primary : #3D98D3; -$secondary : $darker; -$link : $primary; -$disabled : $dark; -$success : #5D995D; -$warning : #DAC342; -$error : #F64747; -$info : #213444; +$primary : #3D98D3; +$secondary : $darker; +$link : $primary; +$disabled : $dark; +$success : #5D995D; +$warning : #DAC342; +$error : #F64747; +$info : #213444; $contrasted-dark: $darkest !default; $contrasted-light: $lightest !default; diff --git a/components/Banner.vue b/components/Banner.vue new file mode 100644 index 0000000000..f1f871a703 --- /dev/null +++ b/components/Banner.vue @@ -0,0 +1,74 @@ + + + + diff --git a/components/ContainerResourceLimit.vue b/components/ContainerResourceLimit.vue index 48204efc99..9ff71516e5 100644 --- a/components/ContainerResourceLimit.vue +++ b/components/ContainerResourceLimit.vue @@ -102,11 +102,9 @@ export default {