made form elements more generic, added some style.ini values

4 files changed, 70 insertions, 66 deletions

diff --git a/css/_fileuploader.css b/css/_fileuploader.css
index 0b7cc8b42..42004de28 100644
--- a/css/_fileuploader.css
+++ b/css/_fileuploader.css
@@ -17,14 +17,10 @@
 
 .qq-upload-button {
     display: inline-block;
-    border: 1px solid __border__;
-    color: __text__;
-    background:  __background__ url(images/buttonshadow.png) repeat-x bottom;
     text-decoration: none;
     font-size: 100%;
     cursor: pointer;
     margin: 1px 1px 5px;
-    padding: 0.125em 0.4em;
 }
 
 * html .qq-upload-button,
diff --git a/css/basic.css b/css/basic.css
index 1ceddc05d..2ad21b6ca 100755
--- a/css/basic.css
+++ b/css/basic.css
@@ -13,18 +13,14 @@ html {
     overflow-y: scroll;
 }
 html, body {
-    /* @todo: style.ini */
+    /* @todo: style.ini for #fbfaf9?!? */
     background-color: #fbfaf9;
     color: __text__;
-    background-image: -moz-linear-gradient(   top, #ddd 0%, #eee 1em, #fbfaf9 4em);
-    /* do we want to support old browsers?
-    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ddd), color-stop(1em,#eee), color-stop(4em,#fbfaf9));
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ddd', endColorstr='#fbfaf9',GradientType=0 );
-    */
-    background-image: -webkit-linear-gradient(top, #ddd 0%, #eee 1em, #fbfaf9 4em);
-    background-image: -o-linear-gradient(     top, #ddd 0%, #eee 1em, #fbfaf9 4em);
-    background-image: -ms-linear-gradient(    top, #ddd 0%, #eee 1em, #fbfaf9 4em);
-    background-image: linear-gradient(        top, #ddd 0%, #eee 1em, #fbfaf9 4em);
+    background-image: -moz-linear-gradient(   top, __background_neu__ 0%, __background_alt__ 1em, #fbfaf9 4em);
+    background-image: -webkit-linear-gradient(top, __background_neu__ 0%, __background_alt__ 1em, #fbfaf9 4em);
+    background-image: -o-linear-gradient(     top, __background_neu__ 0%, __background_alt__ 1em, #fbfaf9 4em);
+    background-image: -ms-linear-gradient(    top, __background_neu__ 0%, __background_alt__ 1em, #fbfaf9 4em);
+    background-image: linear-gradient(        top, __background_neu__ 0%, __background_alt__ 1em, #fbfaf9 4em);
     background-size: 1px 10em;
     background-repeat: repeat-x;
     margin: 0;
@@ -174,8 +170,8 @@ img {
 }
 
 hr {
-    border-top: solid #ccc;
-    border-bottom: solid #fff;
+    border-top: solid __border__;
+    border-bottom: solid __background__;
     border-width: 1px 0;
     height: 0;
     width: 100%;
@@ -239,66 +235,75 @@ label {
     vertical-align: middle;
     cursor: pointer;
 }
-input, textarea, button,
-select, optgroup, option {
+
+input,
+textarea,
+button,
+select,
+optgroup,
+option {
     font: inherit;
     color: inherit;
-    /* background-color destroys button look */
     line-height: 1;
     margin: 0;
     vertical-align: middle;
 }
-input[type=text], input[type=password], textarea {
-    padding: .1em;
-}
-input[type=radio], input[type=checkbox], input.check {
+
+input::-moz-focus-inner,
+button::-moz-focus-inner {
+    border: 0;
     padding: 0;
 }
-input[type=submit], input.button, button {
-    cursor: pointer;
-}
-input[disabled], button[disabled],
-input[readonly], button[readonly] {
+input[disabled],
+button[disabled],
+input[readonly],
+button[readonly] {
     cursor: auto;
 }
-optgroup { font-style: italic; font-weight: bold; }
-option   { font-style: normal; font-weight: normal; }
+optgroup {
+    font-style: italic;
+    font-weight: bold;
+}
+option {
+    font-style: normal;
+    font-weight: normal;
+}
 
-/* @todo: either make input.edit and buttons more generic or put into design.css */
-.dokuwiki input.edit {
+input,
+textarea,
+select {
     border: 1px solid __border__;
-    padding: 0.35em .1em;
     -moz-box-shadow: inset 0 0 1px __background_alt__;
     -webkit-box-shadow: inset 0 0 1px __background_alt__;
     box-shadow: inset 0 0 1px __background_alt__;
     border-radius: 2px;
-    vertical-align: middle;
 }
-.dokuwiki input.button,
-.dokuwiki button.button,
-.dokuwiki div.toolbar button.toolbutton {
-    /* @todo: make style.ini colours any sense here? */
-    vertical-align: middle;
-    color: inherit;
+input[type=radio],
+input[type=checkbox] {
+    padding: 0;
+    border-width: 0;
+}
+
+input[type=submit],
+input.button,
+a.button,
+button,
+.qq-upload-button {
+    /* no style.ini colours on purpose */
+    color: #333;
     background-color: #eee;
-    background: -moz-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(30%,#f4f4f4), color-stop(99%,#eeeeee), color-stop(99%,#cccccc));
-    background: -webkit-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%);
-    background: -o-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%);
-    background: -ms-linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%);
-    /*
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#cccccc',GradientType=0 );
-    */
-    background: linear-gradient(top, #ffffff 0%,#f4f4f4 30%,#eeeeee 99%,#cccccc 99%);
+    /* @todo: #ccc on purpose? */
+    background: -moz-linear-gradient(   top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
+    background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
+    background: -o-linear-gradient(     top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
+    background: -ms-linear-gradient(    top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
+    background: linear-gradient(        top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
     border: 1px solid #ccc;
     border-radius: 2px;
-}
-.dokuwiki textarea.edit {
-    font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace;
+    padding: .1em .5em;
+    cursor: pointer;
 }
 
-
-
 /*____________ general classes ____________*/
 
 div.clearer {
@@ -306,13 +311,3 @@ div.clearer {
     font-size: 1px;
     visibility: hidden;
 }
-
-.a11y {
-    position: absolute;
-    left: -9000px;
-    top: -4000px;
-    width: 0;
-    height: 0;
-    overflow: hidden;
-    display: inline;
-}
diff --git a/css/content.css b/css/content.css
index 64adda388..376c6f6dd 100755
--- a/css/content.css
+++ b/css/content.css
@@ -86,8 +86,11 @@
 .dokuwiki dl.code dt,
 .dokuwiki dl.file dt {
     background-color: __background_alt__;
-    /* @todo: add gradients for other browsers */
+    background: -moz-linear-gradient(   top, __background__ 0%, __background_alt__ 100%);
     background: -webkit-linear-gradient(top, __background__ 0%, __background_alt__ 100%);
+    background: -o-linear-gradient(     top, __background__ 0%, __background_alt__ 100%);
+    background: -ms-linear-gradient(    top, __background__ 0%, __background_alt__ 100%);
+    background: linear-gradient(        top, __background__ 0%, __background_alt__ 100%);
     color: inherit;
     border: 1px solid __border__;
     border-bottom-color: __background_alt__;
diff --git a/css/design.css b/css/design.css
index 4660e4540..9e79ccd80 100755
--- a/css/design.css
+++ b/css/design.css
@@ -254,7 +254,7 @@
 }
 #dokuwiki__sitetools form.search input.edit {
     width: 16em;
-    padding-right: 22px;
+    padding: .35em 22px .35em .1em;
 }
 #dokuwiki__sitetools form.search input.button {
     background: transparent url(images/search.png) no-repeat 0 0;
@@ -414,6 +414,16 @@
     border-bottom-right-radius: 4px;
 }
 
+.dokuwiki textarea.edit {
+    font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace;
+}
+
+
+#acl__tree li {
+    margin: 0;
+}
+
+
 /*____________ JS popup ____________*/
 
 .JSpopup {