Changeset 1506:c35c1d15e4ab for admin/style

Timestamp:

08/21/13 10:09:47 (12 years ago)

Author:

Dsls

Branch:

twig

Parents:

1498:6d67bea812f3 (diff), 1505:b82fa6dd98c7 (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

File:

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

admin/style/default.css

@@ -814 +814 @@
      display: table-cell;
      vertical-align: top;
-     padding: 1rem 0; 
+     padding: 0; 
      width: 312px;
-     background: #eef;
      border: 1px solid #ccc;
      border-radius: 3px;
 }
-#theme-box div.theme-shot img {
-     display: block;
-     margin: 0 16px;
+#theme-box .theme-shot, 
+#theme-box .theme-info,
+#theme-box .theme-actions {
+     background: #eef;
+     padding: 1em 16px;
+     margin: 0;
+}
+#theme-box .theme-shot img {
+     display: block;
      width: 280px;
      height: 245px;
      border: 1px solid #ccc;
 }
-#theme-box div.theme-info {
-     margin: 1em 16px;
-}
 #theme-box h4 {
      color: #000;
+     background: #eef;
 }
 #theme-box span.theme-version {
@@ -843 +846 @@
      font-weight:bold;
 }
-#theme-box div.theme-actions {
-     padding: 0 16px;
-}
-#themes div.theme-details-js {
+#theme-box .theme-actions {
+     border-bottom: 1px solid #ccc;
+}
+#themes .theme-details-js {
      float: left;
      width: 120px;
@@ -858 +861 @@
      border-radius: 4px;
 }
-#themes div.theme-details-js label {
+#themes .theme-details-js label {
      cursor: pointer;
 }
-#themes div.theme-details-js.theme-selected {
+#themes .theme-details-js.theme-selected {
      background: #ddd;
      border: 1px solid #999;
 }
-#themes div.theme-details-js div.theme-shot img {
+#themes .theme-details-js .theme-shot img {
      width: 120px;
      height: 105px;