diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-03-07 10:29:09 +0100 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-03-07 13:17:37 +0100 |
| commit | 966ceca8eaf9d06d9f0528c83168a2942ca7e279 (patch) | |
| tree | 0ccad4228fbb322d88c936d806bb60c80d11ffcf /core/css | |
| parent | 8d986160b899684dd5e76c3996ba04902152df4e (diff) | |
| download | nextcloud-server-966ceca8eaf9d06d9f0528c83168a2942ca7e279.tar.gz nextcloud-server-966ceca8eaf9d06d9f0528c83168a2942ca7e279.zip | |
Removed unwanted conflicting props
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core/css')
| -rw-r--r-- | core/css/styles.scss | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/core/css/styles.scss b/core/css/styles.scss index 18a298d39b6..5a927046c03 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -254,28 +254,17 @@ body { } #controls { - .button, button { - box-sizing: border-box; - display: inline-block; - height: 36px; - padding: 7px 10px; - } - input { - &[type='submit'], &[type='text'], &[type='password'] { + > div, + & { + > .button, button { box-sizing: border-box; display: inline-block; height: 36px; padding: 7px 10px; } - } - select { - box-sizing: border-box; - display: inline-block; - height: 36px; - padding: 7px 10px; - } - .button.hidden { - display: none; + .button.hidden { + display: none; + } } } |