Bug 30952: Change default buttons style to look like .btn.btn-default

And do not change the style of these buttons when they are in a table
If we want to make them look like links, we should use btn-link class
instead

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss
index 87ea118..3444acd 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss
@@ -8,11 +8,10 @@ $table-odd-row: #f3f4f4;
 $nav-menu-bullet: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='5' height='5' viewBox='0 0 25 25'%3E%3Cpath fill='%23999' d='M9.66.95h4.56l9.21 11.85-9.21 10.53H9.66l5.08-10.53z'/%3E%3C/svg%3E");
 
 @mixin default-button {
-    background-color: transparent;
-    border-color: #ADADAD #ADADAD #949494;
+    background-color: #fff;
+    border: 1px solid #ccc;
     border-radius: 4px;
-    border: 1px solid #696969;
-    color: #000;
+    color: #333;
     display: inline-block;
     font-size: inherit;
     line-height: 1.42857143;
@@ -21,8 +20,17 @@ $nav-menu-bullet: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/s
     vertical-align: middle;
     white-space: nowrap;
 
+    &:hover {
+        background-color: #e0e0e0;
+    }
+
     &:active {
-        box-shadow: inset 0 0 2px #2222227F;
+        box-shadow: inset 0 3px 5px rgba(0,0,0,0.125);
+    }
+
+    &:active:hover {
+        background-color: #d4d4d4;
+        border-color: #8c8c8c;
     }
 }
 

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss
index d3fadbe..3c6c163 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss
@@ -174,24 +174,6 @@ td {
         white-space: nowrap;
     }
 
-    button, a, input[type="button"]{
-        &.btn-default{
-            color: $green-text-color;
-            padding: .3em;
-            border: none;
-            background-color: transparent;
-            border: none;
-            box-shadow: none;
-            font-size: 100%;
-
-            &:hover, &:active, &:focus, &:active:hover, &:active:focus{
-                background-color: transparent;
-                color: $green-text-color;
-                text-decoration: underline;
-            }
-        }
-    }
-
     &.borderless {
         border: 0 none;
         border-collapse: separate;

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index 19d4967..4e19292 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -451,11 +451,6 @@ div {
 button {
     @include default-button;
 
-    &:active,
-    &:hover {
-        border: 1px inset #999999;
-    }
-
     &:disabled {
         @include disabled-button;
     }
@@ -1959,24 +1954,6 @@ li {
     }
 
     td {
-        button, a {
-            &.btn-default {
-                color: $green-text-color;
-                padding: .3em;
-                border: 0;
-                background-color: transparent;
-                border: 0;
-                box-shadow: none;
-                font-size: 100%;
-
-                &:hover, &:active, &:focus, &:active:hover, &:active:focus {
-                    background-color: transparent;
-                    color: $green-text-color;
-                    text-decoration: underline;
-                }
-            }
-        }
-
         ul {
             li {
                 clear: left;