summaryrefslogtreecommitdiffstats
path: root/core/css
diff options
context:
space:
mode:
authorkondou <kondou@ts.unde.re>2013-08-28 16:44:11 +0200
committerkondou <kondou@ts.unde.re>2013-08-28 16:44:11 +0200
commit67c5be9f199c08ac4c9307901e8e6cc678943f05 (patch)
tree061575d844745b3ad43b9aac518b386228966ad3 /core/css
parent8d8a57de7fb41030ffb69f098419616f4003119a (diff)
parent0c02e1efef76430eea8986697cd9736814fb604a (diff)
downloadnextcloud-server-67c5be9f199c08ac4c9307901e8e6cc678943f05.tar.gz
nextcloud-server-67c5be9f199c08ac4c9307901e8e6cc678943f05.zip
Merge branch 'master' into oc_avatars
Conflicts: 3rdparty
Diffstat (limited to 'core/css')
-rw-r--r--core/css/multiselect.css7
-rw-r--r--core/css/styles.css12
2 files changed, 15 insertions, 4 deletions
diff --git a/core/css/multiselect.css b/core/css/multiselect.css
index a2d1b20d3a5..c25446808ea 100644
--- a/core/css/multiselect.css
+++ b/core/css/multiselect.css
@@ -103,3 +103,10 @@ ul.multiselectoptions > li.creator > input {
padding: 5px;
margin: -5px;
}
+
+.ie8 div.multiselect span:first-child {
+ display:block;
+ position:relative;
+ width: 90%;
+ margin-right:-1px;
+}
diff --git a/core/css/styles.css b/core/css/styles.css
index 792ccb08329..363d36294b2 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -260,9 +260,9 @@ input[name="adminpass-clone"] { padding-left:1.8em; width:11.7em !important; }
#body-login input[type="password"],
#body-login input[type="email"] {
border: 1px solid #323233;
- -moz-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset;
- -webkit-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset;
- box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 3px rgba(0,0,0,.25) inset;
+ -moz-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset;
+ -webkit-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset;
+ box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset;
}
/* Nicely grouping input field sets */
@@ -755,7 +755,7 @@ div.crumb:active {
/* special rules for first-level entries and folders */
#app-navigation > ul > li {
- background-color: #eee;
+ background-color: #f8f8f8;
}
#app-navigation .with-icon a {
@@ -876,6 +876,10 @@ div.crumb:active {
color: #dd1144;
}
+#app-navigation .app-navigation-separator {
+ border-bottom: 1px solid #ddd;
+}
+
/* Part where the content will be loaded into */