Changeset 2102:fba83bbd6ee1 for admin/style/default.css

Timestamp:

09/26/13 15:14:02 (12 years ago)

Author:

Franck Paul <carnet.franck.paul@…>

Branch:

default

Parents:

2099:7af2e5aa15c2 (diff), 2101:4f5f79f9f0c9 (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:

Merged in blr21/dotclear/ticket 1406 (pull request #81)

Files:

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

admin/style/default.css

@@ -2512 +2512 @@
           }
      }
+     
+/* color-picker.js */
+.color-color-picker {
+     border: 1px solid #000;
+     width: 195px;
+     background: #fff;
+}
+
+/* _blog_theme.js */
+.select-button {
+     font-weight: bold;
+}
+
+/* _media_item.js */
+.color-div {
+     border: 1px solid #ccc;
+}
+
+/* common.js */
+.colorBeginPassword {
+     color: #fff;
+}
+.colorEndPassword {
+     color: #ffbaba;
+}
+.colorBeginMessage {
+     color: #ccc;
+}
+.colorEndMessage {
+     color: #676e78;
+}
+.colorBeginError {
+     color: #ffdec8;
+}
+.colorEndError {
+     color: #ffbaba;
+}
+.colorBeginSuccess {
+     color: #9BCA1C;
+}
+.colorEndSuccess {
+     color: #bee74b;
+}
+/* _post.js */
+.colorBeginValidatorMsg {
+     color: #676e78;
+}
+.colorEndValidatorMsg {
+     color: #ffcc00;
+}
+.colorBeginValidatorErr {
+     color: #fff;
+}
+.colorEndValidatorErr {
+     color: #ffbaba;
+}
+/* _preferences.js */
+.colorBeginUserMail {
+     color: #fff;
+}
+.colorEndUserMail {
+     color: #ffbaba;
+}
+     

admin/style/default.css

@@ -415 +415 @@
      font: 100% "Andale Mono","Courier New",monospace;
      }
+code {
+     background: #FAFAD1;
+     }
 pre {
      white-space: pre;
@@ -1740 +1743 @@
      vertical-align: top;
      min-height: 140px;
+     word-wrap: break-word;
      }
      .media-item p {
@@ -2352 +2356 @@
      width: 100%;
      height: 4px;
-     background: #d99;
+     background: #EBEB47;
      }
 #debug div {
@@ -2363 +2367 @@
 #debug:hover {
      height: auto;
+     padding: 2px 1em;
+     z-index: 100;
      }
 #debug:hover div {
@@ -2468 +2474 @@
      #content {
           margin: 0;
-          padding: 0 .5em;
+          padding: 0 .5em !important;
           }
      #collapser {
@@ -2476 +2482 @@
           margin: 0;
           padding: 6px 0;
+          }
+     #dashboard-boxes .box.medium,
+     #dashboard-boxes .box.small,
+     #dashboard-boxes .box.large {
+          width: 90%;
+          margin: 10px auto;
           }
      }
@@ -2495 +2507 @@
      #icons p {
           width: 150px;
-          }
-     #dashboard-boxes .box.small
-     #dashboard-boxes .box.medium {
-          margin: 10px 0;
-          width: 280px;
           }
      #content.with-help #help-button {