summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-11-18 21:32:08 +0100
committerGitHub <noreply@github.com>2016-11-18 21:32:08 +0100
commit4458e294bc6530ef226ead91bd6cb9f753697f32 (patch)
treeb11806c1c9b699156cc46734b2106df3f49226fc
parentcdf248f92eb907da7017c731be315758be5185b2 (diff)
parent50d9793d7241ccf9c7b7b8491099a7f1ec3fb932 (diff)
downloadnextcloud-server-4458e294bc6530ef226ead91bd6cb9f753697f32.tar.gz
nextcloud-server-4458e294bc6530ef226ead91bd6cb9f753697f32.zip
Merge pull request #2107 from nextcloud/fix-scrollbar-firefox
fix scrollbar in settings area in Firefox, improve on @pgys pull request
-rw-r--r--core/css/apps.css9
1 files changed, 3 insertions, 6 deletions
diff --git a/core/css/apps.css b/core/css/apps.css
index e7aad0676cd..852879aee89 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -463,12 +463,10 @@
#app-settings {
position: fixed;
width: 250px; /* change to 100% when layout positions are absolute */
- max-height: 80%;
bottom: 0;
z-index: 140;
- overflow-x: hidden;
- overflow-y: scroll;
}
+#app-settings.open #app-settings-content,
#app-settings.opened #app-settings-content {
display: block;
}
@@ -476,9 +474,6 @@
display: none;
padding: 10px;
background-color: #fff;
-}
-#app-settings.open #app-settings-content {
- display: block;
/* restrict height of settings and make scrollable */
max-height: 300px;
overflow-y: auto;
@@ -486,6 +481,8 @@
#app-settings-content,
#app-settings-header {
border-right: 1px solid #eee;
+ width: 250px;
+ box-sizing: border-box;
}
/* display input fields at full width */