Changeset 1011:c8f32ed1ca5c for admin/style

Timestamp:

11/14/12 19:27:33 (13 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

1004:1c1f8b410a12 (diff), 1009:867afbf9f1be (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Remerge default branche and lasts commits

Location:

admin/style

Files:

• default.css (modified) (17 diffs)
• install.css (modified) (5 diffs)

admin/style/default.css

@@ -148 +148 @@
      height: 2em;
 }
+#info-box1 p {
+     margin: 0;
+     display: inline;
+}
 #info-box1 select {
      width: 15em;
@@ -195 +199 @@
      -webkit-border-radius: .5em;
      -moz-border-radius: .5em;
+     -o-border-radius: .5em;
      border-radius: .5em;
      border: 1px solid #ddd;
@@ -279 +284 @@
      float: left;
      margin-top: 1.2em;
-     margin-bottom: 1em;
+     margin-bottom: 3em;
 }
 #main-menu h3 {
@@ -337 +342 @@
 #footer {
      clear: both;
-     padding: .75em 2em;
-     margin: 6em 15px .5em 15px;
-     -webkit-border-radius: .3em;
-     -moz-border-radius: .3em;
-     border-radius: .3em;
-     background: #575859 url(dc_logo_small.png) no-repeat right bottom;
+     padding: .75em 0;
+     background: #575859 url(dc_logo_small.png) no-repeat 8px bottom;
      color: #fff;
 }
@@ -375 +376 @@
      border: 1px solid #999;
      padding: 1em 1em 0 1em;
+     -o-border-radius: 4px;
      -moz-border-radius: 4px;
      -webkit-border-radius: 4px;
@@ -509 +511 @@
      border: 1px solid #ccc;
      border-left: 1em solid #E5E3DA;
+     -o-border-radius: .3em;
      -moz-border-radius: .3em;
      -webkit-border-radius: .3em;
@@ -661 +664 @@
      border: 1px solid #ddd;
      padding: .2em;
+     -o-border-radius: .5em;
      -moz-border-radius: .5em;
      -webkit-border-radius: .5em;
@@ -757 +761 @@
      border: 1px solid #f3f3f3;
      cursor: pointer;
+     -o-border-radius: 4px;
      -moz-border-radius: 4px;
      -webkit-border-radius: 4px;
@@ -797 +802 @@
 }
 #help-button {
-     position: absolute;
-     top: 6.2em;
+     position: fixed;
+     top: 3.2em;
      right: 0px;
      cursor: pointer;
@@ -873 +878 @@
 div.message, p.message, 
 div.static-msg, p.static-msg {
-     padding: 0.5em 0.5em 0.5em 40px;
+     padding: 0.5em 0.5em 0.5em 48px;
      margin-bottom: 1em;
+     -o-border-radius: 8px;
      -moz-border-radius: 8px;
      -webkit-border-radius: 8px;
@@ -884 +890 @@
 }
 div.error, p.error {
-     background: #e5bfbf url(msg-error.png) no-repeat 5px 5px;
-     color: #600;
+     background: #ffdec8 url(msg-error.png) no-repeat .7em .7em;
+     color: #000;
 }
 div.message, p.message, 
 div.static-msg, p.static-msg {
-     background: #666 url(msg-std.png) no-repeat 5px 5px;
+     background: #666 url(msg-std.png) no-repeat .7em .7em;
      color: #fff;
 }
@@ -1005 +1011 @@
      right: 0;
 }
+.distrib img {
+     display: block;
+     float: right;
+     margin-top: -1em;
+}
 /* TABLES
 -------------------------------------------------------- */
@@ -1140 +1151 @@
      border-color: #000 #ccc #ccc #000;
 }
+input.invalid, textarea.invalid, select.invalid {
+     border: 1px solid red;
+     background: #fff; 
+     color: red;
+     box-shadow: 0 0 0 1px rgba(218, 62, 90, 0.3)
+}
 input, textarea, select, option {
      font: 1em "DejaVu Sans","Lucida Grande","Lucida Sans Unicode",Arial,sans-serif;
@@ -1170 +1187 @@
      color: #666;
 }
+span.form-note {
+     font-style:italic;
+     font-weight: normal;
+     color: #666;
+}
 p.form-note.warn, p.form-note.info, p.warning {
      font-style: normal;
@@ -1175 +1197 @@
 }
 p.form-note.warn, p.warning {
-     background: #ffd url(warning.png) no-repeat .2em .2em;
+     background: #ffd url(warning.png) no-repeat .3em .3em;
      border: 1px solid #f0c020;
 }
 p.form-note.info {
-     background: #eef url(info.png) no-repeat .2em .2em;
+     background: #eef url(info.png) no-repeat .3em .2em;
      border: 1px solid #99f;
 }
@@ -1267 +1289 @@
      -webkit-border-radius: .2em;
      -moz-border-radius: .2em;
+     -o-border-radius: .2em;
      border-radius: .2em;
      margin-bottom: .1em;
@@ -1350 +1373 @@
      -webkit-border-radius: .5em;
      -moz-border-radius: .5em;
+     -o-border-radius: .5em;
      border-radius: .5em;
      margin-bottom: .1em;     

admin/style/install.css

@@ -19 +19 @@
      padding:1em 2em;
      border:1px #ccc solid;
+     -o-border-radius:8px;
      -moz-border-radius:8px;
      -webkit-border-radius:8px;
@@ -48 +49 @@
      padding:10px 10px 10px 60px;
      border-radius:8px;
+     -o-border-radius:8px;
      -moz-border-radius:8px;
      -webkit-border-radius:8px;
@@ -70 +72 @@
      margin-bottom: 1em;
      border-radius: 8px;
+     -o-border-radius: 8px;
      -moz-border-radius: 8px;
      -webkit-border-radius: 8px;
@@ -132 +135 @@
      padding: 0 10px;
      border-radius: 2px;
+     -o-border-radius: 2px;
      -moz-border-radius: 2px;
      -webkit-border-radius: 2px;
@@ -147 +151 @@
      -webkit-border-radius: .2em;
      -moz-border-radius: .2em;
+     -o-border-radius: .2em;
      border-radius: .2em;
      margin-bottom: .1em;