Changeset 683:b32debb0479b for admin/style/default.css

Timestamp:

08/13/11 11:44:35 (14 years ago)

Author:

Franck <carnet.franck.paul@…>

Branch:

default

Parents:

682:5c856b1a2962 (diff), 675:7845286256ac (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 themes dans default

File:

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

admin/style/default.css

@@ -78 +78 @@
 }
 
-
 /* LAYOUT
 -------------------------------------------------------- */
-/* prelude */
+/* header */
+#header {
+     background: #575859;
+     height: 3em;
+     position: relative;
+}
 #prelude {
      background: #575859;
-     line-height: 1.8em;
-     margin: 0;
+     line-height: 1.5em;
+     margin: 0;
+     padding: 0 1.7em 0 1em;
      overflow: hidden;
+     position: absolute;
+     top: 1.2em;
+     left: 0;
      }
 #prelude li {
@@ -93 +101 @@
      background:transparent;
      }
-#prelude a {
+#prelude li a {
      color:#fff;
      }
-/* header */
-#header {
-     background: #575859;
-     height: 3em;
-     position: relative;
-}
 #top {
      margin: 0;
@@ -139 +141 @@
 #info-box2 {
      margin: .1em 0 0 0;
-     padding: .5em 1em 4px 0;
+     padding: .5em 1.3em 4px 0;
      color: #fff;
      float: right;
@@ -188 +190 @@
 }
 #content {
-     margin: .5em 1.5em 4em 13em;
+     margin: 1.5em 1.5em 4em 13em;
      padding: 1em;
      background: #fff;
@@ -322 +324 @@
 }
 #favorites-menu a {
-     color: #000;
-     font-weight: normal;
+     color: #333;
 }
 #favorites-menu .active {
@@ -331 +332 @@
 #favorites-menu .active a {
      font-weight: bold;
+     color: #666;
 }
 /* ------------------------------------------------------------------ footer */
@@ -370 +372 @@
      margin-left: .5em;
 }
-#login-screen fieldset {
+#login-screen fieldset, #login-screen .fieldset {
      border: 1px solid #999;
      padding: 1em 1em 0 1em;
@@ -916 +918 @@
 /* -------------------------------------------------------------------- CLASSES COMMUNES */
 
+.no-margin {
+     margin: 0;
+}
+
 /* paragraphe pour bouton Nouveau bidule */
 p.top-add {
@@ -1008 +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;
@@ -1077 +1091 @@
      padding: 0;
 }
-fieldset {
+fieldset, .fieldset {
      display: block;
      margin: 0 0 1em 0;
@@ -1166 +1180 @@
      display: block;
      width: 100%;
+     resize: vertical;
 }
 label.required {
@@ -1193 +1208 @@
 label .maximal, textarea.maximal, input.maximal {
      width: 100%;
+}
+textarea.maximal {
+     resize: vertical;
 }
 
@@ -1202 +1220 @@
      padding-left: 20px;
 }
-fieldset.constrained {
+.constrained {
      margin: 0;
      padding: 0;
@@ -1228 +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;
@@ -1288 +1306 @@
 input[type=submit].delete {
      color: #c00;
+     padding-bottom: .1em;
+}
+#entry-content .delete {
+     margin-left: 1em;
 }
 a.delete:hover,
@@ -1313 +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;
 }