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

Fix positioning for popuplayer button

Browse Source 
That means positioning in the source code as well as in the layout.

References #395
This commit is contained in:
Matthias Mees 2016-03-12 21:06:19 +01:00
parent 6fafd4964a
commit 62a3624f1f
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
templates/2k11/admin/media_pane.tpl
View File

@ -39,6 +39,9 @@
<label for="serendipity[filter][fileCategory][Video]" class="media_selector button_link">{$CONST.VIDEO}</label> <label for="serendipity[filter][fileCategory][Video]" class="media_selector button_link">{$CONST.VIDEO}</label>
</fieldset> </fieldset>
</li> </li>
{if $smarty.get.serendipity.showUpload}
<li class="popuplayer_showUpload"><a class="button_link" href="?serendipity[adminModule]=media&serendipity[adminAction]=addSelect&{$media.extraParems}">{$CONST.ADD_MEDIA}</a></li>
{/if}
</ul> </ul>
<fieldset id="media_pane_filter" class="additional_info filter_pane"> <fieldset id="media_pane_filter" class="additional_info filter_pane">
@ -226,12 +229,6 @@
</form> </form>
</div>{* has toolbar end *} </div>{* has toolbar end *}
{if $smarty.get.serendipity.showUpload}
<div class="popuplayer_showUpload">
<a class="button_link" href="?serendipity[adminModule]=media&serendipity[adminAction]=addSelect&{$media.extraParems}">{$CONST.ADD_MEDIA}</a>
</div>
{/if}
<div class="media_library_pane"> <div class="media_library_pane">
{if $media.nr_files < 1} {if $media.nr_files < 1}

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

@ -2520,6 +2520,11 @@ input[name="serendipity[filter][fileCategory]"] {
margin: 1em 0 0; margin: 1em 0 0;
} }
.popuplayer_showUpload {
float: right;
margin: 1em 0 0;
}
.media_select_strict { .media_select_strict {
clear: right; clear: right;
float: left; float: left;
@ -2978,6 +2983,10 @@ img.mfp-img {
display: inline-block; display: inline-block;
width: auto; width: auto;
} }
.popuplayer_showUpload {
margin: 1em .4rem 0 0;
}
} }
@media only screen and (min-width: 480px) { @media only screen and (min-width: 480px) {
@ -3003,6 +3012,14 @@ img.mfp-img {
position: relative; position: relative;
} }
#media_selector_bar {
margin: 0;
}
.popuplayer_showUpload {
margin: 1em 0 0;
}
.tabcontent #pluginlist_event > a, .tabcontent #pluginlist_event > a,
.tabcontent #pluginlist_sidebar > a { .tabcontent #pluginlist_sidebar > a {
position: absolute; position: absolute;
@ -3071,13 +3088,12 @@ img.mfp-img {
margin: 0 0 1em; margin: 0 0 1em;
} }
.media_select_strict { .popuplayer_showUpload {
margin: -1em 0; margin: 0 .4em 1em 0;
} }
.popuplayer_showUpload { .media_select_strict {
float: right; margin: -1em 0;
margin-top: -2.375em;
} }
#mediaPropertyForm .media_file_props label, #mediaPropertyForm .media_file_props label,