Changeset 679:7f55e56a6760 for admin/style

Timestamp:

08/13/11 10:47:02 (14 years ago)

Author:

Franck <carnet.franck.paul@…>

Branch:

default

Parents:

678:d07dada561e2 (diff), 677:c046fce80392 (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 branche design dans la branche default

File:

• admin/style/default.css (modified) (11 diffs)

admin/style/default.css

@@ -372 +372 @@
      margin-left: .5em;
 }
-#login-screen fieldset {
+#login-screen fieldset, #login-screen .fieldset {
      border: 1px solid #999;
      padding: 1em 1em 0 1em;
@@ -426 +426 @@
      text-decoration: underline;
 }
-/* test
-#icons img {
-     padding: 8px;
-     background: #e5e5e5;
-     border: 1px solid #d9d9d9;
-     border-radius: 5px;
-     -webkit-box-shadow: 0px 1px 3px #ccc;
-     -moz-box-shadow: 0px 1px 3px #ccc;
-     box-shadow: 0px 1px 3px #ccc;
-}
-#icons a:hover img {
-     background: #bbb;
-}*/
-
 #quick {
      clear: left;
@@ -932 +918 @@
 /* -------------------------------------------------------------------- CLASSES COMMUNES */
 
+.no-margin {
+     margin: 0;
+}
+
 /* paragraphe pour bouton Nouveau bidule */
 p.top-add {
@@ -1024 +1014 @@
      background: #ddd;
 }
+caption {
+     color: #333;
+     font-size: 1.2em;
+     font-weight: bold;
+     text-align: left;
+     margin-bottom: .5em;
+}
+
 th, td {
      border-width: 0 0 1px 0;
@@ -1093 +1091 @@
      padding: 0;
 }
-fieldset {
+fieldset, .fieldset {
      display: block;
      margin: 0 0 1em 0;
@@ -1182 +1180 @@
      display: block;
      width: 100%;
+     resize: vertical;
 }
 label.required {
@@ -1209 +1208 @@
 label .maximal, textarea.maximal, input.maximal {
      width: 100%;
+}
+textarea.maximal {
+     resize: vertical;
 }
 
@@ -1218 +1220 @@
      padding-left: 20px;
 }
-fieldset.constrained {
+.constrained {
      margin: 0;
      padding: 0;
@@ -1244 +1246 @@
      text-align: center;
      text-decoration: none;
-     padding: .1em .5em;
+     padding: .1em .5em 0 .5em;
      text-shadow: 0 1px 1px rgba(0,0,0,.3);
      -webkit-border-radius: .2em;
@@ -1304 +1306 @@
 input[type=submit].delete {
      color: #c00;
+     padding-bottom: .1em;
+}
+#entry-content .delete {
+     margin-left: 1em;
 }
 a.delete:hover,
@@ -1329 +1335 @@
      border-radius: .5em;
      margin-bottom: .1em;     
-     background: #2C8FD1 url(add.png) no-repeat .2em center;
+     background: #2C8FD1 url(add.png) no-repeat 6px center;
      color: #fff;
-     padding: .1em 1em .2em 28px;
+     padding: .2em 16px .2em 30px;
      border: 1px solid #2373A8;
 }