summaryrefslogtreecommitdiffstats
path: root/core/css
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2013-10-02 10:11:18 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2013-10-02 10:11:18 +0200
commit8b08b1b455b474de3fa376dfafa3de63727364ea (patch)
tree536b2d4ba4f979d69f4f6e73755e06635345f78a /core/css
parent084f76fd14125023d5b7277c558eb86a20ea07d3 (diff)
parent535ed8369f701a184340a428e82cc8d7cc7588bb (diff)
downloadnextcloud-server-8b08b1b455b474de3fa376dfafa3de63727364ea.tar.gz
nextcloud-server-8b08b1b455b474de3fa376dfafa3de63727364ea.zip
Merge branch 'master' into sharing_mail_notification_master
Conflicts: lib/private/util.php
Diffstat (limited to 'core/css')
-rw-r--r--core/css/apps.css3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/css/apps.css b/core/css/apps.css
index de63495e50e..f6c20e6cc6a 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -16,6 +16,7 @@
-moz-box-sizing: border-box; box-sizing: border-box;
background-color: #f8f8f8;
border-right: 1px solid #ccc;
+ padding-bottom: 44px;
}
#app-navigation > ul {
height: 100%;
@@ -192,7 +193,7 @@
.settings-button {
display: block;
- height: 32px;
+ height: 44px;
width: 100%;
padding: 0;
margin: 0;