Changeset 1814:53cc8fc5cad5 for admin

Timestamp:

09/01/13 13:19:18 (12 years ago)

Author:

Lepeltier kévin

Branch:

Ticket #1539

Parents:

1813:3ba988cd501f (diff), 1680:3b9bcc9f9d1c (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:

Fusion avec default

Files:

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

admin/style/default.css

@@ -34 +34 @@
 a:hover, a:active, a:focus {
      text-decoration: underline;
+}
+a.hide, a.button.hide, a.submit.hide {
+     display: none;
 }
 a img, a:link img, a:visited img {

admin/style/default.css

@@ -578 +578 @@
      padding: 1em 3em;
      vertical-align: top;
-     border: 1px solid #ccc;
+     border: 1px solid #ddd;
+     border-collapse: collapse;
+}
+.db-item h3 {
+     font-weight: normal;
 }
 #dashboard-items img {
@@ -752 +756 @@
      position: static;
 }
-.media-col-0 {
+/*.media-col-0 {
      clear: left;
 }
@@ -779 +783 @@
      margin: 0 0 0 60px;
      padding: 0;
-}
+}*/
 li.media-action {
      display: block;
@@ -795 +799 @@
 li.media-action input {
      border: none;
+}
+.media-item {
+     position: relative;
+     border: 1px solid #ccc;
+     margin: 1em;
+     padding: 1em;
+     width: 300px;
+     height: 120px;
+     display: inline-block;
+     vertical-align: top;
+}
+div.media-list .media-item {
+}
+a.media-icon {
+     display: block;
+     border-bottom: none;
+     margin: 0 auto; 
+}
+.media-icon img {
+     display: block;
+}
+.media-item ul {
+     display: block;
+     list-style: none;
+     margin: 0;
+     padding: 0;
 }
 /* ------------------------------------------------------------------ preferences */
@@ -1306 +1336 @@
      border-style: solid;
      border-color: #e3e3e3;
-     padding: .3em .5em;
+     padding: .3em 1em .3em .5em;
      vertical-align: top;
 }
@@ -1314 +1344 @@
      border-color: #ccc;
      background: #f3f3ff;
-     padding: .3em .5em;
+     padding: .3em 1em .3em .5em;
      vertical-align: top;
      text-align: left;
@@ -1339 +1369 @@
      white-space: nowrap;
      vertical-align: top;
+}
+table .count {
+     text-align: right;
+     padding-right: 1.5em;
 }
 table.settings, table.prefs {