Bring back the button links, some minor CSS fixes.

This commit is contained in:
Matthias Mees 2014-03-03 19:31:12 +01:00
parent 1d76446890
commit 39a3da9e8f
2 changed files with 52 additions and 25 deletions

View File

@ -66,13 +66,13 @@
<ul class="clearfix">
<li id="user_menu"><h3>{$admin_vars.self_info}</h3>
<ul>
<li><a href="serendipity_admin.php">Dashboard</a></li> {* i18n *}
<li><a href="serendipity_admin.php?serendipity[adminModule]=logout">{$CONST.LOGOUT}</a></li>
<ul class="clearfix">
<li><a class="button_link" href="serendipity_admin.php" title="Dashboard"><span class="icon-home"></span><span class="visuallyhidden"> Dashboard</span></a></li> {* i18n *}
{if 'personalConfiguration'|checkPermission}
<li><a href="serendipity_admin.php?serendipity[adminModule]=personal">{$CONST.PERSONAL_SETTINGS}</a></li>
<li><a class="button_link" href="serendipity_admin.php?serendipity[adminModule]=personal" title="{$CONST.PERSONAL_SETTINGS}"><span class="icon-cog-alt"></span><span class="visuallyhidden"> {$CONST.PERSONAL_SETTINGS}</span></a></li>
{/if}
<li><a href="{$serendipityBaseURL}">{$CONST.BACK_TO_BLOG}</a></li>
<li><a class="button_link" href="{$serendipityBaseURL}" title="{$CONST.BACK_TO_BLOG}"><span class="icon-globe"></span><span class="visuallyhidden"> {$CONST.BACK_TO_BLOG}</span></a></li>
<li><a class="button_link" href="serendipity_admin.php?serendipity[adminModule]=logout" title="{$CONST.LOGOUT}"><span class="icon-logout"></span><span class="visuallyhidden"> {$CONST.LOGOUT}</span></a></li>
</ul>
</li>
{if 'adminEntries'|checkPermission OR 'adminEntriesPlugins'|checkPermission}

View File

@ -1107,6 +1107,19 @@ summary {
/* LAYOUT
----------------------------------------------------------------- */
#top > div,
#main_menu,
#content {
margin: 0;
padding-left: 2.5%;
padding-right: 2.5%;
width: 95%;
}
#workspace {
overflow: hidden;
}
#serendipity_customfields label {
margin-right: 1em;
}
@ -1303,19 +1316,6 @@ summary {
/* NAVIGATION
----------------------------------------------------------------- */
#main_menu {
background: #ccdde7;
}
#top > div,
#main_menu,
#content {
margin: 0;
padding-left: 2.5%;
padding-right: 2.5%;
width: 95%;
}
.js #main_menu {
margin-left: -100%;
}
@ -1339,14 +1339,28 @@ summary {
margin-right: -100%;
}
#workspace {
overflow: hidden;
#main_menu {
background: #ccdde7;
}
#main_menu h3 {
border-bottom: 1px solid #aaa;
color: #666;
font-size: 1em;
margin-bottom: .5em;
padding-bottom: .25em;
}
#main_menu > ul {
margin-bottom: .75em;
}
#main_menu a {
display: block;
padding-top: 3px;
padding-bottom: 3px;
}
#main_menu a,
#main_menu a:visited,
.quick_list h3 a,
@ -1360,6 +1374,13 @@ summary {
margin: .35em .8em 0 0;
}
#main_menu #user_menu li {
display: inline-block;
font-size: 1.25em;
margin-right: .5em;
width: auto;
}
/* CONTENT
----------------------------------------------------------------- */
@ -2895,11 +2916,6 @@ img.mfp-img {
margin-left: 0;
}
#main_menu a {
display: block;
padding: .125em 0;
}
#nav-toggle {
display: none !important;
visibility: hidden;
@ -2951,6 +2967,17 @@ img.mfp-img {
margin: 0 2% 0 0;
}
#main_menu #user_menu {
border: 0 none;
padding: 0;
}
#main_menu #user_menu h3 {
background: transparent;
border: 0 none;
padding-top: 0;
}
#content {
float: right;
margin: 0 0 0 2%;