mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Reverting layout back to 'old style' (nav left, temporarily).

Browse Source
This commit is contained in:
Matthias Mees
2013-02-11 11:31:36 +01:00
parent 56464c99f4
commit 22b6dadcbb
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/2k11/admin/index.tpl
View File

@ -85,9 +85,6 @@
{$admin_vars.out.footer} {$admin_vars.out.footer}
{* </div> *} {* </div> *}
{else} {else}
<div id="content" class="clearfix">
{$admin_vars.main_content}
</div>
{if NOT $admin_vars.no_sidebar} {if NOT $admin_vars.no_sidebar}
<nav id="main_menu"> <nav id="main_menu">
<h2 class="visuallyhidden">Main menu</h2> {* i18n *} <h2 class="visuallyhidden">Main menu</h2> {* i18n *}
@ -178,6 +175,9 @@
</ul> </ul>
</nav> </nav>
{/if} {/if}
<div id="content" class="clearfix">
{$admin_vars.main_content}
</div>
{/if} {/if}
</div> </div>
{if NOT $admin_vars.no_footer} {if NOT $admin_vars.no_footer}

42
templates/2k11/admin/style.css
View File

@ -980,6 +980,23 @@ summary {
#entries_list .form_check, #entries_list .form_check,
.media_file footer { float: left; } .media_file footer { float: left; }
#banner {
float: left;
margin: 0 2% 0 0;
}
#user_menu {
float: left;
margin: 0 0 0 2%;
text-align: right;
}
#banner,
#user_menu { width: 48%; }
.lt-ie8 #banner,
.lt-ie8 #user_menu { width: 47.5%; }
#mediaPropertyForm .media_file_preview { #mediaPropertyForm .media_file_preview {
float: none; float: none;
margin: 1.5em 0; margin: 1.5em 0;
@ -1083,12 +1100,14 @@ summary {
#banner, #banner,
#user_menu { text-shadow: 1px 1px 1px rgba(0,0,0,.8); } #user_menu { text-shadow: 1px 1px 1px rgba(0,0,0,.8); }
#banner>span { margin: 0 0 1.5em; }
#user_menu ul { #user_menu ul {
font-size: 1.5em; font-size: 1.5em;
margin: .5em 0; margin: 1.25em 0 .75em;
} }
#user_menu li { margin: 0 1em 0 0; } #user_menu li { margin: 0 0 0 1em; }
/* CONTENT /* CONTENT
@ -1440,14 +1459,12 @@ form > .button_link:first-of-type { margin-top: 0; }
width: auto; width: auto;
} }
#banner, #main_menu {
#content {
float: left; float: left;
margin: 0 2% 0 0; margin: 0 2% 0 0;
} }
#user_menu, #content {
#main_menu {
float: right; float: right;
margin: 0 0 0 2%; margin: 0 0 0 2%;
} }
@ -1483,12 +1500,6 @@ form > .button_link:first-of-type { margin-top: 0; }
#main_menu { width: 23%; } #main_menu { width: 23%; }
.lt-ie8 #main_menu { width: 22.5%; } .lt-ie8 #main_menu { width: 22.5%; }
.lt-ie8 #banner,
.lt-ie8 #user_menu { width: 47.5%; }
#banner,
#user_menu { width: 48%; }
#content { width: 73%; } #content { width: 73%; }
.lt-ie8 #content { width: 72.5%; } .lt-ie8 #content { width: 72.5%; }
@ -1503,10 +1514,6 @@ form > .button_link:first-of-type { margin-top: 0; }
#edit_entry_metadata select { width: 100%; } #edit_entry_metadata select { width: 100%; }
#banner>span { margin: 0 0 1.5em; }
#user_menu li { margin: 0 0 0 1em; }
#login { margin: 4em auto 1em; } #login { margin: 4em auto 1em; }
#back_to_blog { margin: 1em auto 4em; } #back_to_blog { margin: 1em auto 4em; }
@ -1514,9 +1521,6 @@ form > .button_link:first-of-type { margin-top: 0; }
#moreFilter fieldset input, #moreFilter fieldset input,
#moreFilter fieldset select { margin-bottom: .75em; } #moreFilter fieldset select { margin-bottom: .75em; }
#user_menu { text-align: right; }
#user_menu ul { #user_menu ul {
font-size: 1.5em; font-size: 1.5em;
margin: 1.5em 0 .5em; margin: 1.5em 0 .5em;