Changeset 1815:07b857f03655 for admin/style

Timestamp:

09/04/13 14:29:21 (12 years ago)

Author:

kevin@…

Branch:

Ticket #1539

Parents:

1814:53cc8fc5cad5 (diff), 1717:9df047961e9c (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) (4 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

@@ -800 +800 @@
      border: none;
 }
-.media-item {
+.media-item, .media-action-box {
      position: relative;
      border: 1px solid #ccc;
@@ -806 +806 @@
      padding: 1em;
      width: 300px;
-     height: 120px;
      display: inline-block;
      vertical-align: top;
-}
-div.media-list .media-item {
+     min-height: 120px
 }
 a.media-icon {
@@ -908 +906 @@
      margin-left: 0;
 }
+/* in blog_pref */
+.user-perm {
+     margin: 2em 0px;
+     background: transparent url(user.png) no-repeat left top;
+     width: 320px;
+     display: inline-block;
+     vertical-align: top;
+}
+.user-perm h4, .user-perm h5, .user-perm p, .user-perm ul, .user-perm li {
+     margin: .5em 0 .33em;
+     padding: 0;
+}
+.user-perm h4 {
+     padding-left: 28px;
+}
+.user-perm ul {
+     list-style-type: inside;
+}
+.user-perm li {
+     margin-left: 1em;
+     padding-left: 0;
+}
+.user-perm h5 {
+     margin:   1em 0 0 0;
+}
+li.user_super, li.user_admin {
+     margin-left: 0;
+     padding-left: 1em;
+     list-style: none;
+     background: transparent url(../images/superadmin.png) no-repeat -2px 2px;
+}
+li.user_admin {
+     background-image: url(../images/admin.png);
+}
+
 /* -------------------------------------------------------------------- Themes */
 #themes {
@@ -1165 +1198 @@
 .success a {
      color: #666;
+}
+.dc-update {
+     padding: 1em 48px 0.5em 48px;
+     margin-bottom: 1em;
+     border-radius: 8px;
+     background: #A2CBE9 url(msg-success.png) no-repeat .7em .7em;
+}
+.dc-update a {
+     color: #000;
+     border-color: #000;
+     margin-right: 1em;
+}
+a.info {
+     margin-left: 2em;
+     font-weight: bold;
 }
 /* ------------------------------------------------------------------ navigation */