Changeset 1946:4f3fe6de5381

Timestamp:

09/18/13 19:12:08 (12 years ago)

Author:

Anne Kozlika <kozlika@…>

Branch:

default

Message:

Placement du collapser en pure css. Position absolute -> Déplacement du footer hors #wrapper.

Files:

• admin/js/common.js (modified) (2 diffs)
• admin/style/default.css (modified) (8 diffs)
• inc/admin/lib.dc.page.php (modified) (3 diffs)

admin/js/common.js

@@ -418 +418 @@
             hideSidebar();
         }
-    }).css('height', objSeparator.parent().parent().parent().outerHeight() + 'px');
+    });
      if ( $.cookie('sidebar-pref') == 'hide-mm' ){
           objMain.addClass('hide-mm');
@@ -424 +424 @@
           objMain.removeClass('hide-mm');
      }
-
 });

admin/style/default.css

@@ -25 +25 @@
      }
 #wrapper {
+     position: relative;
      width: 100%;
      padding-top: 1em;
@@ -59 +60 @@
 /* to hide main-menu */
 #collapser {
+     position: absolute;
+     top: 0;
+     left: 14.5em;
+     width: 1em;
+     height: 100%;
+     overflow: hidden;
      display: block;
-     float: left;
-     width: 1em;
      background: #f3f3f3 url(../images/collapser-hide.png) no-repeat center bottom;
-     margin-left: 14.5em;
-     border: none;
-     text-align: left;
-     overflow: hidden;
-     border-right: double #ddd;
+     border-right: double #dfdfdf;
+     z-index: 1;
      }
 .expand-mm {
@@ -86 +88 @@
      }
 .hide-mm #collapser {
-     margin-left: 0;
-     text-align: right;
+     left: 0;
      background: #e3e3e3 url(../images/collapser-show.png) no-repeat center bottom;
      }
@@ -96 +97 @@
      display: block;
      }
-/* if no js activated */
-.no-js #content {
-     margin-left: 14.5em;
-     }
-
 /* -------------------------------------------------------------- layout: two-cols */
 .two-cols {
@@ -1073 +1069 @@
           display: block;
           position: absolute;
-          top: 36px; /* ie < 9 sucks */
-          top: 3.6rem;
+          top: 0;
           right: 0;
           width: 280px; /* ie < 9 sucks */
@@ -1087 +1082 @@
      background: transparent url(../images/page_help.png) no-repeat 6px center;
      position: absolute;
-     top: 36px; /* ie < 9 sucks */
-     top: 3.6rem;
-     right: 0px;
+     top: 0;
+     right: 0;
      padding: 0 1.5em 0 30px;
      cursor: pointer;
@@ -1105 +1099 @@
           background-color: #f5f5f5;
           position: fixed;
+          top: 40px;
           border-top: 2px solid #FFD478;
           border-left: 2px solid #FFD478;
@@ -1352 +1347 @@
                }
           #icons a img {
-               padding: 2em;
-               -moz-box-shadow: 0px 1px 0px 0px #ffffff;
-               -webkit-box-shadow: 0px 1px 0px 0px #ffffff;
-               box-shadow: 0px 1px 0px 0px #ffffff;
-               background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #f9f9f9), color-stop(1, #e9e9e9) );
-               background:-moz-linear-gradient( center top, #f9f9f9 5%, #e9e9e9 100% );
-               filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#e9e9e9');
+               padding: 1.5em;
                background-color:#f9f9f9;
-               -moz-border-radius:1em;
-               -webkit-border-radius:1em;
-               border-radius:1em;
+               -moz-border-radius:8px;
+               -webkit-border-radius:8px;
+               border-radius:8px;
                border:1px solid #dcdcdc;
                display:inline-block;

inc/admin/lib.dc.page.php

@@ -151 +151 @@
           echo
           '<div id="wrapper" class="clearfix">'."\n".
-          '<div id="main">'."\n".
-          '<div class="hidden-if-no-js"><a href="#" id="collapser">'.
+          '<div class="hidden-if-no-js collapser-box"><a href="#" id="collapser">'.
           '<img class="collapse-mm" src="images/collapser-hide.png" alt="'.__('Hide main menu').'" />'.
           '<img class="expand-mm" src="images/collapser-show.png" alt="'.__('Show main menu').'" />'.
           '</a></div>'.
+          '<div id="main">'."\n".
           '<div id="content" class="clearfix">'."\n";
 
@@ -216 +216 @@
           echo
           '</div>'."\n".      // End of #main-menu
-
+          "</div>\n";         // End of #wrapper
+
+          echo
           '<div id="footer">'.
           '<a href="http://dotclear.org/" title="'.$text.'"><img src="style/dc_logos/w-dotclear90.png" alt="'.$text.'" /></a></div>'."\n".
@@ -226 +228 @@
 '      \__________"|'."\n".
 '    ~^~^~^~^~^~^~^~^~^~'."\n".
-' -->'."\n".
-          "</div>\n";         // End of #wrapper
+' -->'."\n";
 
           if (defined('DC_DEV') && DC_DEV === true) {