Merge branch 'QA_5_2'

Signed-off-by: William Desportes <williamdes@wdes.fr>

5 files changed, 38 insertions, 5 deletions

diff --git a/themes/bootstrap/scss/_codemirror.scss b/themes/bootstrap/scss/_codemirror.scss
index aca7b8b6f0..b5a25f3352 100644
--- a/themes/bootstrap/scss/_codemirror.scss
+++ b/themes/bootstrap/scss/_codemirror.scss
@@ -7,12 +7,14 @@ $textarea-rows: 15;
   border: $card-border-width solid $card-border-color;
 
   @include border-radius($card-border-radius);
+}
 
+// Code mirror default style (do not affect the console style)
+.CodeMirror.cm-s-default {
   // @see: issue #17705
   div.CodeMirror-scroll {
     margin-right: 0;
     padding-bottom: 0;
-    overflow: hidden !important;
   }
 }
 
diff --git a/themes/metro/scss/_codemirror.scss b/themes/metro/scss/_codemirror.scss
index bf2968629d..b2f6af9c1b 100644
--- a/themes/metro/scss/_codemirror.scss
+++ b/themes/metro/scss/_codemirror.scss
@@ -8,12 +8,14 @@ $textarea-rows: 15 !default;
   height: 20rem;
   border: 1px solid #ccc;
   direction: ltr;
+}
 
+// Code mirror default style (do not affect the console style)
+.CodeMirror.cm-s-default {
   // @see: issue #17705
   div.CodeMirror-scroll {
     margin-right: 0;
     padding-bottom: 0;
-    overflow: hidden !important;
   }
 }
 
diff --git a/themes/original/scss/_common.scss b/themes/original/scss/_common.scss
index 194a575d4b..9690c9e7b2 100644
--- a/themes/original/scss/_common.scss
+++ b/themes/original/scss/_common.scss
@@ -436,7 +436,6 @@ div#modalOverlay {
 }
 
 #login_form label {
-  width: 10em;
   font-weight: bolder;
 }
 
@@ -1788,9 +1787,32 @@ input#auto_increment_opt {
   }
 }
 
-input.btn {
+input.btn,
+button.btn {
+  border-color: $btn-border-color;
   color: #333;
   background-color: #d0dce0;
+
+  &:hover,
+  &:focus,
+  &:active {
+    background-color: #8b9aa0;
+    border-color: $btn-border-color;
+  }
+}
+
+button.jsPrintButton {
+  background-color: unset;
+  border-color: unset;
+  border: unset;
+
+  &:hover,
+  &:focus,
+  &:active {
+    background-color: unset;
+    border-color: unset;
+    border: unset;
+  }
 }
 
 body .ui-widget {
diff --git a/themes/original/scss/_variables.scss b/themes/original/scss/_variables.scss
index c51283ac98..35206a0af8 100644
--- a/themes/original/scss/_variables.scss
+++ b/themes/original/scss/_variables.scss
@@ -55,6 +55,7 @@ $bg-two: #d5d5d5;
 
 $body-bg: #f5f5f5;
 $body-color: $main-color;
+$primary: $navi-pointer-background;
 
 // Links
 
@@ -63,6 +64,10 @@ $link-decoration: none;
 $link-hover-color: #f00;
 $link-hover-decoration: underline;
 
+// Buttons
+
+$btn-border-color: black;
+
 // Components
 
 $border-radius: 0;
diff --git a/themes/pmahomme/scss/_codemirror.scss b/themes/pmahomme/scss/_codemirror.scss
index 20da936870..0caa7da603 100644
--- a/themes/pmahomme/scss/_codemirror.scss
+++ b/themes/pmahomme/scss/_codemirror.scss
@@ -4,12 +4,14 @@ $textarea-rows: 15;
 .CodeMirror {
   height: 20rem;
   direction: ltr;
+}
 
+// Code mirror default style (do not affect the console style)
+.CodeMirror.cm-s-default {
   // @see: issue #17705
   div.CodeMirror-scroll {
     margin-right: 0;
     padding-bottom: 0;
-    overflow: hidden !important;
   }
 }