open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1428 from owncloud/content_positioning

Browse Source 
Fix leftcontent positioning. Ref #1255
remotes/origin/stable5
Thomas Tanghus 12 years ago
parent 09a4424b1f 2d77c7c0fd
commit 3879e5d9c5
6 changed files with 18 additions and 11 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      apps/files/css/files.css
  2. 2
      apps/files/templates/index.php
  3. 14
      core/css/styles.css
  4. 1
      settings/css/settings.css
  5. 2
      settings/templates/apps.php
  6. 2
      settings/templates/users.php

8
apps/files/css/files.css
Unescape View File

@ -3,7 +3,7 @@
See the COPYING-README file. */ See the COPYING-README file. */
/* FILE MENU */ /* FILE MENU */
.actions { padding:.3em; float:left; height:2em; } .actions { padding:.3em; float:left; height:2em; width: 100%; }
.actions input, .actions button, .actions .button { margin:0; float:left; } .actions input, .actions button, .actions .button { margin:0; float:left; }
#new { #new {
@ -23,7 +23,7 @@
#new>ul>li>p { cursor:pointer; } #new>ul>li>p { cursor:pointer; }
#new>ul>li>form>input { padding:0.3em; margin:-0.3em; } #new>ul>li>form>input { padding:0.3em; margin:-0.3em; }
#trash { height:17px; margin:0 0 0 1em; z-index:1010; position:absolute; right:13.5em; } #trash { height:17px; margin: 0 1em; z-index:1010; float: right; }
#upload { #upload {
height:27px; padding:0; margin-left:0.2em; overflow:hidden; height:27px; padding:0; margin-left:0.2em; overflow:hidden;
@ -44,7 +44,7 @@
z-index:20; position:relative; cursor:pointer; overflow:hidden; z-index:20; position:relative; cursor:pointer; overflow:hidden;
} }
#uploadprogresswrapper { position:absolute; right:13.5em; top:0em; } #uploadprogresswrapper { float: right; position: relative; }
#uploadprogresswrapper #uploadprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; } #uploadprogresswrapper #uploadprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; }
/* FILE TABLE */ /* FILE TABLE */
@ -55,7 +55,7 @@
font-size:1.5em; font-weight:bold; font-size:1.5em; font-weight:bold;
color:#888; text-shadow:#fff 0 1px 0; color:#888; text-shadow:#fff 0 1px 0;
} }
table { position:relative; top:37px; width:100%; } table { position:relative; width:100%; }
tbody tr { background-color:#fff; height:2.5em; } tbody tr { background-color:#fff; height:2.5em; }
tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; } tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; }
tbody tr.selected { background-color:#eee; } tbody tr.selected { background-color:#eee; }

2
apps/files/templates/index.php
Unescape View File

@ -59,7 +59,7 @@
<div id="emptyfolder"><?php echo $l->t('Nothing in here. Upload something!')?></div> <div id="emptyfolder"><?php echo $l->t('Nothing in here. Upload something!')?></div>
<?php endif; ?> <?php endif; ?>
<table> <table class="hascontrols">
<thead> <thead>
<tr> <tr>
<th id='headerName'> <th id='headerName'>

14
core/css/styles.css
Unescape View File

@ -119,18 +119,26 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
#select_all{ margin-top:.4em !important;} #select_all{ margin-top:.4em !important;}
/* CONTENT ------------------------------------------------------------------ */ /* CONTENT ------------------------------------------------------------------ */
#controls { padding:0 0.5em; width:100%; top:3.5em; height:2.8em; margin:0; background:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:50; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; } #controls {
position:fixed;
height:2.8em; width:100%;
padding:0 70px 0 0.5em; margin:0;
-moz-box-sizing:border-box; box-sizing:border-box;
-moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000;
background:#f7f7f7; border-bottom:1px solid #eee; z-index:50;
}
#controls .button { display:inline-block; } #controls .button { display:inline-block; }
#content { position:relative; height:100%; width:100%; } #content { position:relative; height:100%; width:100%; }
#content .hascontrols { position: relative; top: 2.9em; }
#content-wrapper { #content-wrapper {
position:absolute; height:100%; width:100%; padding-top:3.5em; padding-left:64px; position:absolute; height:100%; width:100%; padding-top:3.5em; padding-left:64px;
-moz-box-sizing:border-box; box-sizing:border-box; -moz-box-sizing:border-box; box-sizing:border-box;
} }
#leftcontent, .leftcontent { #leftcontent, .leftcontent {
position:fixed; overflow:auto; top:0; width:20em; height:100%; position:relative; overflow:auto; width:20em; height:100%;
background:#f8f8f8; border-right:1px solid #ddd; background:#f8f8f8; border-right:1px solid #ddd;
-moz-box-sizing:border-box; box-sizing:border-box; padding-top:6.4em; -moz-box-sizing:border-box; box-sizing:border-box;
} }
#leftcontent li, .leftcontent li { background:#f8f8f8; padding:.5em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 200ms; -moz-transition:background-color 200ms; -o-transition:background-color 200ms; transition:background-color 200ms; } #leftcontent li, .leftcontent li { background:#f8f8f8; padding:.5em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 200ms; -moz-transition:background-color 200ms; -o-transition:background-color 200ms; transition:background-color 200ms; }
#leftcontent li:hover, #leftcontent li:active, #leftcontent li.active, .leftcontent li:hover, .leftcontent li:active, .leftcontent li.active { background:#eee; } #leftcontent li:hover, #leftcontent li:active, #leftcontent li.active, .leftcontent li:hover, .leftcontent li:active, .leftcontent li.active { background:#eee; }

