Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UI: Use buttons instead of anchors where appropriate #4939

Merged
merged 4 commits into from
Nov 19, 2018
Merged

UI: Use buttons instead of anchors where appropriate #4939

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e13088
ui: Use buttons instead of anchors where appropriate
Nov 9, 2018
4f3cc5d
ui: Ensure action-group-actions have white bg's in Firefox
Nov 9, 2018
520ff03
ui: Missed a dollar sign for `white` > `$white`
Nov 9, 2018
05cafda
Merge branch 'ui-staging' into feature/ui-use-buttons-over-anchors
johncowen Nov 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions ui-v2/app/styles/components/action-group/layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
Expand Down Expand Up @@ -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 {
Expand Down
8 changes: 6 additions & 2 deletions ui-v2/app/styles/components/action-group/skin.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -26,7 +27,10 @@
%action-group ul::before {
border-color: $color-action;
}
%action-group li a:hover {
%action-group-action {
background-color: $white;
}
%action-group-action:hover {
@extend %frame-blue-800;
}
%action-group ul,
Expand Down
5 changes: 3 additions & 2 deletions ui-v2/app/styles/components/buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion ui-v2/app/styles/core/typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ caption {
}
th,
%breadcrumbs a,
%action-group a,
%action-group-action,
%tab-nav,
%tooltip-bubble {
font-weight: $typo-weight-medium;
Expand Down Expand Up @@ -80,6 +80,7 @@ h2,
font-size: $typo-size-500;
}
body,
%action-group-action,
pre code,
input,
textarea,
Expand Down
8 changes: 4 additions & 4 deletions ui-v2/app/templates/dc/acls/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,20 @@
</li>
{{#if (eq item.ID token.SecretID) }}
<li>
<a data-test-logout onclick={{queue (action confirm 'logout' item) (action change)}}>Stop using</a>
<button type="button" data-test-logout {{action confirm 'logout' item}}>Stop using</button>
</li>
{{else}}

<li>
<a data-test-use onclick={{queue (action confirm 'use' item) (action change)}}>Use</a>
<button type="button" data-test-use {{action confirm 'use' item}}>Use</button>
</li>
{{/if}}
<li>
<a data-test-clone onclick={{action 'sendClone' item}}>Clone</a>
<button type="button" data-test-clone {{action 'sendClone' item}}>Clone</button>
</li>
{{# if (not-eq item.ID 'anonymous') }}
<li>
<a data-test-delete onclick={{action confirm 'delete' item}}>Delete</a>
<button type="button" class="type-delete" data-test-delete {{action confirm 'delete' item}}>Delete</button>
</li>
{{/if}}
</ul>
Expand Down
2 changes: 1 addition & 1 deletion ui-v2/app/templates/dc/acls/policies/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<a data-test-edit href={{href-to 'dc.acls.policies.edit' item.ID}}>Edit</a>
</li>
<li>
<a data-test-delete onclick={{action confirm 'delete' item}}>Delete</a>
<button type="button" class="type-delete" data-test-delete {{action confirm 'delete' item}}>Delete</button>
</li>
{{/if}}
</ul>
Expand Down
8 changes: 4 additions & 4 deletions ui-v2/app/templates/dc/acls/tokens/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,22 +78,22 @@
</li>
{{#if (not (token/is-legacy item))}}
<li>
<a data-test-clone onclick={{action 'sendClone' item}}>Duplicate</a>
<button type="button" data-test-clone {{action 'sendClone' item}}>Duplicate</button>
</li>
{{/if}}
{{#if (eq item.AccessorID token.AccessorID) }}
<li>
<a data-test-logout onclick={{queue (action confirm 'logout' item) (action change)}}>Stop using</a>
<button type="button" data-test-logout {{action confirm 'logout' item}}>Stop using</button>
</li>
{{else}}

<li>
<a data-test-use onclick={{queue (action confirm 'use' item) (action change)}}>Use</a>
<button type="button" data-test-use {{action confirm 'use' item}}>Use</button>
</li>
{{/if}}
{{#unless (token/is-anonymous item) }}
<li>
<a data-test-delete onclick={{action confirm 'delete' item}}>Delete</a>
<button type="button" class="type-delete" data-test-delete {{action confirm 'delete' item}}>Delete</button>
</li>
{{/unless}}
</ul>
Expand Down
2 changes: 1 addition & 1 deletion ui-v2/app/templates/dc/intentions/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<a href={{href-to 'dc.intentions.edit' item.ID}}>Edit</a>
</li>
<li>
<a data-test-delete onclick={{action confirm 'delete' item}}>Delete</a>
<button type="button" class="type-delete" data-test-delete {{action confirm 'delete' item}}>Delete</button>
</li>
</ul>
{{/action-group}}
Expand Down
2 changes: 1 addition & 1 deletion ui-v2/app/templates/dc/kv/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<a data-test-edit href={{href-to (if item.isFolder 'dc.kv.folder' 'dc.kv.edit') item.Key}}>{{if item.isFolder 'View' 'Edit'}}</a>
</li>
<li>
<a data-test-delete onclick={{action confirm 'delete' item}}>Delete</a>
<button type="button" class="type-delete" data-test-delete {{action confirm 'delete' item}}>Delete</button>
</li>
</ul>
{{/action-group}}
Expand Down