Changeset 1862:34fa7b0d6db0
- Timestamp:
- 09/15/13 19:50:12 (11 years ago)
- Branch:
- default
- Children:
- 1863:d359a1272fc0, 1864:dfe13b571ffd
- Files:
-
- 1 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
admin/js/common.js
r1861 r1862 420 420 hideSidebar(); 421 421 } 422 }) ; // .css('height', objSeparator.parent().outerHeight() + 'px');422 }).css('height', objSeparator.parent().parent().parent().outerHeight() + 'px'); 423 423 if ( $.cookie('sidebar-pref') == 'hide-mm' ){ 424 424 objMain.addClass('hide-mm'); -
admin/style/default.css
r1861 r1862 27 27 width: 100%; 28 28 padding-top: 1em; 29 background: #f7f7f7 url(bg_wrapper.png) repeat-y 15.5em; 29 30 } 30 31 #main { … … 33 34 margin-left: -14.5em; 34 35 margin-top: 0; 35 background: #fff url(bg_menu.png);36 36 } 37 37 #content { 38 margin: 0 0 0 1 4.5em;38 margin: 0 0 0 15.5em; 39 39 padding: 9px 18px 18px; /* ie < 9 sucks */ 40 40 padding: .9rem 1.8rem 1.8rem; 41 41 background: #fff; 42 overflow: hidden; 42 43 } 43 44 #main-menu { … … 54 55 text-align: right; 55 56 border-top: 1px solid #ccc; 56 } 57 background-color: #fff; 58 } 59 /* to hide main-menu */ 57 60 #collapser { 61 display: block; 62 float: left; 63 width: 1em; 64 background: #e3e3e3; 65 opacity: .4; 66 margin-left: 14.5em; 67 border: none; 68 text-align: center; 69 overflow: hidden; 70 } 71 /* if main-menu is hidden */ 72 #wrapper.hide-mm { 73 background: #fff; 58 74 } 59 75 .hide-mm #main { 60 width: 100%;61 76 margin-left: 0; 62 float: none;77 float: left; 63 78 } 64 79 .hide-mm #content { 65 margin-left: 0; 66 float: none; 80 margin-left: 1em; 67 81 } 68 82 .hide-mm #main-menu { 69 83 display: none; 70 84 } 71 .hide #collapser { 85 .hide-mm #collapser { 86 margin-left: 0; 87 opacity: 1; 88 } 89 /* if no js activated */ 90 .no-js #content { 91 margin-left: 14.5em; 72 92 } 73 93 … … 570 590 border: 1px solid #ccc; 571 591 font-family: arial, helvetica, sans-serif; 572 padding: 3px 8px;592 padding: 4px 10px; 573 593 line-height: normal !important; 574 594 display: inline-block; … … 593 613 border: 1px solid #2C8FD1; 594 614 background-image:-moz-linear-gradient(top,#25A6E1 0%,#188BC0 100%); 595 background-image:-webkit-gradient(linear,left top,left bottom, color-stop(0%,#25A6E1),color-stop(100%,#188BC0));615 background-image:-webkit-gradient(linear,left top,left bottom, from(#25A6E1), to(#188BC0)); 596 616 background-image:linear-gradient(top,#25A6E1 0%,#188BC0 100%); 597 617 background-color:#25A6E1; … … 602 622 a.button.submit:hover, a.button.submit:focus { 603 623 background-image:-moz-linear-gradient(top,#188BC0 0%,#25A6E1 100%); 604 background-image:-webkit-gradient(linear,left top,left bottom, color-stop(0%,#188BC0),color-stop(100%,#25A6E1));624 background-image:-webkit-gradient(linear,left top,left bottom, from(#188BC0),to(#25A6E1)); 605 625 background-image:linear-gradient(top,#188BC0 0%,#25A6E1 100%); 606 626 background-color:#188BC0; … … 614 634 background-image: -webkit-gradient(linear, left top, left bottom, from(#f5f5f5), to(#dfdfdf)); 615 635 background-image: -moz-linear-gradient(top, #f5f5f5, #dfdfdf); 636 background-image:linear-gradient(top,#f5f5f5 0%,#dfdfdf 100%); 616 637 background-color: #eee; 617 638 border: 1px solid #ccc; … … 626 647 a.button.delete:hover, a.button.reset:hover, a.button:hover, 627 648 a.button.delete:focus, a.button.reset:focus, a.button:focus { 628 background-image:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #e9e9e9), color-stop(1, #f9f9f9) ); 629 background-image:-moz-linear-gradient( center top, #e9e9e9 5%, #f9f9f9 100% ); 649 background-image:-webkit-gradient( linear, left top, left bottom, from(#e9e9e9), to(#f9f9f9)); 650 background-image:-moz-linear-gradient(top, #e9e9e9, #f9f9f9); 651 background-image:linear-gradient(top,#e9e9e9 0%,#f9f9f9 100%); 630 652 background-color:#f3f3f3; 631 653 } … … 649 671 .button.add { 650 672 background-image:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bee74b), color-stop(1, #9BCA1C) ); 651 background-image:-moz-linear-gradient( center top, #bee74b 5%, #9BCA1C 100%);673 background-image:-moz-linear-gradient(center top, #bee74b 5%, #9BCA1C 100%); 652 674 filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bee74b', endColorstr='#9BCA1C'); 653 675 background-color:#bee74b; 654 676 border:1px solid #B2D742; 655 padding:.33em 1.33em ;677 padding:.33em 1.33em .5em; 656 678 color: #000; 657 679 text-shadow: 0 1px 0 rgba(255, 255, 255, 0.6); … … 662 684 .button.add:hover, .button.add:active, .button.add:focus { 663 685 background-image:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #9BCA1C), color-stop(1, #bee74b) ); 664 background-image:-moz-linear-gradient( center top, #9BCA1C 5%, #bee74b 100% ); 686 background-image:-moz-linear-gradient(center top, #9BCA1C 5%, #bee74b 100%); 687 background-image:linear-gradient(center top, #9BCA1C 5%, #bee74b 100%); 665 688 filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#9BCA1C', endColorstr='#bee74b'); 666 689 background-color:#9BCA1C; … … 678 701 input.disabled, input[type=submit].disabled { 679 702 text-shadow: none; 703 filter: none; 680 704 color: #676e78; 681 705 background: #F5F5F5; … … 1635 1659 .media-item { 1636 1660 position: relative; 1637 border: 1px solid # ccc;1661 border: 1px solid #ddd; 1638 1662 margin: 1em; 1639 padding: 1 em;1663 padding: 10px 12px 6px; 1640 1664 width: 300px; 1641 1665 display: inline-block; 1642 1666 vertical-align: top; 1643 min-height: 120px 1644 } 1667 min-height: 140px; 1668 } 1669 .media-item p { 1670 margin: 0 0 .5em; 1671 } 1672 .media-item object { 1673 margin-top: .5em; 1674 } 1645 1675 .media-item ul { 1646 1676 display: block; … … 2137 2167 margin-bottom: 0; 2138 2168 } 2139 .vertical- collapser {2169 .vertical-separator { 2140 2170 margin-top: 2em; 2141 2171 } 2142 p.clear.vertical- collapser {2172 p.clear.vertical-separator { 2143 2173 padding-top: 2em; 2144 2174 } -
inc/admin/lib.dc.page.php
r1861 r1862 152 152 '<div id="wrapper" class="clearfix">'."\n". 153 153 '<div id="main">'."\n". 154 '<div class="hidden-if-no-js"><a href="#" id="collapser"><img src="images/collapser.png" alt="'.__('Switch main menu').'" /></a></div>'. 154 155 '<div id="content" class="clearfix">'."\n"; 155 156 … … 208 209 209 210 '<div id="footer">'. 210 '<a href="#" id="collapser"><span>'.__('Switch main menu').'</span></a>'.211 211 '<span class="helplink"><a href="help.php">'.__('Global help').'</a></span> '. 212 212 '<a href="http://dotclear.org/" title="'.$text.'"><img src="style/dc_logos/w-dotclear90.png" alt="'.$text.'" /></a></div>'."\n".
Note: See TracChangeset
for help on using the changeset viewer.