1
settings/css/settings.css
Unescape View File

@ -33,7 +33,6 @@ tr:hover>td.password>span, tr:hover>td.displayName>span { margin:0; cursor:point
tr:hover>td.remove>a, tr:hover>td.password>img,tr:hover>td.displayName>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; } tr:hover>td.remove>a, tr:hover>td.password>img,tr:hover>td.displayName>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; }
tr:hover>td.remove>a { float:right; } tr:hover>td.remove>a { float:right; }
li.selected { background-color:#ddd; } li.selected { background-color:#ddd; }
#content>table:not(.nostyle) { margin-top:3em; }
table:not(.nostyle) { width:100%; } table:not(.nostyle) { width:100%; }
#rightcontent { padding-left: 1em; } #rightcontent { padding-left: 1em; }
div.quota { float:right; display:block; position:absolute; right:25em; top:0; } div.quota { float:right; display:block; position:absolute; right:25em; top:0; }

2
settings/templates/apps.php
Unescape View File

@ -10,7 +10,7 @@
<a class="button" target="_blank" href="http://owncloud.org/dev"><?php echo $l->t('Add your App');?></a> <a class="button" target="_blank" href="http://owncloud.org/dev"><?php echo $l->t('Add your App');?></a>
<a class="button" target="_blank" href="http://apps.owncloud.com"><?php echo $l->t('More Apps');?></a> <a class="button" target="_blank" href="http://apps.owncloud.com"><?php echo $l->t('More Apps');?></a>
</div> </div>
<ul id="leftcontent" class="applist"> <ul id="leftcontent" class="applist hascontrols">
<?php foreach($_['apps'] as $app):?> <?php foreach($_['apps'] as $app):?>
<li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>" <?php if ( isset( $app['ocs_id'] ) ) { echo "data-id-ocs=\"{$app['ocs_id']}\""; } ?> <li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>" <?php if ( isset( $app['ocs_id'] ) ) { echo "data-id-ocs=\"{$app['ocs_id']}\""; } ?>
data-type="<?php echo $app['internal'] ? 'internal' : 'external' ?>" data-installed="1"> data-type="<?php echo $app['internal'] ? 'internal' : 'external' ?>" data-installed="1">

2
settings/templates/users.php
Unescape View File

@ -73,7 +73,7 @@ $_['subadmingroups'] = array_flip($items);
</div> </div>
</div> </div>
<table data-groups="<?php echo implode(', ', $allGroups);?>"> <table class="hascontrols" data-groups="<?php echo implode(', ', $allGroups);?>">
<thead> <thead>
<tr> <tr>
<th id='headerName'><?php echo $l->t('Login Name')?></th> <th id='headerName'><?php echo $l->t('Login Name')?></th>

Write Preview
Loading…
Cancel
Save