From 1e1308804824c0ed9245b4b8286377b40126db26 Mon Sep 17 00:00:00 2001 From: John Cowen Date: Fri, 9 Nov 2018 17:34:37 +0000 Subject: [PATCH 1/3] ui: Use buttons instead of anchors where appropriate --- ui-v2/app/styles/components/action-group/layout.scss | 12 ++++++++---- ui-v2/app/styles/components/action-group/skin.scss | 5 +++-- ui-v2/app/styles/components/buttons.scss | 5 +++-- ui-v2/app/styles/core/typography.scss | 3 ++- ui-v2/app/templates/dc/acls/index.hbs | 8 ++++---- ui-v2/app/templates/dc/acls/policies/index.hbs | 2 +- ui-v2/app/templates/dc/acls/tokens/index.hbs | 8 ++++---- ui-v2/app/templates/dc/intentions/index.hbs | 2 +- ui-v2/app/templates/dc/kv/index.hbs | 2 +- 9 files changed, 27 insertions(+), 20 deletions(-) diff --git a/ui-v2/app/styles/components/action-group/layout.scss b/ui-v2/app/styles/components/action-group/layout.scss index 06a47fb2abf8..b5f054932152 100644 --- a/ui-v2/app/styles/components/action-group/layout.scss +++ b/ui-v2/app/styles/components/action-group/layout.scss @@ -1,6 +1,14 @@ %action-group label span { display: none; } +%action-group-action { + width: 170px; + padding: 10px 10px; + text-align: left; +} +%action-group li > * { + @extend %action-group-action; +} %action-group::before { margin-left: -1px; } @@ -59,10 +67,6 @@ position: relative; z-index: 1; } -%action-group li a { - width: 170px; - padding: 10px 10px; -} %action-group input[type='radio'], %action-group input[type='radio'] ~ ul, %action-group input[type='radio'] ~ .with-confirmation > ul { diff --git a/ui-v2/app/styles/components/action-group/skin.scss b/ui-v2/app/styles/components/action-group/skin.scss index 73e72a2a9cfe..ec9c9993c5a1 100644 --- a/ui-v2/app/styles/components/action-group/skin.scss +++ b/ui-v2/app/styles/components/action-group/skin.scss @@ -5,7 +5,8 @@ /* frame-gray */ background-color: $gray-050; } -%action-group label { +%action-group label, +%action-group-action { cursor: pointer; } %action-group label::after, @@ -26,7 +27,7 @@ %action-group ul::before { border-color: $color-action; } -%action-group li a:hover { +%action-group-action:hover { @extend %frame-blue-800; } %action-group ul, diff --git a/ui-v2/app/styles/components/buttons.scss b/ui-v2/app/styles/components/buttons.scss index 977dc0897e77..9047a583dbbc 100644 --- a/ui-v2/app/styles/components/buttons.scss +++ b/ui-v2/app/styles/components/buttons.scss @@ -3,12 +3,13 @@ button[type='submit'], a.type-create { @extend %primary-button; } +// the :not(li)'s here avoid styling action-group buttons button[type='reset'], -button[type='button']:not(.copy-btn):not(.type-delete), +:not(li) > button[type='button']:not(.copy-btn):not(.type-delete), html.template-error div > a { @extend %secondary-button; } -button.type-delete { +:not(li) > button.type-delete { @extend %dangerous-button; } button.copy-btn { diff --git a/ui-v2/app/styles/core/typography.scss b/ui-v2/app/styles/core/typography.scss index 4107ebf9f223..2331c49c901c 100644 --- a/ui-v2/app/styles/core/typography.scss +++ b/ui-v2/app/styles/core/typography.scss @@ -52,7 +52,7 @@ caption { } th, %breadcrumbs a, -%action-group a, +%action-group-action, %tab-nav, %tooltip-bubble { font-weight: $typo-weight-medium; @@ -80,6 +80,7 @@ h2, font-size: $typo-size-500; } body, +%action-group-action, pre code, input, textarea, diff --git a/ui-v2/app/templates/dc/acls/index.hbs b/ui-v2/app/templates/dc/acls/index.hbs index 52cc48f51a01..045c772349ef 100644 --- a/ui-v2/app/templates/dc/acls/index.hbs +++ b/ui-v2/app/templates/dc/acls/index.hbs @@ -47,20 +47,20 @@ {{#if (eq item.ID token.SecretID) }}
  • - Stop using +
    • {{else}}
  • - Use +
    • {{/if}}
  • - Clone +
    • {{# if (not-eq item.ID 'anonymous') }}
  • - Delete +
    • {{/if}} diff --git a/ui-v2/app/templates/dc/acls/policies/index.hbs b/ui-v2/app/templates/dc/acls/policies/index.hbs index 0f5aac48245a..e5bf59aca125 100644 --- a/ui-v2/app/templates/dc/acls/policies/index.hbs +++ b/ui-v2/app/templates/dc/acls/policies/index.hbs @@ -61,7 +61,7 @@ Edit
  • - Delete +
    • {{/if}} diff --git a/ui-v2/app/templates/dc/acls/tokens/index.hbs b/ui-v2/app/templates/dc/acls/tokens/index.hbs index 06057ab1a75a..9b5ecd194535 100644 --- a/ui-v2/app/templates/dc/acls/tokens/index.hbs +++ b/ui-v2/app/templates/dc/acls/tokens/index.hbs @@ -78,22 +78,22 @@ {{#if (not (token/is-legacy item))}}
  • - Duplicate +
    • {{/if}} {{#if (eq item.AccessorID token.AccessorID) }}
  • - Stop using +
    • {{else}}
  • - Use +
    • {{/if}} {{#unless (token/is-anonymous item) }}
  • - Delete +
    • {{/unless}} diff --git a/ui-v2/app/templates/dc/intentions/index.hbs b/ui-v2/app/templates/dc/intentions/index.hbs index ed103d92d2c2..db4540389f39 100644 --- a/ui-v2/app/templates/dc/intentions/index.hbs +++ b/ui-v2/app/templates/dc/intentions/index.hbs @@ -63,7 +63,7 @@ Edit
  • - Delete +
    • {{/action-group}} diff --git a/ui-v2/app/templates/dc/kv/index.hbs b/ui-v2/app/templates/dc/kv/index.hbs index a9d10cd824a1..50aca95063c8 100644 --- a/ui-v2/app/templates/dc/kv/index.hbs +++ b/ui-v2/app/templates/dc/kv/index.hbs @@ -59,7 +59,7 @@ {{if item.isFolder 'View' 'Edit'}}
  • - Delete +
    • {{/action-group}} From 4f3cc5dadd82fcc2460fe998e6588ad876fa4fcd Mon Sep 17 00:00:00 2001 From: John Cowen Date: Fri, 9 Nov 2018 18:32:54 +0000 Subject: [PATCH 2/3] ui: Ensure action-group-actions have white bg's in Firefox --- ui-v2/app/styles/components/action-group/skin.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ui-v2/app/styles/components/action-group/skin.scss b/ui-v2/app/styles/components/action-group/skin.scss index ec9c9993c5a1..a50260dcb773 100644 --- a/ui-v2/app/styles/components/action-group/skin.scss +++ b/ui-v2/app/styles/components/action-group/skin.scss @@ -27,6 +27,9 @@ %action-group ul::before { border-color: $color-action; } +%action-group-action { + background-color: white; +} %action-group-action:hover { @extend %frame-blue-800; } From 520ff032d2f1ce0d04bbe57d578ced56a120388a Mon Sep 17 00:00:00 2001 From: John Cowen Date: Fri, 9 Nov 2018 18:48:11 +0000 Subject: [PATCH 3/3] ui: Missed a dollar sign for `white` > `$white` --- ui-v2/app/styles/components/action-group/skin.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui-v2/app/styles/components/action-group/skin.scss b/ui-v2/app/styles/components/action-group/skin.scss index a50260dcb773..7ef8d43773e4 100644 --- a/ui-v2/app/styles/components/action-group/skin.scss +++ b/ui-v2/app/styles/components/action-group/skin.scss @@ -28,7 +28,7 @@ border-color: $color-action; } %action-group-action { - background-color: white; + background-color: $white; } %action-group-action:hover { @extend %frame-blue-800;