From bbe79e0e37b5315515195ab76dc61fcb35c099df Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Fri, 22 Jul 2016 14:03:48 +0800
Subject: [PATCH] MDL-55409 theme_noname: Add better default button styles

Part of MDL-55071
---
 theme/noname/scss/moodle/buttons.scss |  23 +----
 theme/noname/style/build.css          | 131 +++++++++++++++++++++++---
 2 files changed, 118 insertions(+), 36 deletions(-)

diff --git a/theme/noname/scss/moodle/buttons.scss b/theme/noname/scss/moodle/buttons.scss
index 8b3157dc674..6b4dec336ee 100644
--- a/theme/noname/scss/moodle/buttons.scss
+++ b/theme/noname/scss/moodle/buttons.scss
@@ -69,31 +69,10 @@ input[type="button"],
 input[type="submit"],
 input[type="reset"] {
     @extend .btn;
-}
-button,
-input.form-submit,
-input[type="button"],
-input[type="submit"],
-input[type="reset"] {
+    @extend .btn-secondary;
     @extend .btn-lineup;
 }
 
-button {
-    &.yui3-button {
-        &.closebutton {
-            background-position: 0 0;
-            &:hover {
-                background-position: 0 0;
-                // Because we assign the button look to every button tag
-                // above, we need to remove some styles from non-standard
-                // looking buttons. Correct fix, assign .btn class to every
-                // actual button in Moodle so we don't need to carpet bomb the
-                // bare button tag.
-            }
-        }
-    }
-}
-
 input {
     &.fp-btn-choose {
         @extend .btn-sm;
diff --git a/theme/noname/style/build.css b/theme/noname/style/build.css
index cf8210776d7..d291c7a01dd 100644
--- a/theme/noname/style/build.css
+++ b/theme/noname/style/build.css
@@ -2901,35 +2901,143 @@ td.submit input {
     background-color: #0275d8;
     border-color: #0275d8; }
 
-.btn-secondary {
+.btn-secondary, button,
+input.form-submit,
+input[type="button"],
+input[type="submit"],
+input[type="reset"] {
   color: #373a3c;
   background-color: #fff;
   border-color: #ccc; }
-  .btn-secondary:hover {
+  .btn-secondary:hover, button:hover,
+  input.form-submit:hover,
+  input[type="button"]:hover,
+  input[type="submit"]:hover,
+  input[type="reset"]:hover {
     color: #373a3c;
     background-color: #e6e6e6;
     border-color: #adadad; }
-  .btn-secondary:focus, .btn-secondary.focus {
+  .btn-secondary:focus, button:focus,
+  input.form-submit:focus,
+  input[type="button"]:focus,
+  input[type="submit"]:focus,
+  input[type="reset"]:focus, .btn-secondary.focus, button.focus,
+  input.focus.form-submit,
+  input.focus[type="button"],
+  input.focus[type="submit"],
+  input.focus[type="reset"] {
     color: #373a3c;
     background-color: #e6e6e6;
     border-color: #adadad; }
-  .btn-secondary:active, .btn-secondary.active,
-  .open > .btn-secondary.dropdown-toggle {
+  .btn-secondary:active, button:active,
+  input.form-submit:active,
+  input[type="button"]:active,
+  input[type="submit"]:active,
+  input[type="reset"]:active, .btn-secondary.active, button.active,
+  input.active.form-submit,
+  input.active[type="button"],
+  input.active[type="submit"],
+  input.active[type="reset"],
+  .open > .btn-secondary.dropdown-toggle,
+  .open > button.dropdown-toggle,
+  .open >
+  input.dropdown-toggle.form-submit,
+  .open >
+  input.dropdown-toggle[type="button"],
+  .open >
+  input.dropdown-toggle[type="submit"],
+  .open >
+  input.dropdown-toggle[type="reset"] {
     color: #373a3c;
     background-color: #e6e6e6;
     border-color: #adadad;
     background-image: none; }
-    .btn-secondary:active:hover, .btn-secondary:active:focus, .btn-secondary:active.focus, .btn-secondary.active:hover, .btn-secondary.active:focus, .btn-secondary.active.focus,
+    .btn-secondary:active:hover, button:active:hover,
+    input.form-submit:active:hover,
+    input[type="button"]:active:hover,
+    input[type="submit"]:active:hover,
+    input[type="reset"]:active:hover, .btn-secondary:active:focus, button:active:focus,
+    input.form-submit:active:focus,
+    input[type="button"]:active:focus,
+    input[type="submit"]:active:focus,
+    input[type="reset"]:active:focus, .btn-secondary:active.focus, button:active.focus,
+    input.form-submit:active.focus,
+    input[type="button"]:active.focus,
+    input[type="submit"]:active.focus,
+    input[type="reset"]:active.focus, .btn-secondary.active:hover, button.active:hover,
+    input.active.form-submit:hover,
+    input.active[type="button"]:hover,
+    input.active[type="submit"]:hover,
+    input.active[type="reset"]:hover, .btn-secondary.active:focus, button.active:focus,
+    input.active.form-submit:focus,
+    input.active[type="button"]:focus,
+    input.active[type="submit"]:focus,
+    input.active[type="reset"]:focus, .btn-secondary.active.focus, button.active.focus,
+    input.active.focus.form-submit,
+    input.active.focus[type="button"],
+    input.active.focus[type="submit"],
+    input.active.focus[type="reset"],
     .open > .btn-secondary.dropdown-toggle:hover,
+    .open > button.dropdown-toggle:hover,
+    .open >
+    input.dropdown-toggle.form-submit:hover,
+    .open >
+    input.dropdown-toggle[type="button"]:hover,
+    .open >
+    input.dropdown-toggle[type="submit"]:hover,
+    .open >
+    input.dropdown-toggle[type="reset"]:hover,
     .open > .btn-secondary.dropdown-toggle:focus,
-    .open > .btn-secondary.dropdown-toggle.focus {
+    .open > button.dropdown-toggle:focus,
+    .open >
+    input.dropdown-toggle.form-submit:focus,
+    .open >
+    input.dropdown-toggle[type="button"]:focus,
+    .open >
+    input.dropdown-toggle[type="submit"]:focus,
+    .open >
+    input.dropdown-toggle[type="reset"]:focus,
+    .open > .btn-secondary.dropdown-toggle.focus,
+    .open > button.dropdown-toggle.focus,
+    .open >
+    input.dropdown-toggle.focus.form-submit,
+    .open >
+    input.dropdown-toggle.focus[type="button"],
+    .open >
+    input.dropdown-toggle.focus[type="submit"],
+    .open >
+    input.dropdown-toggle.focus[type="reset"] {
       color: #373a3c;
       background-color: #d4d4d4;
       border-color: #8c8c8c; }
-  .btn-secondary.disabled:focus, .btn-secondary.disabled.focus, .btn-secondary:disabled:focus, .btn-secondary:disabled.focus {
+  .btn-secondary.disabled:focus, button.disabled:focus,
+  input.disabled.form-submit:focus,
+  input.disabled[type="button"]:focus,
+  input.disabled[type="submit"]:focus,
+  input.disabled[type="reset"]:focus, .btn-secondary.disabled.focus, button.disabled.focus,
+  input.disabled.focus.form-submit,
+  input.disabled.focus[type="button"],
+  input.disabled.focus[type="submit"],
+  input.disabled.focus[type="reset"], .btn-secondary:disabled:focus, button:disabled:focus,
+  input.form-submit:disabled:focus,
+  input[type="button"]:disabled:focus,
+  input[type="submit"]:disabled:focus,
+  input[type="reset"]:disabled:focus, .btn-secondary:disabled.focus, button:disabled.focus,
+  input.form-submit:disabled.focus,
+  input[type="button"]:disabled.focus,
+  input[type="submit"]:disabled.focus,
+  input[type="reset"]:disabled.focus {
     background-color: #fff;
     border-color: #ccc; }
-  .btn-secondary.disabled:hover, .btn-secondary:disabled:hover {
+  .btn-secondary.disabled:hover, button.disabled:hover,
+  input.disabled.form-submit:hover,
+  input.disabled[type="button"]:hover,
+  input.disabled[type="submit"]:hover,
+  input.disabled[type="reset"]:hover, .btn-secondary:disabled:hover, button:disabled:hover,
+  input.form-submit:disabled:hover,
+  input[type="button"]:disabled:hover,
+  input[type="submit"]:disabled:hover,
+  input[type="reset"]:disabled:hover {
     background-color: #fff;
     border-color: #ccc; }
 
@@ -14814,11 +14922,6 @@ input[type="reset"], #notice .singlebutton + .singlebutton input,
 .submit.buttons input[name="cancel"] {
   margin: 0 0 10px 5px; }
 
-button.yui3-button.closebutton {
-  background-position: 0 0; }
-  button.yui3-button.closebutton:hover {
-    background-position: 0 0; }
-
 .gradetreebox h4 {
   font-size: 1rem; }