aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2014-05-29 21:54:15 +0200
committerLukas Reschke <lukas@statuscode.ch>2014-05-29 21:54:15 +0200
commit5cd0fd2559c12d3407cbc4791a14404c10de9677 (patch)
treed9f04d1e1a33cd0780cd51f355f5154fa3ea209d /core
parent45d93cc6ece0989a88edcc72a3515c1f49e2d56c (diff)
parentdc83b17f49b7b2cf9aec4610c43c9260c7efdbe2 (diff)
downloadnextcloud-server-5cd0fd2559c12d3407cbc4791a14404c10de9677.tar.gz
nextcloud-server-5cd0fd2559c12d3407cbc4791a14404c10de9677.zip
Merge pull request #8700 from owncloud/design-smallfixes
Design detail fixes
Diffstat (limited to 'core')
-rw-r--r--core/css/fixes.css5
-rw-r--r--core/css/styles.css26
2 files changed, 24 insertions, 7 deletions
diff --git a/core/css/fixes.css b/core/css/fixes.css
index 15635950746..91267c276ae 100644
--- a/core/css/fixes.css
+++ b/core/css/fixes.css
@@ -5,6 +5,11 @@
border: 0;
}
+/* fix height of select boxes for OS X */
+select {
+ min-height: 29px;
+}
+
.lte8 .delete-icon { background-image: url('../img/actions/delete.png'); }
.lte8 .delete-icon:hover, .delete-icon:focus {
background-image: url('../img/actions/delete-hover.png');
diff --git a/core/css/styles.css b/core/css/styles.css
index c493941fed8..4a84568244c 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -204,10 +204,26 @@ input img, button img, .button img {
}
+/* prevent ugly selection effect on accidental selection */
+#header,
+#navigation,
+#expanddiv {
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+}
+
+
/* SCROLLING */
-::-webkit-scrollbar { width:8px; }
-::-webkit-scrollbar-track-piece { background-color:transparent; }
-::-webkit-scrollbar-thumb { background:#ddd; }
+::-webkit-scrollbar {
+ width: 8px;
+}
+::-webkit-scrollbar-track-piece {
+ background-color: transparent;
+}
+::-webkit-scrollbar-thumb {
+ background: #ccc;
+}
/* BUTTONS */
@@ -713,8 +729,6 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
overflow-y: auto;
overflow-x: hidden;
-moz-box-sizing:border-box; box-sizing:border-box;
- /* prevent ugly selection effect on accidental selection */
- -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none;
}
#apps {
height: 100%;
@@ -805,8 +819,6 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
border-bottom-left-radius:7px; border-bottom:1px #333 solid; border-left:1px #333 solid;
box-shadow:0 0 7px rgb(29,45,68);
-moz-box-sizing: border-box; box-sizing: border-box;
- /* prevent ugly selection effect on accidental selection */
- -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none;
}
#expanddiv a {
display: block;