summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2012-08-05 01:41:55 +0200
committerThomas Tanghus <thomas@tanghus.net>2012-08-05 01:42:17 +0200
commitce866a5bdbc7aaee31a3758df2faf6c9c7434189 (patch)
tree096dfd5e7e72065bb8b80c001d8c7a981e595a2a /settings
parentc6b337c3ddd5c649ba873240242c8678c756c058 (diff)
downloadnextcloud-server-ce866a5bdbc7aaee31a3758df2faf6c9c7434189.tar.gz
nextcloud-server-ce866a5bdbc7aaee31a3758df2faf6c9c7434189.zip
CSS tweaks for app settings.
Diffstat (limited to 'settings')
-rw-r--r--settings/css/settings.css13
-rw-r--r--settings/templates/apps.php4
2 files changed, 11 insertions, 6 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 7bd7d5f7f06..2ce79b68ec0 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -43,14 +43,17 @@ div.quota>span { position:absolute; right:0em; white-space:nowrap; top: 0.7em }
select.quota.active { background: #fff; }
/* APPS */
-li { color:#888; white-space: nowrap; }
+.appinfo { margin: 1em; }
+h3 { font-size: 1.4em; font-weight: bold; }
+ul.applist li { height: 2.2em; padding: 0.2em 0.2em 0.2em 0.8em !important; }
+li { color:#888; }
li.active { color:#000; }
-small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size:6pt; padding:4px; border-radius: 4px;}
+small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size: 0.6em; margin: 0; padding: 2px; border-radius: 4px;}
small.externalapp.list { float: right; }
-span.version { margin-left:3em; color:#ddd; }
+span.version { margin-left:3em; margin-right:3em; color:#555; }
-.app { position: relative; display: inline-block; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; z-index: 100; transition: .2s max-width linear; -o-transition: .2s max-width linear; -moz-transition: .2s max-width linear; -webkit-transition: .2s max-width linear; -ms-transition: .2s max-width linear; }
-.app.externalapp { max-width: 10em; }
+.app { position: relative; display: inline-block; padding: 0 !important; text-overflow: hidden; overflow: hidden; white-space: nowrap; z-index: 100; transition: .2s max-width linear; -o-transition: .2s max-width linear; -moz-transition: .2s max-width linear; -webkit-transition: .2s max-width linear; -ms-transition: .2s max-width linear; }
+.app.externalapp { max-width: 12em; }
/* Transition to complete width! */
.app:hover, .app:active { max-width: inherit; }
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 4f078751753..83d63b6b417 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -9,7 +9,7 @@
<div id="controls">
<a class="button" target="_blank" href="http://owncloud.org/dev/apps/getting-started/"><?php echo $l->t('Add your App');?></a>
</div>
-<ul id="leftcontent">
+<ul id="leftcontent" class="applist">
<?php foreach($_['apps'] as $app):?>
<li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>"
data-type="<?php echo $app['internal'] ? 'internal' : 'external' ?>" data-installed="1">
@@ -22,10 +22,12 @@
<?php endforeach;?>
</ul>
<div id="rightcontent">
+ <div class="appinfo">
<h3><strong><span class="name"><?php echo $l->t('Select an App');?></span></strong><span class="version"></span><small class="externalapp" style="visibility:hidden;"></small></h3>
<p class="description"></p>
<img src="" class="preview" />
<p class="appslink hidden"><a href="#" target="_blank"><?php echo $l->t('See application page at apps.owncloud.com');?></a></p>
<p class="license hidden"><span class="licence"></span><?php echo $l->t('-licensed');?> <?php echo $l->t('by');?> <span class="author"></span></p>
<input class="enable hidden" type="submit" />
+ </div>
</div>