summaryrefslogtreecommitdiffstats
path: root/apps/theming/css
diff options
context:
space:
mode:
authorJulius Haertl <jus@bitgrid.net>2016-10-12 16:45:07 +0200
committerJulius Härtl <jus@bitgrid.net>2017-05-08 10:16:29 +0200
commit4199a569127699cc893416bf47ece5a8d28a18a3 (patch)
tree1a31e0b2d6e753fcda28a4038ce2b3ae7d9f5c5a /apps/theming/css
parent4d7a96bc85b9a114daf9fb027a483daf26905b25 (diff)
downloadnextcloud-server-4199a569127699cc893416bf47ece5a8d28a18a3.tar.gz
nextcloud-server-4199a569127699cc893416bf47ece5a8d28a18a3.zip
Theming app: Add plain background color option
Signed-off-by: Julius Haertl <jus@bitgrid.net>
Diffstat (limited to 'apps/theming/css')
-rw-r--r--apps/theming/css/settings-admin.css17
-rw-r--r--apps/theming/css/theming.scss46
2 files changed, 60 insertions, 3 deletions
diff --git a/apps/theming/css/settings-admin.css b/apps/theming/css/settings-admin.css
index 8cc3f0dfe14..e401d77e4b6 100644
--- a/apps/theming/css/settings-admin.css
+++ b/apps/theming/css/settings-admin.css
@@ -26,10 +26,20 @@
display: inline-block;
visibility: hidden;
}
-#theming form .theme-undo {
+form.uploadButton {
+ width: 356px;
+}
+#theming form .theme-undo,
+#theming .theme-remove-bg {
+ cursor: pointer;
+ opacity: .3;
+ padding: 7px;
+ vertical-align: top;
+ display: inline-block;
+ float: right;
position: relative;
top: 4px;
- left: 158px;
+ right: 0px;
visibility: visible;
}
#theming input[type='text']:focus + .theme-undo,
@@ -54,7 +64,8 @@
margin: 2px 0px;
}
-#theming .icon-upload {
+#theming .icon-upload,
+#theming .icon-loading-small {
padding: 8px 20px;
width: 20px;
margin: 2px 0px;
diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss
index 71e0df6735e..15753439db1 100644
--- a/apps/theming/css/theming.scss
+++ b/apps/theming/css/theming.scss
@@ -64,4 +64,50 @@ input.primary {
#body-login input.login {
background-image: url('../../../core/img/actions/confirm.svg');
}
+}
+
+// plain background color for login page
+@if $image-login-plain == 'true' {
+ #body-login, #firstrunwizard .firstrunwizard-header, #theming-preview {
+ background-image: none !important;
+ background-color: $color-primary;
+ }
+ #body-login {
+
+ a, label, p {
+ color: $color-primary-text !important;
+ }
+
+ @if (lightness($color-primary) > 50) {
+ #submit {
+ border-color: nc-darken($color-primary, 20%);
+ background-color: nc-darken($color-primary, 10%);
+ }
+ #submit:hover {
+ border-color: nc-darken($color-primary, 10%);
+ background-color: nc-darken($color-primary, 3%);
+ }
+ input[type='checkbox'].checkbox--white + label:before {
+ border-color: nc-darken($color-primary, 40%) !important;
+ }
+ input[type='checkbox'].checkbox--white:not(:disabled):not(:checked) + label:hover:before,
+ input[type='checkbox'].checkbox--white:focus + label:before {
+ border-color: nc-darken($color-primary, 30%) !important;
+ }
+ input[type='checkbox'].checkbox--white:checked + label:before {
+ border-color: nc-darken($color-primary, 30%) !important;
+ background-image: url('../../../core/img/actions/checkbox-mark.svg');
+ background-color: nc-darken($color-primary, 30%) !important;
+ }
+ } @else {
+ #submit {
+ border-color: nc-lighten($color-primary, 20%);
+ background-color: nc-lighten($color-primary, 5%);
+ }
+ #submit:hover {
+ border-color: nc-lighten($color-primary, 10%);
+ background-color: nc-lighten($color-primary, 3%);
+ }
+ }
+ }
} \ No newline at end of file