Merge branch 'dev' into 'master'

Dev See merge request !2

Merge branch 'dev' into 'master'
Dev See merge request !2
2cf0072a · Michael Danielczok · 3fd6c97f · 88480458 · 2cf0072a · 2cf0072a
Commit 2cf0072a erstellt vor 4 Jahren von Michael Danielczok
--- a/bin/css/buttons.css
+++ b/bin/css/buttons.css
@@ -635,13 +635,6 @@ a.btn.btn-disabled,
    cursor: not-allowed;
 }

-[disabled]:hover,
-:disabled:hover,
-[disabled]:active,
-:disabled:active {
-    opacity: 0.3;
-}
-
 input[type="submit"].btn-outline:disabled:hover,
 input[type="submit"].btn-outline:disabled:active,
 input[type="button"].btn-outline:disabled:hover,
@@ -653,9 +646,8 @@ button.qui-button.btn-outline:disabled:active,
 button.btn-outline:disabled:hover,
 button.btn-outline:disabled:active,
 .btn-outline.btn-disabled:hover,
-.btn-outline.btn-disabled:active
-{
-    background: transparent;
+.btn-outline.btn-disabled:active {
+    opacity: 0.3;
 }

 /****************/

--- a/index.html
+++ b/index.html
@@ -2,7 +2,6 @@
 <html lang="{$Project->getLang()}">
 <head>
    {template_event name="quiqqer::template-cologne::header::begin" Template=$Template}
-    <meta charset="utf-8"/>
    <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1"/>

    {pace}
@@ -75,4 +74,4 @@

 {template_event name="quiqqer::template-cologne::body::end" Template=$Template}
 </body>
-</html>
\ No newline at end of file
+</html>