Changeset 1155:49ba58cbf593 for admin/style/default.css

Timestamp:

04/09/13 09:15:41 (12 years ago)

Author:

Dsls <dsls@…>

Branch:

twig

Parents:

1154:e85c1417b8a4 (diff), 1143:fbf575ae9bda (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:

Merge with default

Files:

• admin/style/default.css (modified) (20 diffs)
• admin/style/default.css (modified) (26 diffs)

admin/style/default.css

@@ -40 +40 @@
      margin-bottom: 0.6em;
 }
+
 h2 {
      color: #666;
@@ -52 +53 @@
      font-size: 1.2em;
 }
+
 p, div.p {
      margin: 0 0 1em 0;
 }
+
 hr {
      height: 1px;
@@ -61 +64 @@
      border-style: solid;
 }
+
 pre, code {
      font: 100% "Andale Mono","Courier New",monospace;
@@ -77 +81 @@
      cursor: help;
 }
+
 
 /* LAYOUT
@@ -431 +436 @@
      color: #666;
 }
+
 #dashboard-items {
      float: left;
@@ -536 +542 @@
      height: 500px;
 }
+
 #add-file-f {
      position: relative;
@@ -619 +626 @@
      display: inline;
 }
+
 #default-favs h3 {
      margin-top: 2em;
      margin-bottom: 1em;
 }
+
 .fav-list {
      list-style-type: none;
@@ -915 +924 @@
      vertical-align: middle;
 }
+
 /* Si quelque chose a besoin d'être caché sauf pour les revues d'écran */
 .hidden {
@@ -949 +959 @@
      overflow: auto;
 }
+
 .grid {
      background: transparent repeat url('grid.png') 0 0;
 }
+
 .line p {
      margin: 0;
@@ -958 +970 @@
      color: #666;
 }
+
 ul.nice {
      margin: 1em 0;
@@ -1006 +1019 @@
      margin-bottom: .5em;
 }
-
 th, td {
      border-width: 0 0 1px 0;
@@ -1021 +1033 @@
      border-width: 0;
 }
+
 table .maximal, table.maximal {
      width: 100%;
@@ -1027 +1040 @@
      width: 1px;
 }
+
 table .nowrap {
      white-space: nowrap;
@@ -1117 +1131 @@
      font-weight: normal;
 }
+
 input, textarea, select {
      background: #f9f9f9;
@@ -1149 +1164 @@
      background: transparent;
 }
+
 label {
      display: block;
@@ -1194 +1210 @@
      resize: vertical;
 }
+
 label.required {
      font-weight: bold;
@@ -1218 +1235 @@
      top: 0;
 }
+
 label .maximal, textarea.maximal, input.maximal {
      width: 100%;
@@ -1232 +1250 @@
      padding-left: 20px;
 }
+
+a#toggle-filters {
+     font-weight: bold;
+     background: url(../images/plus.png) no-repeat 0 0;
+     padding-left: 20px;
+}
+
+a#toggle-filters.opened {
+     background: url(../images/minus.png) no-repeat 0 0;
+}
+
 .constrained {
      margin: 0;
@@ -1351 +1380 @@
      background-color: #2373A8;
 }
-
 /* jQuery Autocomplete plugin */
 .ac_results {
@@ -1384 +1412 @@
      color: white;
 }
+
+form#filters {font-size: 100%; background: #f0f0f0; padding: 1em; border-radius: .5em; border: 1px solid #ddd;}
+form#filters .margintop {padding-top: 1.33em;}
+form#filters ul, form#filters p {list-style-type:none;margin: 0; padding: 0 0 .5em 0; margin-left: 1em;}
+form#filters .col30 {border-left: 1px solid #999;}
+form#filters .col30 h3 {margin-left: 1em;}
+
+p.line, li.line { position: relative; padding: 3px 0 0 28px; margin: 0 0 1em 0;}
+li.line input[type=submit] {position: absolute; left:0;top:0; padding: 0 .1em; margin: 0;}
+li.line input[type=checkbox], li.line input[type=checkbox] {position: absolute; left: 0; top: .2em; padding: 0 .1em; margin: 0;}
+li.line select { margin-right: 2em;}
+li.line label { display: block; width: 8em; float: left;}
+li.line label img {margin-right: 8px;}
+li.line span.or {
+     text-align: right;
+     margin-left: 5em;
+     font-weight: bold;
+}
+p.line label.or + select {margin-left: 2em;}
+li.line { padding: 0 0 0 20px; height: 1em;}
+li.line label {width: auto;}
+
+#available_filters input[type=submit] {padding: 0 .1em; margin-left: .5em;}
+
+div.pagination span, div.pagination a {
+     margin-right: 1em;
+}

admin/style/default.css

@@ -11 +11 @@
 # -- END LICENSE BLOCK -----------------------------------------
 */
+
+/* ------------------------------------------------------------------ html */
 body {
      font: 75%/1.5em Helvetica,Arial,sans-serif;
@@ -151 +153 @@
      height: 2em;
 }
+#info-box1 p {
+     margin: 0;
+     display: inline;
+}
 #info-box1 select {
      width: 15em;
@@ -193 +199 @@
 }
 #content {
-     margin: 1.5em 1.5em 4em 13em;
+     margin: 1.5em 1.5em .5em 13em;
      padding: 1em;
      background: #fff;
-     -webkit-border-radius: .5em;
-     -moz-border-radius: .5em;
      border-radius: .5em;
      border: 1px solid #ddd;
