From 8605e84547d0335676b2540d8f4d61fb1fed53fe Mon Sep 17 00:00:00 2001 From: Sugaroverdose Date: Sun, 25 Jan 2015 19:33:20 +0300 Subject: [PATCH 1/3] Fix #13632 and make new file menu more consistent with button --- apps/files/css/files.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index f04d6f8352..38318e125d 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -34,12 +34,13 @@ border-bottom-left-radius: 0; border-bottom-right-radius: 0; border-bottom: none; + background: #f8f8f8; } #new > ul { display: none; position: fixed; min-width: 112px; - z-index: 10; + z-index: -2; padding: 8px; padding-bottom: 0; margin-top: 14px; @@ -47,6 +48,7 @@ text-align: left; background: #f8f8f8; border: 1px solid #ddd; + border: 1px solid rgba(190, 190, 190, 0.901961); border-radius: 5px; border-top-left-radius: 0; box-shadow: 0 2px 7px rgba(170,170,170,.4); From 0418c9da3d376c9b407851cde28f26139b29ccaa Mon Sep 17 00:00:00 2001 From: Sugaroverdose Date: Wed, 28 Jan 2015 20:24:12 +0300 Subject: [PATCH 2/3] Play with z-index to make proper dropdown overlap --- apps/files/css/files.css | 7 ++++++- apps/files/css/upload.css | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 38318e125d..cdaa328aea 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -13,6 +13,11 @@ } .actions.hidden { display: none; } +.actions.creatable { + position: relative; + z-index: -30; +} + #new { z-index: 1010; float: left; @@ -40,7 +45,7 @@ display: none; position: fixed; min-width: 112px; - z-index: -2; + z-index: -10; padding: 8px; padding-bottom: 0; margin-top: 14px; diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css index adf1e9d13f..bd60f83138 100644 --- a/apps/files/css/upload.css +++ b/apps/files/css/upload.css @@ -8,6 +8,8 @@ margin-left: 3px; overflow: hidden; vertical-align: top; + position: relative; + z-index: -20; } #upload .icon-upload { position: relative; From e57e273a40bc16ade77a6f4615db8f606ae58562 Mon Sep 17 00:00:00 2001 From: Sugaroverdose Date: Wed, 28 Jan 2015 22:44:12 +0300 Subject: [PATCH 3/3] Prevent 1px padding between button and dropdown in ie11 when zooming --- apps/files/css/files.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index cdaa328aea..1d6b4ad9e0 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -48,7 +48,7 @@ z-index: -10; padding: 8px; padding-bottom: 0; - margin-top: 14px; + margin-top: 13.5px; margin-left: -1px; text-align: left; background: #f8f8f8;