Merge remote-tracking branch 'origin/fix/7608_make_highlight_buttons_styleable' into dev

app/assets/stylesheets/global/_mixins.sass

@@ -68,18 +68,18 @@ $button_gray_font_color: #222222
   border-radius: $radius
 
 @mixin button-highlight-background
-  border: 1px solid #06799F
-  background: #0b8db8
-  background: -moz-linear-gradient(top,  #0b8db8 0%, #06799f 100%)
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#0b8db8), color-stop(100%,#06799f))
-  background: -webkit-linear-gradient(top,  #0b8db8 0%,#06799f 100%)
-  background: -o-linear-gradient(top,  #0b8db8 0%,#06799f 100%)
-  background: -ms-linear-gradient(top,  #0b8db8 0%,#06799f 100%)
-  background: linear-gradient(to bottom,  #0b8db8 0%,#06799f 100%)
+  border: 1px solid $button_highlight_border_color
+  background: $button_highlight_background_color
+  background: $button_highlight_background_gradient_moz
+  background: $button_highlight_background_gradient_webkit
+  background: $button_highlight_background_gradient_webkit_l
+  background: $button_highlight_background_gradient_o
+  background: $button_highlight_background_gradient_ms
+  background: $button_highlight_background_gradient
 
   &:hover
-    border: 1px solid #3493B3
-    background: #3493B3
+    border: 1px solid $button_highlight_background_hover_color
+    background: $button_highlight_border_hover_color
 
 @mixin button-background
   border: 1px solid #ccc
@@ -110,7 +110,7 @@ $button_gray_font_color: #222222
   cursor: pointer
 
 @mixin button-normal-size
-  padding: 4px 10px
+  padding: 4px 10px 2px
 
 @mixin button-big-size
   padding: 7px 16px 5px

app/assets/stylesheets/global/_variables.sass

@@ -146,6 +146,16 @@ $button_font_color:                             #222222 !default
 $button_font_hover_color:                       #222222 !default
 $button_highlight_font_color:                   #FFFFFF !default
 $button_highlight_font_hover_color:             #FFFFFF !default
+$button_highlight_background_color:             #0B8DB8 !default
+$button_highlight_background_gradient_moz:      -moz-linear-gradient(top, #0B8DB8 0%, #06799F 100%) !default
+$button_highlight_background_gradient_webkit:   -webkit-gradient(linear, left top, left bottom, color-stop(0%, #0B8DB8), color-stop(100%, #06799F)) !default
+$button_highlight_background_gradient_webkit_l: -webkit-linear-gradient(top, #0B8DB8 0%, #06799F 100%) !default
+$button_highlight_background_gradient_o:        -o-linear-gradient(top, #0B8DB8 0%, #06799F 100%) !default
+$button_highlight_background_gradient_ms:       -ms-linear-gradient(top, #0B8DB8 0%, #06799F 100%) !default
+$button_highlight_background_gradient:          linear-gradient(to bottom, #0B8DB8 0%, #06799F 100%) !default
+$button_highlight_background_hover_color:       #3493B3 !default
+$button_highlight_border_color:                 #06799F !default
+$button_highlight_border_hover_color:           #3493B3 !default
 $button_border_radius:                          2px !default
 
 $content_box_border:                            1px solid #EAEAEA !default

doc/CHANGELOG.md

@@ -70,6 +70,7 @@ See doc/COPYRIGHT.rdoc for more details.
 * `#7149` Fix: Wrong success message when login is already in use
 * `#7177` Fix: Journal not created in connection with deleted note
 * `#7384` Headlines in wiki table of content are broken
+* `#7608` Make highlight buttons styleable
 * Allowed sending of mails with only cc: or bcc: fields
 * Allow adding attachments to created work packages via planning elements controller
 * Remove unused rmagick dependency