@@ -255 +259 @@
      background: #dfdfdf;
      text-decoration: none;
-     -webkit-border-top-left-radius: .3em;
-     -webkit-border-top-right-radius: .3em;
-     -moz-border-radius-topleft: .3em;
-     -moz-border-radius-topright: .3em;
      border-top-left-radius: .3em;
      border-top-right-radius: .3em;
@@ -282 +282 @@
      float: left;
      margin-top: 1.2em;
-     margin-bottom: 1em;
+     margin-bottom: .5em;
 }
 #main-menu h3 {
@@ -302 +302 @@
      padding: .2em 0 0 32px;
      background-repeat: no-repeat;
-     background-position: 12px .2em;
+     background-position: 12px .4em;
 }
 #main-menu a {
@@ -340 +340 @@
 #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;
-     color: #fff;
+     padding: .75em .75em 0 0;
+     text-align: right;
 }
 #footer p {
@@ -355 +350 @@
 }
 #footer a {
-     color: #f5f5f5;
 }
 #footer p span.credit {
@@ -378 +372 @@
      border: 1px solid #999;
      padding: 1em 1em 0 1em;
-     -moz-border-radius: 4px;
-     -webkit-border-radius: 4px;
      border-radius: 4px;
 }
@@ -513 +505 @@
      border: 1px solid #ccc;
      border-left: 1em solid #E5E3DA;
-     -moz-border-radius: .3em;
-     -webkit-border-radius: .3em;
      border-radius: .3em;
 }
@@ -668 +658 @@
      border: 1px solid #ddd;
      padding: .2em;
-     -moz-border-radius: .5em;
-     -webkit-border-radius: .5em;
      border-radius: .5em;
 }
@@ -764 +752 @@
      border: 1px solid #f3f3f3;
      cursor: pointer;
-     -moz-border-radius: 4px;
-     -webkit-border-radius: 4px;
      border-radius: 4px;
 }
@@ -804 +790 @@
 }
 #help-button {
-     position: absolute;
-     top: 6.2em;
+     position: fixed;
+     top: 3.2em;
      right: 0px;
      cursor: pointer;
@@ -815 +801 @@
      text-transform: capitalize;
      padding: .33em .75em .33em 1em;
-     -moz-border-radius: 1em 0 0 1em;
-     -webkit-border-top-left-radius: 1em;
-     -webkit-border-bottom-left-radius: 1em;
+     border-radius: 1em 0 0 1em;
      color: #444;
 }
@@ -879 +863 @@
 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;
-     -moz-border-radius: 8px;
-     -webkit-border-radius: 8px;
      border-radius: 8px;
 }
@@ -890 +872 @@
 }
 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;
 }
@@ -1015 +997 @@
      right: 0;
 }
+.distrib img {
+     display: block;
+     float: right;
+     margin-top: -1em;
+}
 /* TABLES
 -------------------------------------------------------- */
@@ -1041 +1028 @@
 th {
      text-align: left;
+     border-bottom-color: #666;
 }
 .noborder td, td.noborder, .noborder th, th.noborder {
@@ -1056 +1044 @@
      white-space: nowrap;
      vertical-align: top;
+}
+table.settings, table.prefs {
+     width: 80%;
+}
+table.settings th:first-child, table.prefs th:first-child {
+     width: 20%;
+}
+table.settings th + th, table.prefs th + th {
+     width: 30%;
+}
+table.settings th + th + th, table.prefs th + th + th {
+     width: 10%;
+}
+table.settings th:last-child, table.prefs th:last-child {
+     width: 40%;
 }
 
@@ -1136 +1139 @@
      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;
@@ -1167 +1176 @@
      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;
@@ -1172 +1186 @@
 }
 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;
 }
@@ -1209 +1223 @@
 p.field {
      position: relative;
-
+     
 }
 p.field label {
@@ -1275 +1289 @@
      padding: .1em .5em 0 .5em;
      text-shadow: 0 1px 1px rgba(0,0,0,.3);
-     -webkit-border-radius: .2em;
-     -moz-border-radius: .2em;
      border-radius: .2em;
      margin-bottom: .1em;
@@ -1358 +1370 @@
 }
 a.button.add {
-     -webkit-border-radius: .5em;
-     -moz-border-radius: .5em;
      border-radius: .5em;
      margin-bottom: .1em;     
-     background: #2C8FD1 url(add.png) no-repeat 6px center;
+     background: #2C8FD1 url(../images/add.png) no-repeat 6px center;
      color: #fff;
      padding: .2em 16px .2em 30px;
@@ -1369 +1379 @@
 a.button.add:hover, a.button.add:focus {
      background-color: #2373A8;
+}
+/* jQuery Autocomplete plugin */
+.ac_results {
+     padding: 0px;
+     border: 1px dotted #f90;
+     background-color: white;
+     overflow: hidden;
+     z-index: 99999;
+}
+.ac_results ul {
+     width: 100%;
+     list-style-position: outside;
+     list-style: none;
+     padding: 0;
+     margin: 0;
+}
+.ac_results li {
+     margin: 0px;
+     padding: 2px 5px;
+     cursor: default;
+     display: block;
+     font: menu;
+     font-size: 1em;
+     line-height: 16px;
+     overflow: hidden;
+}
+.ac_loading {
+     background: transparent url('loader.gif') right center no-repeat;
+}
+.ac_over {
+     background-color: #06c;
+     color: white;
 }