Changeset 1413:0581a433675d for admin/style

Timestamp:

08/12/13 13:34:09 (12 years ago)

Author:

Dsls

Branch:

twig

Parents:

1319:32528cac0405 (diff), 1333:5e1388edd0c9 (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

Location:

admin/style

Files:

• dc_bg.png (deleted)
• dc_logo.png (deleted)
• dc_logo_footer.png (deleted)
• default.css (modified) (18 diffs)
• dotclear-logo.png (deleted)
• dotclear-logo2.png (deleted)
• head-bg.png (deleted)
• page-bg.png (deleted)

admin/style/default.css

@@ -17 +17 @@
 }
 body {
-     font: 1.2rem/1.5 Helvetica,Arial,sans-serif;
+     font: 1.2rem/1.5 Arial,Helvetica,sans-serif;
      color: #333;
      background: #fff;
@@ -56 +56 @@
      padding: 0 1.8rem .6rem;
      margin: 0 -1.8rem 1rem;
-     background: #fff url(dc_bg_title.png) repeat-x center bottom;
+     background: #fff url(bg_h2.png) repeat-x center bottom;
 }
 h3 {
@@ -93 +93 @@
 #header {
      background: #575859;
-     height: 3em;
      position: relative;
      border-bottom: 4px solid #A2CBE9;
+     width: 100%;
 }
 #prelude {
@@ -124 +124 @@
      width: 14.5em;
      float: left;
-     line-height: 3em;
 }
 #top h1 {
@@ -131 +130 @@
      height: 3.6rem;
      text-indent: -1000px;
-     background: #575859 url(dc_logo.png) no-repeat 0 50%;
 }
 #top h1 a {
@@ -137 +135 @@
      top: 0;
      left: 0;
-     width: 14.5em;
+     width: 17.4rem;
      height: 3.6rem;
      border: none;
      color: #fff;
 }
+#top h1 a:link {
+     background: transparent url(dc_logos/b-dotclear120.png) no-repeat 0 6px;
+}
 #top h1 a:hover, #top h1 a:focus {
-     background: transparent url(dc_logo_hover.png) no-repeat 0 50%;  
+     background: transparent url(dc_logos/b-dotclear120.png) no-repeat 0 -94px; 
 }
 #info-boxes {
-     background: #575859;
      font-size: 1em;
      line-height: 3em;
@@ -155 +155 @@
      color: #fff;
      display: inline-block;
-     background: #575859;
 }
 #info-box2 {
@@ -163 +162 @@
      float: right;
      text-align: right;
-     background: #575859;
 }
 #info-box1 p {
@@ -177 +175 @@
      }
 #info-boxes a {
-     background: #575859;
      font-weight: bold;
      color: #fff;
@@ -209 +206 @@
      margin-left: -14.5em;
      margin-top: 0;
-     background: #fff url(dc_bg.png);
+     background: #fff url(bg_menu.png);
 }
 #content {
@@ -335 +332 @@
 #search-menu {
      padding: .3rem .4rem 0;
+     font-size: 100%
 }
 #search-menu p {
      display: inline-block;
+     border: 1px solid #999;
+     border-radius: .6em;
+     position: relative;
+     height: 2rem;
+     overflow: hidden;
 }
 #search-menu #q {
@@ -343 +346 @@
      border-bottom-left-radius: .6em;
      border-top-left-radius: .6em;
-     border-color: #999;
      background: transparent url(search.png) no-repeat 4px center;
      text-indent: 18px;
      height: 2rem;
      padding: 0 2px; 
+     border: none;
 }
 #search-menu input[type="submit"] {
-     padding: .1rem .3rem;
+     padding: 0 0.3rem;
      background: #dfdfdf;
      border-color: #999;
@@ -356 +359 @@
      border-bottom-right-radius: .6em;
      border-top-right-radius: .6em;
+     border-top-left-radius: 0;
+     border-bottom-left-radius: 0;
      text-shadow: none;
-     height: 2.2rem;
+     height: 2rem;
+     border: none;
+     border-left: 1px solid #aaa;
      font-size: 1rem;
-     margin-left: -.5em;
 }
 #search-menu input[type="submit"]:hover,
@@ -386 +392 @@
      margin: 0;
      padding: 0 1em;
-     text-align: center;
      font-size: 1em;
-}
-#footer a {
 }
 #footer p span.credit {
@@ -404 +407 @@
 #login-screen h1 {
      text-indent: -2000px;
-     background: transparent url(dotclear-logo2.png) no-repeat top left;
-     height: 50px;
+     background: transparent url(dc_logos/w-dotclear240.png) no-repeat top left;
+     height: 66px;
      margin-bottom: .5em;
      margin-left: 0;
@@ -533 +536 @@
 #comments {
      clear: both;
+}
+.preview_entry a {
+     border: 1px solid #ccc;
+     padding: .2rem .5rem;
+     background: #eef;
 }
 /* ------------------------------------------------------------------ categories */
@@ -1471 +1479 @@
 ---------------------------------------------------------------------------- */
 @media screen and (max-width: 920px) {
-     #top, #top h1 a {width: 42px !important;overflow:hidden;}
+     #top, #top h1 a {width: 42px !important; height:100%; overflow: hidden;}
+     #top h1 a:link {
+          background: transparent url(dc_logos/b-dotclear120.png) no-repeat -180px 6px; 
+          border-right: 1px solid #ccc;
+     }
+     #top h1 a:hover, #top h1 a:focus {
+          background: url(dc_logos/b-dotclear120.png) no-repeat -180px -94px;
+          border-right: 1px solid #A2CBE9;
+     }
 }
 @media screen and (max-width: 800px) {
@@ -1499 +1515 @@
      .smallscreen {display: none;}
      #help-button {width:20px; overflow: hidden;}
+     #info-box1 {margin-left: 1rem;}
 }
 @media screen and (max-width: 492px) {
-     #header {min-height:3.6rem;}
+     #header {height:3.6rem;}
      #wrapper {font-size: 1.6rem;}
      .page-title, #info-boxes, .media-item {display: inline-block;}
      div.media-list .media-item {width: 90%; float: none}
-     #top h1 a, #top {height: auto;}
      #info-box1 p.nomobile, label.nomobile {display: none;}
      #help-button {height:26px; width:26px; background-color: #A2CBE9; padding: 0; margin:0;font-size: 1rem;line-height: 68px}