summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2017-09-29 11:07:50 +0200
committerGitHub <noreply@github.com>2017-09-29 11:07:50 +0200
commit993dc77d9ea6691d839c02ba0e75d7afafe33540 (patch)
treea71c4eb16b91857fe7d432f4625e507f94636e1d /core
parent95ec247d102f968322457e49ba16e13a2ec1bddd (diff)
parent8fb788570c449a76b4a2fdfb59842879d82e3fc9 (diff)
downloadnextcloud-server-993dc77d9ea6691d839c02ba0e75d7afafe33540.tar.gz
nextcloud-server-993dc77d9ea6691d839c02ba0e75d7afafe33540.zip
Merge pull request #6693 from nextcloud/apps-inputs-scss-to-correct-scss-file
Move app-settings-content css to correct scss file and fix input cursor
Diffstat (limited to 'core')
-rw-r--r--core/css/apps.scss13
-rw-r--r--core/css/inputs.scss16
2 files changed, 14 insertions, 15 deletions
diff --git a/core/css/apps.scss b/core/css/apps.scss
index 08bbc3ed3b2..4b4e5088262 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -604,6 +604,19 @@ kbd {
padding: 5px 0 7px 22px;
color: rgba($color-main-text, .4);
}
+ input {
+ &[type='checkbox'],
+ &[type='radio'] {
+ &.radio,
+ &.checkbox {
+ + label {
+ display: inline-block;
+ width: 100%;
+ padding: 5px 0;
+ }
+ }
+ }
+ }
}
#app-settings-header {
diff --git a/core/css/inputs.scss b/core/css/inputs.scss
index 832ccdebaa6..42de33b0be8 100644
--- a/core/css/inputs.scss
+++ b/core/css/inputs.scss
@@ -44,6 +44,7 @@ textarea,
border: 1px solid nc-lighten($color-main-text, 86%);
outline: none;
border-radius: 3px;
+ cursor: text;
&:not(:disabled):not(.primary) {
&:hover,
&:focus,
@@ -297,21 +298,6 @@ input {
}
}
}
-#app-settings-content {
- input {
- &[type='checkbox'],
- &[type='radio'] {
- &.radio,
- &.checkbox {
- + label {
- display: inline-block;
- width: 100%;
- padding: 5px 0;
- }
- }
- }
- }
-}
/* Select2 overriding. Merged to core with vendor stylesheet */
.select2-drop {