Skip to content

Commit

Permalink
revert merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
ericrosenthal committed Feb 24, 2020
1 parent cbd3ee6 commit c3f86e1
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
19 changes: 19 additions & 0 deletions app/theme/client/imports/forms/button.css
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@
border: 0;
border-color: var(--button-cancel-color);
background-color: var(--button-cancel-color);

.rc-button-icon {
display: none;
visibility: hidden;
}
}

&--cancel.rc-button--outline {
Expand Down Expand Up @@ -222,4 +227,18 @@
.rc-button--full {
width: 100%;
}

.rc-button--cancel {
padding: 0 1rem;

.rc-button-icon {
display: block;
visibility: visible;
}

.rc-button-text {
display: none;
visibility: hidden;
}
}
}
7 changes: 6 additions & 1 deletion app/ui-account/client/accountPreferences.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,12 @@ <h1>{{_ "Privacy"}}</h1>
{{/each}}
</select>
</div>
<button class="rc-button rc-button--cancel setting-action js-dont-ask-remove">{{_ "Remove"}}</button>
<button text="{{_ 'Remove'}}" class="rc-button rc-button--cancel setting-action js-dont-ask-remove">
<!-- will be displayed only if width < 780px -->
<i class="rc-button-icon icon-ccw color-error-contrast"></i>
<!-- will be displayed if width >= 780px -->
<div class="rc-button-text">{{_ "Remove"}}</div>
</button>
</div>
</div>
</div>
Expand Down

0 comments on commit c3f86e1

Please sign in to comment.