From ed9d7c0878a9fe485bb4f5d85372b4ed2bb61293 Mon Sep 17 00:00:00 2001 From: Luke Larsen Date: Wed, 25 Mar 2020 16:07:41 -0600 Subject: [PATCH 01/38] remove containerless yay --- src/layouts/l-box-link/l-box-link.ts | 3 +-- src/layouts/l-box/l-box.css | 1 + src/layouts/l-box/l-box.ts | 3 +-- src/layouts/l-center/l-center.ts | 3 +-- src/layouts/l-cluster/l-cluster.ts | 3 +-- src/layouts/l-cover/l-cover.ts | 3 +-- src/layouts/l-grid/l-grid.ts | 3 +-- src/layouts/l-sidebar/l-sidebar.ts | 3 +-- src/layouts/l-stack/l-stack.ts | 3 +-- src/layouts/l-switcher/l-switcher.ts | 3 +-- 10 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/layouts/l-box-link/l-box-link.ts b/src/layouts/l-box-link/l-box-link.ts index d58ccd05..84c8a5bf 100644 --- a/src/layouts/l-box-link/l-box-link.ts +++ b/src/layouts/l-box-link/l-box-link.ts @@ -3,10 +3,9 @@ Copyright 2020, Verizon Media Licensed under the terms of the MIT license. See the LICENSE file in the project root for license terms. */ -import {bindable, containerless} from 'aurelia-framework'; +import {bindable} from 'aurelia-framework'; import * as styles from '../l-box/l-box.css.json'; -@containerless export class LBoxLink { @bindable public background = 'var(--c_darkGray)'; diff --git a/src/layouts/l-box/l-box.css b/src/layouts/l-box/l-box.css index 6a3a06c5..5355cdfe 100644 --- a/src/layouts/l-box/l-box.css +++ b/src/layouts/l-box/l-box.css @@ -32,6 +32,7 @@ Licensed under the terms of the MIT license. See the LICENSE file in the project padding-left: var(--box-padding-sides); background: var(--box-background); color: var(--box-color); + display: block; } .border-top{ diff --git a/src/layouts/l-box/l-box.ts b/src/layouts/l-box/l-box.ts index 431bdb07..10108ad0 100644 --- a/src/layouts/l-box/l-box.ts +++ b/src/layouts/l-box/l-box.ts @@ -3,10 +3,9 @@ Copyright 2020, Verizon Media Licensed under the terms of the MIT license. See the LICENSE file in the project root for license terms. */ -import {bindable, containerless} from 'aurelia-framework'; +import {bindable} from 'aurelia-framework'; import * as styles from './l-box.css.json'; -@containerless export class LBox { @bindable public background = 'var(--c_darkGray)'; diff --git a/src/layouts/l-center/l-center.ts b/src/layouts/l-center/l-center.ts index 34da378b..4d57f601 100644 --- a/src/layouts/l-center/l-center.ts +++ b/src/layouts/l-center/l-center.ts @@ -3,10 +3,9 @@ Copyright 2020, Verizon Media Licensed under the terms of the MIT license. See the LICENSE file in the project root for license terms. */ -import {bindable, containerless} from 'aurelia-framework'; +import {bindable} from 'aurelia-framework'; import * as styles from './l-center.css.json'; -@containerless export class LCenter { @bindable public intrinsic = false; diff --git a/src/layouts/l-cluster/l-cluster.ts b/src/layouts/l-cluster/l-cluster.ts index 47890d22..3b33304b 100644 --- a/src/layouts/l-cluster/l-cluster.ts +++ b/src/layouts/l-cluster/l-cluster.ts @@ -3,10 +3,9 @@ Copyright 2020, Verizon Media Licensed under the terms of the MIT license. See the LICENSE file in the project root for license terms. */ -import {bindable, containerless} from 'aurelia-framework'; +import {bindable} from 'aurelia-framework'; import * as styles from './l-cluster.css.json'; -@containerless export class LCluster { @bindable public align = 'center'; diff --git a/src/layouts/l-cover/l-cover.ts b/src/layouts/l-cover/l-cover.ts index 92628921..5f8f6214 100644 --- a/src/layouts/l-cover/l-cover.ts +++ b/src/layouts/l-cover/l-cover.ts @@ -3,10 +3,9 @@ Copyright 2020, Verizon Media Licensed under the terms of the MIT license. See the LICENSE file in the project root for license terms. */ -import {bindable, containerless} from 'aurelia-framework'; +import {bindable} from 'aurelia-framework'; import * as styles from './l-cover.css.json'; -@containerless export class LCover { @bindable public center = false; diff --git a/src/layouts/l-grid/l-grid.ts b/src/layouts/l-grid/l-grid.ts index 41816695..03a2a15e 100644 --- a/src/layouts/l-grid/l-grid.ts +++ b/src/layouts/l-grid/l-grid.ts @@ -3,12 +3,11 @@ Copyright 2020, Verizon Media Licensed under the terms of the MIT license. See the LICENSE file in the project root for license terms. */ -import {bindable, containerless} from 'aurelia-framework'; +import {bindable} from 'aurelia-framework'; import {generateRandom} from '../../helpers/generate-random'; import {lazyLoadCheck} from '../../helpers/lazy-load-check'; import * as styles from './l-grid.css.json'; -@containerless export class LGrid { @bindable public actions; diff --git a/src/layouts/l-sidebar/l-sidebar.ts b/src/layouts/l-sidebar/l-sidebar.ts index 23d21007..2c9e2294 100644 --- a/src/layouts/l-sidebar/l-sidebar.ts +++ b/src/layouts/l-sidebar/l-sidebar.ts @@ -3,11 +3,10 @@ Copyright 2020, Verizon Media Licensed under the terms of the MIT license. See the LICENSE file in the project root for license terms. */ -import {bindable, containerless} from 'aurelia-framework'; +import {bindable} from 'aurelia-framework'; import {generateRandom} from '../../helpers/generate-random'; import * as styles from './l-sidebar.css.json'; -@containerless export class LSidebar { @bindable public contentMin = '65%'; diff --git a/src/layouts/l-stack/l-stack.ts b/src/layouts/l-stack/l-stack.ts index fe191ad8..3e3c99c7 100644 --- a/src/layouts/l-stack/l-stack.ts +++ b/src/layouts/l-stack/l-stack.ts @@ -3,10 +3,9 @@ Copyright 2020, Verizon Media Licensed under the terms of the MIT license. See the LICENSE file in the project root for license terms. */ -import {bindable, containerless} from 'aurelia-framework'; +import {bindable} from 'aurelia-framework'; import * as styles from './l-stack.css.json'; -@containerless export class LStack { @bindable public list; diff --git a/src/layouts/l-switcher/l-switcher.ts b/src/layouts/l-switcher/l-switcher.ts index 1ccf81dd..8dc48786 100644 --- a/src/layouts/l-switcher/l-switcher.ts +++ b/src/layouts/l-switcher/l-switcher.ts @@ -3,10 +3,9 @@ Copyright 2020, Verizon Media Licensed under the terms of the MIT license. See the LICENSE file in the project root for license terms. */ -import {bindable, containerless} from 'aurelia-framework'; +import {bindable} from 'aurelia-framework'; import * as styles from './l-switcher.css.json'; -@containerless export class LSwitcher { @bindable public doubleWidth; From 596e52c9ae2e908d825ec57ff86d07ed1f28d81b Mon Sep 17 00:00:00 2001 From: Luke Larsen Date: Wed, 25 Mar 2020 16:09:03 -0600 Subject: [PATCH 02/38] docs clean up --- .../forms/add-remove/properties/index.html | 2 - .../forms/select/properties/index.html | 12 +++-- .../routes/layouts/grid/properties/index.html | 50 ++++++++++--------- dev-app/routes/layouts/stack/index.html | 2 +- dev-app/routes/layouts/switcher/index.html | 33 ++++++------ .../forms/c-disabled/c-disabled.css | 2 +- 6 files changed, 51 insertions(+), 50 deletions(-) diff --git a/dev-app/routes/components/forms/add-remove/properties/index.html b/dev-app/routes/components/forms/add-remove/properties/index.html index 99cc7285..8ed6ab25 100644 --- a/dev-app/routes/components/forms/add-remove/properties/index.html +++ b/dev-app/routes/components/forms/add-remove/properties/index.html @@ -30,7 +30,6 @@ > -
@@ -50,7 +49,6 @@ > -
diff --git a/dev-app/routes/components/forms/select/properties/index.html b/dev-app/routes/components/forms/select/properties/index.html index 81e1f523..d4a56ed8 100644 --- a/dev-app/routes/components/forms/select/properties/index.html +++ b/dev-app/routes/components/forms/select/properties/index.html @@ -60,11 +60,13 @@ }]; } - - - - - select: ${vSelectOutput} + + + + + + select: ${vSelectOutput} + diff --git a/dev-app/routes/layouts/grid/properties/index.html b/dev-app/routes/layouts/grid/properties/index.html index 1c89ffbb..0d6c55a9 100644 --- a/dev-app/routes/layouts/grid/properties/index.html +++ b/dev-app/routes/layouts/grid/properties/index.html @@ -52,21 +52,22 @@ gap - - First Item - Second Item - Third Item - Fourth Item - Fifth Item - - - - First Item - Second Item - Third Item - Fourth Item - Fifth Item - + + + First Item + Second Item + Third Item + Fourth Item + Fifth Item + + + First Item + Second Item + Third Item + Fourth Item + Fifth Item + + @@ -77,15 +78,16 @@ auto-sizing - - First Item - Second Item - - - - First Item - Second Item - + + + First Item + Second Item + + + First Item + Second Item + + diff --git a/dev-app/routes/layouts/stack/index.html b/dev-app/routes/layouts/stack/index.html index af2fab5f..6243b138 100644 --- a/dev-app/routes/layouts/stack/index.html +++ b/dev-app/routes/layouts/stack/index.html @@ -118,7 +118,7 @@ -
+
Split After diff --git a/dev-app/routes/layouts/switcher/index.html b/dev-app/routes/layouts/switcher/index.html index 9f97d7e0..2b5bd9b7 100644 --- a/dev-app/routes/layouts/switcher/index.html +++ b/dev-app/routes/layouts/switcher/index.html @@ -38,7 +38,7 @@
- + double-width @@ -53,7 +53,7 @@
- + limit @@ -69,20 +69,21 @@
- + spacing - - First Item - Second Item - Third Item - - - - First Item - Second Item - Third Item - + + + First Item + Second Item + Third Item + + + First Item + Second Item + Third Item + +
@@ -90,7 +91,7 @@
- + threshold @@ -99,13 +100,11 @@ Second Item Third Item - First Item Second Item Third Item - First Item Second Item diff --git a/src/components/forms/c-disabled/c-disabled.css b/src/components/forms/c-disabled/c-disabled.css index 5e985cd1..7fb1b115 100644 --- a/src/components/forms/c-disabled/c-disabled.css +++ b/src/components/forms/c-disabled/c-disabled.css @@ -21,7 +21,7 @@ Licensed under the terms of the MIT license. See the LICENSE file in the project .disabled{ display: inline-block; - margin-top: 8px; + margin-top: 6px; color: var(--c_subOneMain); font-style: italic; word-break: break-word; From a9bc676794635b6afe1d7d74e24cc32c59c21e6a Mon Sep 17 00:00:00 2001 From: Luke Larsen Date: Wed, 25 Mar 2020 16:14:49 -0600 Subject: [PATCH 03/38] c-form-select and c-form-add-remove fixes --- .../c-form-add-remove/c-form-add-remove.css | 14 +++++++--- .../select/c-form-select/c-form-select.css | 3 ++- .../select/c-form-select/c-form-select.html | 26 +++++++++++-------- 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/components/forms/select/c-form-add-remove/c-form-add-remove.css b/src/components/forms/select/c-form-add-remove/c-form-add-remove.css index 4ae12f3c..72e628d1 100644 --- a/src/components/forms/select/c-form-add-remove/c-form-add-remove.css +++ b/src/components/forms/select/c-form-add-remove/c-form-add-remove.css @@ -22,7 +22,6 @@ Licensed under the terms of the MIT license. See the LICENSE file in the project .container{ display: flex; justify-content: space-between; - height: 100%; } .container c-form-select{ @@ -31,17 +30,24 @@ Licensed under the terms of the MIT license. See the LICENSE file in the project flex: 1; } -.container c-form-select > div:nth-child(2){ +.container c-form-select > l-stack{ height: 100%; } +.container l-stack > div{ + height: unset; +} + .container select, .container > div{ flex: 1; } -.container > div{ - justify-content: center; +.container > l-stack{ flex: 0; margin: 20px var(--s-2) 0; } + +.container > l-stack > div{ + justify-content: center; +} diff --git a/src/components/forms/select/c-form-select/c-form-select.css b/src/components/forms/select/c-form-select/c-form-select.css index 354054fa..370a8ad7 100644 --- a/src/components/forms/select/c-form-select/c-form-select.css +++ b/src/components/forms/select/c-form-select/c-form-select.css @@ -40,6 +40,7 @@ c-form-select{ -moz-appearance: none; display: block; width: 100%; + height: unset; padding: var(--s-5) var(--s-3); border: solid 1px var(--c_black); border-radius: 0; @@ -157,7 +158,7 @@ select.error{ .loader{ position: absolute; - top: 60px; + top: 25px; bottom: 0; width: 100%; min-height: 109px; diff --git a/src/components/forms/select/c-form-select/c-form-select.html b/src/components/forms/select/c-form-select/c-form-select.html index 06d955ac..aea432f8 100644 --- a/src/components/forms/select/c-form-select/c-form-select.html +++ b/src/components/forms/select/c-form-select/c-form-select.html @@ -12,9 +12,12 @@
- + -
- -
- - -
-
-
+ +
+ + +
+
From f7c0af592a90cd6509d68f904ba714a63872d579 Mon Sep 17 00:00:00 2001 From: Luke Larsen Date: Wed, 25 Mar 2020 16:22:13 -0600 Subject: [PATCH 04/38] c-button code clean up --- src/components/buttons/c-button/c-button.html | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/src/components/buttons/c-button/c-button.html b/src/components/buttons/c-button/c-button.html index e0ca1c63..a2c462a4 100644 --- a/src/components/buttons/c-button/c-button.html +++ b/src/components/buttons/c-button/c-button.html @@ -8,19 +8,35 @@ - - - + + ${title} - + From ec7af629a9a7b92acff444a163317a514f919fe7 Mon Sep 17 00:00:00 2001 From: Luke Larsen Date: Wed, 25 Mar 2020 16:27:36 -0600 Subject: [PATCH 05/38] c-copy html clean up --- src/components/copy/c-copy/c-copy.html | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/components/copy/c-copy/c-copy.html b/src/components/copy/c-copy/c-copy.html index 12b60641..d12f66b9 100644 --- a/src/components/copy/c-copy/c-copy.html +++ b/src/components/copy/c-copy/c-copy.html @@ -17,8 +17,19 @@ - ${content} - Copy + + ${content} + + + Copy +
From 8d0140c8a6333840ebed1f9b8ad4b005964c033e Mon Sep 17 00:00:00 2001 From: Luke Larsen Date: Wed, 25 Mar 2020 16:32:09 -0600 Subject: [PATCH 06/38] c-form-image html clean up --- .../forms/c-form-image/c-form-image.html | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/components/forms/c-form-image/c-form-image.html b/src/components/forms/c-form-image/c-form-image.html index c80a677f..d3936039 100644 --- a/src/components/forms/c-form-image/c-form-image.html +++ b/src/components/forms/c-form-image/c-form-image.html @@ -6,18 +6,28 @@ diff --git a/src/components/forms/checkbox-radio/c-form-checkbox-radio-container/c-form-checkbox-radio-container.html b/src/components/forms/checkbox-radio/c-form-checkbox-radio-container/c-form-checkbox-radio-container.html index cbc950be..f41337f6 100644 --- a/src/components/forms/checkbox-radio/c-form-checkbox-radio-container/c-form-checkbox-radio-container.html +++ b/src/components/forms/checkbox-radio/c-form-checkbox-radio-container/c-form-checkbox-radio-container.html @@ -7,19 +7,34 @@ -
+
${label}
- -
+
- ${errorMsg} - ${warningMsg} + + ${errorMsg} + + + ${warningMsg} + From 1a3b3fa66afb282c4e1caeaac098d1f68d1eff62 Mon Sep 17 00:00:00 2001 From: Luke Larsen Date: Wed, 25 Mar 2020 16:40:45 -0600 Subject: [PATCH 08/38] c-checkbox-input html clean up --- .../checkbox/c-checkbox-input/c-checkbox-input.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/forms/checkbox-radio/checkbox/c-checkbox-input/c-checkbox-input.html b/src/components/forms/checkbox-radio/checkbox/c-checkbox-input/c-checkbox-input.html index cc1dee21..26b735c8 100644 --- a/src/components/forms/checkbox-radio/checkbox/c-checkbox-input/c-checkbox-input.html +++ b/src/components/forms/checkbox-radio/checkbox/c-checkbox-input/c-checkbox-input.html @@ -6,5 +6,12 @@ From f98fd9dbbcdf264772b06c871662514f1370f91a Mon Sep 17 00:00:00 2001 From: Luke Larsen Date: Wed, 25 Mar 2020 16:45:35 -0600 Subject: [PATCH 09/38] c-label-checkbox --- .../checkbox/c-checkbox-label/c-checkbox-label.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/forms/checkbox-radio/checkbox/c-checkbox-label/c-checkbox-label.html b/src/components/forms/checkbox-radio/checkbox/c-checkbox-label/c-checkbox-label.html index ac31ca54..d93c693a 100644 --- a/src/components/forms/checkbox-radio/checkbox/c-checkbox-label/c-checkbox-label.html +++ b/src/components/forms/checkbox-radio/checkbox/c-checkbox-label/c-checkbox-label.html @@ -6,5 +6,10 @@ From 54467fd1e303a41dcd305da1d8e424820cfe5128 Mon Sep 17 00:00:00 2001 From: Luke Larsen Date: Wed, 25 Mar 2020 16:54:19 -0600 Subject: [PATCH 10/38] c-form-checkbox html clean up --- .../checkbox/c-form-checkbox/c-form-checkbox.css | 1 + .../checkbox/c-form-checkbox/c-form-checkbox.html | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/components/forms/checkbox-radio/checkbox/c-form-checkbox/c-form-checkbox.css b/src/components/forms/checkbox-radio/checkbox/c-form-checkbox/c-form-checkbox.css index 261499e2..3de93a90 100644 --- a/src/components/forms/checkbox-radio/checkbox/c-form-checkbox/c-form-checkbox.css +++ b/src/components/forms/checkbox-radio/checkbox/c-form-checkbox/c-form-checkbox.css @@ -22,6 +22,7 @@ Licensed under the terms of the MIT license. See the LICENSE file in the project .draggable{ height: 15px; width: 11px; + margin-bottom: 0 !important; vertical-align: top; } diff --git a/src/components/forms/checkbox-radio/checkbox/c-form-checkbox/c-form-checkbox.html b/src/components/forms/checkbox-radio/checkbox/c-form-checkbox/c-form-checkbox.html index a0488b5f..d19b3ace 100644 --- a/src/components/forms/checkbox-radio/checkbox/c-form-checkbox/c-form-checkbox.html +++ b/src/components/forms/checkbox-radio/checkbox/c-form-checkbox/c-form-checkbox.html @@ -17,8 +17,18 @@ class="${styles.draggable}" drag-options.bind="dragOptions" > - - + + + +
From 55f65da065622493702e0d3ace484cd39d50ab56 Mon Sep 17 00:00:00 2001 From: Luke Larsen Date: Wed, 25 Mar 2020 16:57:09 -0600 Subject: [PATCH 11/38] c-form-radio html clean up --- .../radio/c-form-radio/c-form-radio.html | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/components/forms/checkbox-radio/radio/c-form-radio/c-form-radio.html b/src/components/forms/checkbox-radio/radio/c-form-radio/c-form-radio.html index 005ca817..0da08e02 100644 --- a/src/components/forms/checkbox-radio/radio/c-form-radio/c-form-radio.html +++ b/src/components/forms/checkbox-radio/radio/c-form-radio/c-form-radio.html @@ -7,8 +7,19 @@
- - + + + +
From 40607117435c49d03032ffcd89974de8224b45bd Mon Sep 17 00:00:00 2001 From: Luke Larsen Date: Wed, 25 Mar 2020 16:58:44 -0600 Subject: [PATCH 12/38] c-radio-input html clean up --- .../radio/c-radio-input/c-radio-input.html | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/components/forms/checkbox-radio/radio/c-radio-input/c-radio-input.html b/src/components/forms/checkbox-radio/radio/c-radio-input/c-radio-input.html index b0d87684..35b4da56 100644 --- a/src/components/forms/checkbox-radio/radio/c-radio-input/c-radio-input.html +++ b/src/components/forms/checkbox-radio/radio/c-radio-input/c-radio-input.html @@ -6,5 +6,14 @@ From caa835ad72ee9ffa89e35367c1316828518d04c3 Mon Sep 17 00:00:00 2001 From: Luke Larsen Date: Wed, 25 Mar 2020 17:03:32 -0600 Subject: [PATCH 13/38] c-radio-label html clean up --- .../checkbox-radio/radio/c-radio-label/c-radio-label.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/forms/checkbox-radio/radio/c-radio-label/c-radio-label.html b/src/components/forms/checkbox-radio/radio/c-radio-label/c-radio-label.html index 24827c6e..68ef4924 100644 --- a/src/components/forms/checkbox-radio/radio/c-radio-label/c-radio-label.html +++ b/src/components/forms/checkbox-radio/radio/c-radio-label/c-radio-label.html @@ -6,5 +6,10 @@ From d14ab50d5c0abac5680d1177176abbfe7de8c19d Mon Sep 17 00:00:00 2001 From: Luke Larsen Date: Wed, 25 Mar 2020 17:06:26 -0600 Subject: [PATCH 14/38] c-form-toggle html clean up --- .../toggle/c-form-toggle/c-form-toggle.html | 20 ++++++++++++++++--- .../toggle/c-toggle-input/c-toggle-input.html | 10 +++++++++- .../toggle/c-toggle-label/c-toggle-label.html | 7 ++++++- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/src/components/forms/checkbox-radio/toggle/c-form-toggle/c-form-toggle.html b/src/components/forms/checkbox-radio/toggle/c-form-toggle/c-form-toggle.html index 54b4452d..0d9c812f 100644 --- a/src/components/forms/checkbox-radio/toggle/c-form-toggle/c-form-toggle.html +++ b/src/components/forms/checkbox-radio/toggle/c-form-toggle/c-form-toggle.html @@ -5,8 +5,22 @@ diff --git a/src/components/forms/checkbox-radio/toggle/c-toggle-input/c-toggle-input.html b/src/components/forms/checkbox-radio/toggle/c-toggle-input/c-toggle-input.html index c61530f2..849efd50 100644 --- a/src/components/forms/checkbox-radio/toggle/c-toggle-input/c-toggle-input.html +++ b/src/components/forms/checkbox-radio/toggle/c-toggle-input/c-toggle-input.html @@ -5,8 +5,16 @@