Changeset 450:d6b8e3e74f10 for admin/style

Timestamp:

06/29/11 13:45:04 (14 years ago)

Author:

Tomtom33 <tbouron@…>

Branch:

formfilters

Parents:

449:b564ccaefd86 (diff), 438:5197b0c2826f (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

Files:

• admin/style/default.css (modified) (1 diff)
• admin/style/default.css (modified) (1 diff)

admin/style/default.css

@@ -1021 +1021 @@
      background: transparent url(drag.png) no-repeat 0 50%;
      padding-left: 15px;
+}
+
+div.pagination {
+     padding-bottom: 1em;
+}
+div.pagination a {
+     padding: 0 0.3em 0 0.3em;
+}
+div.pagination span{
+     margin-left: 2em;
 }
 

admin/style/default.css

@@ -1329 +1329 @@
 form#filters .col30 h3 {margin-left: 1em;}
 p.line, li.line { position: relative; padding: 3px 0 0 28px; margin: 0 0 1em 0;}
-p.line input[type=submit] {position: absolute; left:0;top:0; padding: 0 .1em; margin: 0;}
-p.line input[type=checkbox], li.line input[type=checkbox] {position: absolute; left: 0; top: .2em; padding: 0 .1em; margin: 0;}
-p.line select { margin-right: 2em;}
-p.line label { display: block; width: 8em; float: left;}
-p.line label img {margin-right: 8px;}
-p.line label.or {
+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;