X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/1ee3e779e4b9b0a92f701a72f21a72c83cb1ce68..refs/pull/5689/head:/resources/sass/_buttons.scss

diff --git a/resources/sass/_buttons.scss b/resources/sass/_buttons.scss
index e3d9e17ca..29deda3a0 100644
--- a/resources/sass/_buttons.scss
+++ b/resources/sass/_buttons.scss
@@ -1,3 +1,6 @@
+@use "mixins";
+@use "vars";
+
 button {
   background-color: transparent;
   border: 0;
@@ -8,13 +11,13 @@ button {
   text-decoration: none;
   font-size: 0.85rem;
   line-height: 1.4em;
-  padding: $-xs*1.3 $-m;
-  margin-top: $-xs;
-  margin-bottom: $-xs;
+  padding: vars.$xs*1.3 vars.$m;
+  margin-top: vars.$xs;
+  margin-bottom: vars.$xs;
   display: inline-block;
   font-weight: 400;
   outline: 0;
-  border-radius: 2px;
+  border-radius: 4px;
   cursor: pointer;
   transition: background-color ease-in-out 120ms,
     filter ease-in-out 120ms,
@@ -22,8 +25,6 @@ button {
   box-shadow: none;
   background-color: var(--color-primary);
   color: #FFF;
-  fill: #FFF;
-  text-transform: uppercase;
   border: 1px solid var(--color-primary);
   vertical-align: top;
   &:hover, &:focus, &:active {
@@ -32,12 +33,12 @@ button {
     color: #FFFFFF;
   }
   &:hover {
-    box-shadow: $bs-light;
+    @include mixins.lightDark(box-shadow, vars.$bs-light, vars.$bs-dark);
     filter: brightness(110%);
   }
   &:focus {
     outline: 1px dotted currentColor;
-    outline-offset: -$-xs;
+    outline-offset: -(vars.$xs);
     box-shadow: none;
     filter: brightness(90%);
   }
@@ -48,13 +49,16 @@ button {
 
 .button.outline {
   background-color: transparent;
-  color: #666;
+  @include mixins.lightDark(color, #666, #AAA);
   fill: currentColor;
-  border: 1px solid #CCC;
+  border: 1px solid;
+  @include mixins.lightDark(border-color, #CCC, #666);
   &:hover, &:focus, &:active {
+    @include mixins.lightDark(color, #444, #BBB);
     border: 1px solid #CCC;
-    box-shadow: none;
+    box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.1);
     background-color: #F2F2F2;
+    @include mixins.lightDark(background-color, #f8f8f8, #444);
     filter: none;
   }
   &:active {
@@ -66,12 +70,12 @@ button {
 }
 
 .button + .button {
-  margin-left: $-s;
+  margin-inline-start: vars.$s;
 }
 
 .button.small {
   font-size: 0.75rem;
-  padding: $-xs*1.2 $-s;
+  padding: vars.$xs*1.2 vars.$s;
 }
 
 .text-button {
@@ -83,8 +87,7 @@ button {
   user-select: none;
   font-size: 0.75rem;
   line-height: 1.4em;
-  color: var(--color-primary);
-  fill: var(--color-primary);
+  color: var(--color-link);
   &:active {
     outline: 0;
   }
@@ -92,33 +95,50 @@ button {
     text-decoration: none;
   }
   &:hover, &:focus {
-    color: var(--color-primary);
-    fill: var(--color-primary);
+    color: var(--color-link);
+    fill: var(--color-link);
   }
 }
+.text-button.hover-underline:hover {
+  text-decoration: underline;
+}
 
 .button.block {
   width: 100%;
-  text-align: left;
+  text-align: start;
   display: block;
 }
 
-.button.icon {
+.button.icon, .icon-button, .text-button.icon {
   .svg-icon {
-    margin-right: 0;
+    margin-inline-end: 0;
   }
 }
 
+.icon-button {
+  text-align: center;
+  border: 1px solid transparent;
+}
+.icon-button:hover {
+  background-color: rgba(0, 0, 0, 0.05);
+  border-radius: 4px;
+  @include mixins.lightDark(border-color, #DDD, #444);
+  cursor: pointer;
+}
+
 .button.svg {
+  display: flex;
+  align-items: center;
+  padding: vars.$s vars.$m;
+  padding-bottom: (vars.$s - 2px);
+  width: 100%;
   svg {
     display: inline-block;
-    position: absolute;
-    left: $-m;
-    top: $-s - 2px;
     width: 24px;
     height: 24px;
+    bottom: auto;
+    margin-inline-end: vars.$m;
   }
-  padding: $-s $-m ($-s - 2px) ($-m*2 + 24px);
 }
 
 .button[disabled] {