Commit 5a54b3b4 authored by Randall Leeds's avatar Randall Leeds

Button consistency

- Use .btn wherever we use .btn-clean

- No border on .btn-clean
parent 03b89e85
...@@ -58,6 +58,9 @@ ...@@ -58,6 +58,9 @@
button { button {
color: $gray-light; color: $gray-light;
font-weight: normal;
padding: 0 .125em;
.annotation:hover & { .annotation:hover & {
color: $link-color; color: $link-color;
} }
......
...@@ -235,13 +235,12 @@ ...@@ -235,13 +235,12 @@
} }
.btn-clean { .btn-clean {
border: none;
&, &:focus, &:hover, &:active, &[disabled], &, &:focus, &:hover, &:active, &[disabled],
&.js-hover, &.js-focus, &.js-active, &.js-disabled { &.js-hover, &.js-focus, &.js-active, &.js-disabled {
@include box-shadow(none); @include box-shadow(none);
padding-left: 0;
padding-right: 0;
background: none; background: none;
border-color: transparent;
} }
&:focus, &:hover, &:active, &.js-hover, &.js-focus, &.js-active { &:focus, &:hover, &:active, &.js-hover, &.js-focus, &.js-active {
......
...@@ -159,12 +159,12 @@ ...@@ -159,12 +159,12 @@
</div> </div>
<div class="annotation-actions" ng-if="!vm.editing && vm.annotation.id"> <div class="annotation-actions" ng-if="!vm.editing && vm.annotation.id">
<button class="small btn-clean" <button class="small btn btn-clean"
ng-click="vm.reply()" ng-click="vm.reply()"
><i class="h-icon-reply btn-icon"></i> ><i class="h-icon-reply btn-icon"></i>
<span class="btn-text">Reply</span></button> <span class="btn-text">Reply</span></button>
<span class="share-dialog-wrapper"> <span class="share-dialog-wrapper">
<button class="small btn-clean" <button class="small btn btn-clean"
ng-click="share($event)" ng-click="share($event)"
><i class="h-icon-link btn-icon"></i> ><i class="h-icon-link btn-icon"></i>
<span class="btn-text">Link</span></button> <span class="btn-text">Link</span></button>
...@@ -176,12 +176,12 @@ ...@@ -176,12 +176,12 @@
<input type="text" value="{{vm.annotationURI}}" readonly> <input type="text" value="{{vm.annotationURI}}" readonly>
</span> </span>
</span> </span>
<button class="small btn-clean" <button class="small btn btn-clean"
ng-show="vm.authorize('update')" ng-show="vm.authorize('update')"
ng-click="vm.edit()" ng-click="vm.edit()"
><i class="h-icon-edit btn-icon"></i> ><i class="h-icon-edit btn-icon"></i>
<span class="btn-text">Edit</span></button> <span class="btn-text">Edit</span></button>
<button class="small btn-clean" <button class="small btn btn-clean"
ng-show="vm.authorize('delete')" ng-show="vm.authorize('delete')"
ng-click="vm.delete()" ng-click="vm.delete()"
><i class="h-icon-delete btn-icon"></i> ><i class="h-icon-delete btn-icon"></i>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment