summaryrefslogtreecommitdiffstats
path: root/settings/css/settings.css
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2016-06-27 18:23:00 +0200
committerLukas Reschke <lukas@owncloud.com>2016-06-27 18:23:00 +0200
commit6670d3765881a1a7579bd96a523a90c2a52aec4a (patch)
tree4251976f5699d7b9e0b1b0aa42b3a5baca5432b5 /settings/css/settings.css
parentcee2f5dc65f743e0e6470e852978d8bb8e346012 (diff)
parentf8fa031e9f81ba052930d2de647d997af3c309c6 (diff)
downloadnextcloud-server-6670d3765881a1a7579bd96a523a90c2a52aec4a.tar.gz
nextcloud-server-6670d3765881a1a7579bd96a523a90c2a52aec4a.zip
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
Diffstat (limited to 'settings/css/settings.css')
-rw-r--r--settings/css/settings.css16
1 files changed, 8 insertions, 8 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css
index c4854ecec32..0af53cebf31 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -131,11 +131,19 @@ table.nostyle td { padding: 0.2em 0; }
opacity: 0.6;
}
+#new-app-login-name,
#new-app-password {
width: 186px;
font-family: monospace;
background-color: lightyellow;
}
+.app-password-row {
+ display: table-row;
+}
+.app-password-label {
+ display: table-cell;
+ padding-right: 1em;
+}
/* USERS */
#newgroup-init a span { margin-left: 20px; }
@@ -161,10 +169,6 @@ table.nostyle td { padding: 0.2em 0; }
width: 32px;
}
-.ie8 #newgroup-form .icon-add {
- height: 30px;
-}
-
.isgroup .groupname {
width: 85%;
display: block;
@@ -281,10 +285,6 @@ input.userFilter {width: 200px;}
width: 32px;
}
-
-.ie8 table.hascontrols{border-collapse:collapse;width: 100%;}
-.ie8 table.hascontrols tbody tr{border-collapse:collapse;border: 1px solid #ddd !important;}
-
/* used to highlight a user row in red */
#userlist tr.row-warning {
background-color: #FDD;