Changeset 2240:2553775ae2fe for admin/style

Timestamp:

10/04/13 09:19:33 (12 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

dcRepo

Parents:

2237:911f18a5b287 (diff), 2239:cd7100fa57db (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 from default

Files:

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

admin/style/default.css

@@ -1202 +1202 @@
      padding-right: 34px;
      }
+.line img {
+     vertical-align: middle;
+     }
 tr.line img.expand, th img.expand {
      margin-right: 6px;
@@ -1286 +1289 @@
 #filters-form {
      border: 1px dashed #999;
-     border-radius: .5em;
+     border-radius: .3em;
      margin-bottom: 2em;
      padding: .5em 1em 0;
@@ -1315 +1318 @@
 #filters-form select {
      width: 14em;
+     vertical-align: middle;
      }
 #filters-form h4 {
@@ -1447 +1451 @@
           text-align: center;
           }
+        .no-js .outgoing img {
+                display: none;
+        }
      #dashboard-boxes .box {
           padding: 10px;
@@ -1525 +1532 @@
                li.user_super, li.user_admin {
                     margin-left: 0;
-                    padding-left: 1em;
+                    padding-left: 20px;
                     list-style: none;
-                    background: transparent url(../images/superadmin.png) no-repeat -2px 2px;
+                    background: transparent url(../images/superadmin.png) no-repeat 0 .3em;
                     }
                li.user_admin {

admin/style/default.css

@@ -158 +158 @@
      -moz-box-sizing: border-box; 
      -webkit-box-sizing: border-box; 
-     box-sizing: border-box;  
+     box-sizing: border-box;
+     text-align: left;
      }
 .two-boxes {
@@ -1108 +1109 @@
           }
 #help-button {
-     background: transparent url(../images/page_help.png) no-repeat 6px center;
+     background: transparent url(help-mini.png) no-repeat 6px center;
      position: absolute;
      top: 0;
@@ -1539 +1540 @@
                     }
 /* ------------------------------------------------------------------- blog_theme.php */
-#themes {
-     margin: 0;
-     width: 100%;
-     padding: 0;
-     }
-     .theme-details {
-          border-top: 1px solid #ccc;
-          padding: 12px;
-          display: inline-block;
-          vertical-align: top;
-          width: 284px;
-          }
-          .theme-details.current-theme {
-               background: #eef;
-               }
-          .theme-details:hover {
-               background: #f3f3f3;
-               }
-          .theme-shot img {
-               display: block;
-               border: 1px solid #ccc;
-               margin-bottom: 1.5em;
-               }
-          span.theme-desc {
-               display: block;
-               }
-          span.theme-version {
-               color: #676e78;
-               }
-          .theme-css {
-               display: block;
-               }
-     #themes-actions {
-          border-bottom: 1px solid #999;
-          margin-bottom: 3em;
-          }
-/* Themes list, JS version */
-#themes-wrapper {
-     display: table;
-     }
-     #themes-wrapper #themes {
-          display: table-cell;
-          vertical-align: top;
-          padding-left: 1em;
-          }
-     #theme-box {
-          display: table-cell;
-          vertical-align: top;
-          padding: 0;
-          width: 312px;
-          border: 1px solid #ccc;
-          border-radius: 3px;
-          }
-          #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 h4 {
-               color: #000;
-               background: #eef;
-               }
-          #theme-box span.theme-version {
-               color: #676e78;
-               }
-          #theme-box span.theme-parent-ok {
-               color: #676e78;
-               }
-          #theme-box span.theme-parent-missing {
-               color: #c00;
-               font-weight:bold;
-               }
-          #theme-box .theme-actions {
-               border-bottom: 1px solid #ccc;
-               }
-#themes .theme-details-js {
+.box.theme {
+     margin: .5em;
+     padding: 1em 1em .5em 1em;
+     border: 1px solid #ccc;
+     }
+#theme-new .box.theme {
+     width: 280px;
+     }
+.module-name {
+     margin-bottom: .5em;
+     }
+.module-sshot img {
+     border: 1px solid #ddd;
+     padding: .5em;
+     background: #f7f7f7;
+     box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.2);
+     }
+.module-actions {
+     margin-top: 1em;
+     }
+.bloc-toggler {
+     text-align: right;
+     }
+.box.current-theme {
+     width: 652px;
+     margin: .5em;
+     padding: 1em 0 .5em 1em;
+     background: #FCFDFD;
+     border: 1px solid #9AC123;
+     -webkit-border-radius: .5em;
+     border-radius: .5em;
+     min-height: 330px;  
+     }
+.current-theme .module-sshot img {
      float: left;
-     width: 120px;
-     height: 150px;
-     margin: 0 12px 24px;
-     padding: 12px 12px 0;
-     text-align: center;
-     background: #f3f3f3;
-     border: 1px solid #ddd;
-     cursor: pointer;
-     border-radius: 4px;
-     }
-     #themes .theme-details-js label {
-          cursor: pointer;
-          }
-     #themes .theme-details-js.theme-selected {
-          background: #e7e7e7;
-          border: 1px solid #999;
-          }
-     #themes .theme-details-js .theme-shot img {
-          width: 120px;
-          height: 105px;
-          border: 1px solid #fff;
-          }
-     #themes a:focus div, #themes a:hover div,
-     #themes a:focus div.current-theme, #themes a:hover div.current-theme {
-          background: #bee74b;
-          }
+     margin-right: 2em;
+     margin-bottom: 1em;
+     }
+.current-theme .module-name {
+     color: #D33800;
+     margin-bottom: 1em;
+     font-size: 1.33em;
+     }
 /* ------------------------------------------------------------------ categories.php */
 #categories {
@@ -1954 +1887 @@
           }
 /* -------------------------------------------------------------------- plugins.php */
-#plugins td.action {
+.modules td.module-actions, .modules td.module-icon {
      vertical-align: middle;
      }
-.distrib img {
+.modules td.module-icon img:last-child {
+     width: 16px;
+     height: 16px;
+     }
+.modules td.module-icon img.expand {
+     margin-bottom: 3px;
+     }
+.modules td.module-distrib img {
      display: block;
      float: right;
-     margin-top: -1em;
+     }
+.modules dt {
+     font-weight: bold;
+     }
+.modules a.module-details {
+     background: transparent url(search.png) no-repeat 2px 2px;
+     padding: 4px 4px 0 20px;
+     }
+.modules a.module-support {
+     background: transparent url(help12.png) no-repeat 2px 2px;
+     padding: 4px 4px 0 20px;
+     }
+#m_search {    
+     background: transparent url(search.png) no-repeat 4px center;
+     padding-left: 20px;
+     }
+.modules tr.expand, .modules td.expand {
+     background: #f7f7f7;
+     border-color: #bee74b;
+     }
+.modules tr.expand td:first-child {
+     font-weight: bold;
+     background: #DFE5E7;
+     }
+.modules td.expand {
+     padding: 0;
+     }
+.mod-more, .mod-more li {
+     margin: .25em 0 0 1em;
+     padding: 0;
+     list-style-type: none;
+     }
+.mod-more {
+     padding-top: .5em;
      }
 /* ---------------------------------------------------------- post.php, page.php */
@@ -2383 +2356 @@
      }
 .debug {
-     background: #FF6;
+     background: #ff6;
      padding: 3px 0.5em 2px;
-     }
+     }
 /* ---------------------------------------------- Couleurs ajoutées via javascript   
 /* color-picker.js */