From fe9ea1049fa031d2c1169e885dbc4bd354686aed Mon Sep 17 00:00:00 2001 From: Pete Schuster Date: Wed, 16 Jan 2019 12:04:31 -0500 Subject: [PATCH] updates harness styles (#16) * init * bump version * updates * more * updates readme * one more --- README.md | 2 +- .../all-digital/components/_page-header.scss | 7 ++- assets/sass/all-digital/context/_harness.scss | 54 +++++++++++++++---- package.json | 2 +- 4 files changed, 51 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 32fe7eb..3b7f22f 100755 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Welcome to the All Digital brought to you by Comcast. In your project: ```bash -npm install git+https://github.com/Comcast/all-digital.git#v2.1.1 +npm install git+https://github.com/Comcast/all-digital.git#v2.6.0 ``` ## Usage diff --git a/assets/sass/all-digital/components/_page-header.scss b/assets/sass/all-digital/components/_page-header.scss index e49baea..cae371f 100644 --- a/assets/sass/all-digital/components/_page-header.scss +++ b/assets/sass/all-digital/components/_page-header.scss @@ -51,6 +51,11 @@ font-weight: 500; } +.page-header .button--text, +.page-header a { + color: $blue-genie; +} + .page-app--harnessed { .page-header { display: flex; @@ -58,6 +63,7 @@ padding: 12px; align-items: center } + .page-header__back { position: static; order: -1; @@ -69,4 +75,3 @@ left: 62px; text-align: left; } - diff --git a/assets/sass/all-digital/context/_harness.scss b/assets/sass/all-digital/context/_harness.scss index 72690f5..7da1e34 100644 --- a/assets/sass/all-digital/context/_harness.scss +++ b/assets/sass/all-digital/context/_harness.scss @@ -1,15 +1,4 @@ .page-app--harnessed { - h2, - .heading2 { - @include font-size(14); - color: $cool-grey11; - font-weight: 500; - } - - .page-section--banner h1.heading2 { - @include heading2; - } - .form-control:not(.form-control--boolean) { .label, label, @@ -19,6 +8,11 @@ } } + .label { + color: $cool-grey11; + font-weight: 500; + } + [type=text], [type=email], [type=url], @@ -33,7 +27,45 @@ border-color: #656b71; } + a, + .link, .button { font-weight: 500; } + + .hgroup { + .display1, + .display2, + .display3, + .heading1, + .heading2, + .heading3, + .heading4, + .heading5, + .heading6, + .body1, + .body2, + .body3, + .body4, + h1, + h2, + h3, + h4, + h5, + h6, + p { + margin-bottom: 8px; + } + } + + .card { + margin-left: -17px; // 16 padding + 1 border + width: calc(100% + 34px); // 16 padding * 2 + 2 border + padding: 16px; + } + + .page-section__wrapper { + padding-left: 16px; + padding-right: 16px; + } } diff --git a/package.json b/package.json index 7d60e7e..176399d 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "all-digital", - "version": "2.5.0", + "version": "2.6.0", "description": "CSS for All Digital", "repository": { "type": "git",