diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-01-28 10:52:15 +0100 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-01-28 10:52:15 +0100 |
| commit | 329d9654412baa57752eb6a55fdb21ac5b082156 (patch) | |
| tree | 71e40099d09b445dd8d18bb060f2b52ed0142118 | |
| parent | b81a7aa078deea7d68c43f98b955158b2eceab99 (diff) | |
| parent | a86da16a10d15b88af456eddb7d3efac6db70361 (diff) | |
| download | nextcloud-server-329d9654412baa57752eb6a55fdb21ac5b082156.tar.gz nextcloud-server-329d9654412baa57752eb6a55fdb21ac5b082156.zip | |
merge changes in navigation
| -rw-r--r-- | apps/files/templates/part.breadcrumb.php | 3 | ||||
| -rw-r--r-- | core/css/styles.css | 6 | ||||
| -rw-r--r-- | settings/css/settings.css | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php index 87442606b00..e506ba31f6a 100644 --- a/apps/files/templates/part.breadcrumb.php +++ b/apps/files/templates/part.breadcrumb.php @@ -10,8 +10,7 @@ $dir = str_replace('+', '%20', urlencode($crumb["dir"])); $dir = str_replace('%2F', '/', $dir); ?> <div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg" - data-dir='<?php echo $dir;?>' - style='background-image:url("<?php echo OCP\image_path('core', 'breadcrumb.png');?>")'> + data-dir='<?php echo $dir;?>'> <a href="<?php echo $_['baseURL'].$dir; ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a> </div> <?php endfor; diff --git a/core/css/styles.css b/core/css/styles.css index 4d6efdd5c48..aa087aeafc4 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -53,7 +53,7 @@ input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:# /* BUTTONS */ input[type="submit"], input[type="button"], button, .button, #quota, div.jp-progress, select, .pager li a { - width:auto; padding:.4em; + width:auto; padding:.3em; background-color:rgba(230,230,230,.5); font-weight:bold; color:#555; text-shadow:#fff 0 1px 0; border:1px solid #bbb; border:1px solid rgba(180,180,180,.5); cursor:pointer; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; @@ -100,13 +100,13 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b -moz-box-sizing:border-box; box-sizing:border-box; } -#leftcontent, .leftcontent { position:fixed; overflow:auto; top:6.4em; width:20em; background:#f8f8f8; border-right:1px solid #ddd; } +#leftcontent, .leftcontent { position:fixed; overflow:auto; top:6.4em; width:20em; background:#f8f8f8; border-right:1px solid #ddd; height:100%; } #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.active, .leftcontent li.active { font-weight:bold; } #leftcontent li:hover, .leftcontent li:hover { color:#333; background:#ddd; } #leftcontent a { height:100%; display:block; margin:0; padding:0 1em 0 0; float:left; } -#rightcontent, .rightcontent { position:fixed; top:6.4em; left:32.5em; overflow:auto } +#rightcontent, .rightcontent { position:fixed; top:6.4em; left:24.5em; overflow:auto } /* LOG IN & INSTALLATION ------------------------------------------------------------ */ diff --git a/settings/css/settings.css b/settings/css/settings.css index 4d0f6efd2c8..76a7d8c28c6 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -36,7 +36,7 @@ table:not(.nostyle) { width:100%; } #rightcontent { padding-left: 1em; } div.quota { float:right; display:block; position:absolute; right:25em; top:0; } div.quota-select-wrapper { position: relative; } -select.quota { position:absolute; left:0; top:0; width:10em; } +select.quota { position:absolute; left:0; top:0.5em; width:10em; } select.quota-user { position:relative; left:0; top:0; width:10em; } input.quota-other { display:none; position:absolute; left:0.1em; top:0.1em; width:7em; border:none; box-shadow:none; } div.quota>span { position:absolute; right:0; white-space:nowrap; top:.7em; color:#888; text-shadow:0 1px 0 #fff; } |