Skip to content
This repository was archived by the owner on Apr 3, 2019. It is now read-only.

6257 use buttons instead of links #7087

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

6257 use buttons instead of links #7087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65a3f8f
refactor(settings): add style to buttons instead of links
Mar 25, 2019
f591254
refactor(settings): add button style instead of links
Mar 25, 2019
6e0ea9b
refactor(settings): add style for buttons instead of links
Apr 2, 2019
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
16 changes: 8 additions & 8 deletions app/scripts/templates/settings/account_recovery/recovery_key.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,27 @@

{{^isIos}}
<div class="button-row save-options">
<a href="#" class="save-option download-option">
<button class="save-option save-option-button download-option">
<div class="graphic graphic-download-option"></div>
<p class="name">{{#t}}Download{{/t}}</p>
</a>
<a href="#" class="save-option copy-option">
</button>
<button class="save-option save-option-button copy-option">
<div class="graphic graphic-copy-option"></div>
<p class="name">{{#t}}Copy{{/t}}</p>
</a>
<a href="#" class="save-option print-option">
</button>
<button class="save-option save-option-button print-option">
<div class="graphic graphic-print-option"></div>
<p class="name">{{#t}}Print{{/t}}</p>
</a>
</button>
</div>
{{/isIos}}

{{#isIos}}
<div class="button-row">
<a href="#" class="save-option copy-option">
<button class="save-option save-option-button copy-option">
<div class="graphic graphic-copy-option"></div>
<p class="name">{{#t}}Copy{{/t}}</p>
</a>
</button>
</div>
{{/isIos}}

Expand Down
4 changes: 2 additions & 2 deletions app/scripts/templates/settings/avatar_change.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@

<nav id="avatar-options">
<input type="file" id="imageLoader" name="imageLoader" accept="image/png, image/jpeg"/>
<a href="#" id="file">{{#t}}Upload{{/t}}</a>
<button class="save-option-button" id="file">{{#t}}Upload{{/t}}</button>
<a href="/settings/avatar/camera" id="camera">{{#t}}Camera{{/t}}</a>
{{^avatarDefault}}
<a href="#" class="remove">{{#t}}Clear{{/t}}</a>
<button class="remove save-option-button">{{#t}}Clear{{/t}}</a>
{{/avatarDefault}}
</nav>

Expand Down
16 changes: 8 additions & 8 deletions app/scripts/templates/settings/recovery_codes.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,27 +36,27 @@

{{^isIos}}
<div class="button-row save-options">
<a href="#" class="save-option download-option">
<button class="save-option save-option-button download-option">
<div class="graphic graphic-download-option"></div>
<p class="name">{{#t}}Download{{/t}}</p>
</a>
<a href="#" class="save-option copy-option">
</button>
<button class="save-option save-option-button copy-option">
<div class="graphic graphic-copy-option"></div>
<p class="name">{{#t}}Copy{{/t}}</p>
</a>
<a href="#" class="save-option print-option">
</button>
<button class="save-option save-option-button print-option">
<div class="graphic graphic-print-option"></div>
<p class="name">{{#t}}Print{{/t}}</p>
</a>
</button>
</div>
{{/isIos}}

{{#isIos}}
<div class="button-row">
<a href="#" class="save-option copy-option">
<button class="save-option save-option-button copy-option">
<div class="graphic graphic-copy-option"></div>
<p class="name">{{#t}}Copy{{/t}}</p>
</a>
</button>
</div>
{{/isIos}}
{{/showRecoveryCodes}}
Expand Down
2 changes: 1 addition & 1 deletion app/styles/modules/_avatar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
margin: 0 -40px -20px -40px;
padding: 25px 20px 20px;

a {
button, a {
background: {
repeat: no-repeat;
size: 48%;
Expand Down
14 changes: 14 additions & 0 deletions app/styles/modules/_button-row.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,20 @@ button {
}
}

.save-option-button {
background: none;
background-color: transparent;
color: $link-color-default;
display: inline-block;
height: 80px;
padding: 10px;
width: 0;
}

.save-option-button:hover {
background-color: transparent;
}

button::-moz-focus-inner {
border: 0;
padding: 0;
Expand Down