From 9248284399f7b6bf65e3782bb4afa98a175cf93d Mon Sep 17 00:00:00 2001 From: Magnus Walbeck Date: Thu, 21 Jun 2018 14:12:26 +0800 Subject: [PATCH 1/9] Add styling for Quicknotes #22 --- core/css/apps/_quicknotes.scss | 47 ++++++++++++++++++++++++++++++++++ core/css/server.css | 21 +++++++++++++++ core/css/server.scss | 3 ++- 3 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 core/css/apps/_quicknotes.scss diff --git a/core/css/apps/_quicknotes.scss b/core/css/apps/_quicknotes.scss new file mode 100644 index 00000000..4b889933 --- /dev/null +++ b/core/css/apps/_quicknotes.scss @@ -0,0 +1,47 @@ +.app-quicknotes { + + #app-navigation { + + #new-note-fixed { + background-color: $background-normal; + padding: 9px; + margin: 1px; + } + + #colors-folder { + + .icon-checkmark { + background-image: url('/core/css/../img/actions/checkmark.svg?v=1'); + } + + .circle-toolbar.any-color { + background-color: $background-alternate; + } + } + + #notes-folder { + + .note a { + color: $foreground-normal; + opacity: 0.7; + } + } + } + + .quicknote { + color: #000000; + box-shadow: none; + + .icon-checkmark { + background-image: url('/core/css/../img/actions/checkmark.svg?v=1'); + } + + .icon-delete { + background-image: url('/core/css/../img/actions/delete.svg?v=1'); + + &:hover, &:focus { + background-image: url('/core/css/../img/actions/delete-hover.svg?v=1'); + } + } + } +} \ No newline at end of file diff --git a/core/css/server.css b/core/css/server.css index 28ef3eac..2315e420 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -2741,4 +2741,25 @@ button#deleteaccount { #city-right { border-top: 1px solid #706f6e; } +.app-quicknotes #app-navigation #new-note-fixed { + background-color: #31363b; + padding: 9px; + margin: 1px; } +.app-quicknotes #app-navigation #colors-folder .icon-checkmark { + background-image: url("/core/css/../img/actions/checkmark.svg?v=1"); } +.app-quicknotes #app-navigation #colors-folder .circle-toolbar.any-color { + background-color: #4d4d4d; } +.app-quicknotes #app-navigation #notes-folder .note a { + color: #eff0f1; + opacity: 0.7; } +.app-quicknotes .quicknote { + color: #000000; + box-shadow: none; } + .app-quicknotes .quicknote .icon-checkmark { + background-image: url("/core/css/../img/actions/checkmark.svg?v=1"); } + .app-quicknotes .quicknote .icon-delete { + background-image: url("/core/css/../img/actions/delete.svg?v=1"); } + .app-quicknotes .quicknote .icon-delete:hover, .app-quicknotes .quicknote .icon-delete:focus { + background-image: url("/core/css/../img/actions/delete-hover.svg?v=1"); } + /*# sourceMappingURL=server.css.map */ diff --git a/core/css/server.scss b/core/css/server.scss index 27147775..1d474d67 100644 --- a/core/css/server.scss +++ b/core/css/server.scss @@ -46,4 +46,5 @@ @import 'apps/flow-upload'; @import 'apps/deck'; @import 'apps/fulltextsearch'; -@import 'apps/weather'; \ No newline at end of file +@import 'apps/weather'; +@import 'apps/quicknotes'; \ No newline at end of file From 3c89a743c402d73ea195d309ebbe3d8370ff5c73 Mon Sep 17 00:00:00 2001 From: Magnus Walbeck Date: Mon, 25 Jun 2018 16:43:20 +0800 Subject: [PATCH 2/9] Fix styling for ldap #24 --- core/css/apps/_ldap.scss | 17 +++++++++++---- core/css/core/_icons.scss | 10 ++++----- core/css/core/_style.scss | 45 +++++++++++++++++++++++++++++++++++++++ core/css/server.css | 44 ++++++++++++++++++++++++++++++++++---- 4 files changed, 103 insertions(+), 13 deletions(-) diff --git a/core/css/apps/_ldap.scss b/core/css/apps/_ldap.scss index 13fafaac..fb852cd9 100644 --- a/core/css/apps/_ldap.scss +++ b/core/css/apps/_ldap.scss @@ -5,9 +5,18 @@ background-color: $background-normal; } - ul.ui-tabs-nav .ui-tabs-active { - &, & > a { - background-color: $background-dark; - } + ul.ui-tabs-nav .ui-tabs-active, + ul.ui-tabs-nav .ui-tabs-active > a { + background-color: $background-dark; + color: $foreground-active; + border-bottom-color: $decoration-active; + } + + div.ui-accordion-content { + background: $background-normal; + } + + .ldap_grey { + color: $foreground-normal; } } \ No newline at end of file diff --git a/core/css/core/_icons.scss b/core/css/core/_icons.scss index 68b65b41..750702b6 100644 --- a/core/css/core/_icons.scss +++ b/core/css/core/_icons.scss @@ -692,11 +692,6 @@ a.impersonate img.svg { height: 16px; } -// Info icon in ldap settings -#ldapSettings .ldapWizardControls a img { - filter: invert(95%); -} - // Play button in Music App under All Tracks menu .app-music { @@ -706,6 +701,11 @@ a.impersonate img.svg { } } +// Arrow in advanved ldap settings +#ldapSettings .ui-accordion .ui-accordion-header .ui-accordion-header-icon { + filter: invert(95%); +} + // Apps with generic icons names .app-settings { diff --git a/core/css/core/_style.scss b/core/css/core/_style.scss index 77047a84..47776281 100644 --- a/core/css/core/_style.scss +++ b/core/css/core/_style.scss @@ -215,4 +215,49 @@ input[type="button"] { background-color: $background-normal; font-weight: bold; color: $foreground-normal; +} + +.ui-tabs .ui-tabs-nav .ui-state-default { + background-color: $background-dark; + border-bottom-color: $decoration-normal; + + a { + color: $foreground-normal; + } +} + +.ui-tabs .ui-tabs-nav .ui-state-hover { + background-color: $background-dark; + border-bottom-color: $decoration-active; + + a:hover { + color: $foreground-normal; + } +} + +.ui-state-default.ui-state-disabled { + background-color: $background-alternate; + opacity: 0.5; + + a { + color: $foreground-normal; + } +} + +ul.ui-tabs-nav .ui-tabs-active, +ul.ui-tabs-nav .ui-tabs-active > a { + background-color: $background-dark; + color: $foreground-active; + border-bottom-color: $decoration-active; +} + +.ui-accordion { + + .ui-accordion-header { + background-color: $background-dark; + } + + .ui-accordion-content { + background-color: $background-normal; + } } \ No newline at end of file diff --git a/core/css/server.css b/core/css/server.css index 2315e420..d266a16c 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -498,10 +498,10 @@ a.impersonate img.svg { width: 16px; height: 16px; } -#ldapSettings .ldapWizardControls a img { +.app-music img.play.svg, .app-music img.control { filter: invert(95%); } -.app-music img.play.svg, .app-music img.control { +#ldapSettings .ui-accordion .ui-accordion-header .ui-accordion-header-icon { filter: invert(95%); } .app-settings #app-navigation img[src$="/img/app-dark.svg"] { @@ -750,6 +750,35 @@ input[type="button"] { font-weight: bold; color: #eff0f1; } +.ui-tabs .ui-tabs-nav .ui-state-default { + background-color: #232629; + border-bottom-color: #706f6e; } + .ui-tabs .ui-tabs-nav .ui-state-default a { + color: #eff0f1; } + +.ui-tabs .ui-tabs-nav .ui-state-hover { + background-color: #232629; + border-bottom-color: #3daee9; } + .ui-tabs .ui-tabs-nav .ui-state-hover a:hover { + color: #eff0f1; } + +.ui-state-default.ui-state-disabled { + background-color: #4d4d4d; + opacity: 0.5; } + .ui-state-default.ui-state-disabled a { + color: #eff0f1; } + +ul.ui-tabs-nav .ui-tabs-active, +ul.ui-tabs-nav .ui-tabs-active > a { + background-color: #232629; + color: #fcfcfc; + border-bottom-color: #3daee9; } + +.ui-accordion .ui-accordion-header { + background-color: #232629; } +.ui-accordion .ui-accordion-content { + background-color: #31363b; } + /* Login Screen ------------------------------------------------------------- */ #body-login { background-image: url(../../loginbackground.png), url(../../loginbackground.jpg) !important; @@ -1789,8 +1818,15 @@ td.date, td.date > span { background-color: #31363b; } #ldapSettings > fieldset { background-color: #31363b; } - #ldapSettings ul.ui-tabs-nav .ui-tabs-active, #ldapSettings ul.ui-tabs-nav .ui-tabs-active > a { - background-color: #232629; } + #ldapSettings ul.ui-tabs-nav .ui-tabs-active, + #ldapSettings ul.ui-tabs-nav .ui-tabs-active > a { + background-color: #232629; + color: #fcfcfc; + border-bottom-color: #3daee9; } + #ldapSettings div.ui-accordion-content { + background: #31363b; } + #ldapSettings .ldap_grey { + color: #eff0f1; } /* Log reader --------------------------------------------------------------- */ #logreader-root table tbody tr td { From 877fd4db7fc1f405dafad88678569e7b9bafe8e2 Mon Sep 17 00:00:00 2001 From: Magnus Walbeck Date: Thu, 28 Jun 2018 13:58:41 +0800 Subject: [PATCH 3/9] Fix passman section in admin settings #25 --- core/css/apps/_passman.scss | 20 ++++++-------------- core/css/core/_style.scss | 9 +++++++++ core/css/server.css | 19 ++++++++----------- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/core/css/apps/_passman.scss b/core/css/apps/_passman.scss index 38d36a94..912c7aea 100644 --- a/core/css/apps/_passman.scss +++ b/core/css/apps/_passman.scss @@ -256,20 +256,12 @@ tags-input { border: none; } -#passman-settings #passman-tabs { - .ui-widget-header { - border: none; - background: #31363b; - color: #eff0f1; - } +#passman-settings { - .ui-tabs .ui-tabs-nav li.ui-tabs-active { - margin-bottom: inherit; - padding-bottom: inherit; - } -} + #mover { -.ui-tabs .ui-tabs-nav li { - background: $background-dark; - border-color: $decoration-normal; + table tr:hover { + background-color: unset; + } + } } \ No newline at end of file diff --git a/core/css/core/_style.scss b/core/css/core/_style.scss index 47776281..9f2da50c 100644 --- a/core/css/core/_style.scss +++ b/core/css/core/_style.scss @@ -235,6 +235,15 @@ input[type="button"] { } } +.ui-tabs .ui-tabs-nav .ui-state-active { + background-color: $background-dark; + border-bottom-color: $decoration-active; + + a, a:link { + color: $foreground-active; + } +} + .ui-state-default.ui-state-disabled { background-color: $background-alternate; opacity: 0.5; diff --git a/core/css/server.css b/core/css/server.css index d266a16c..0276d4c9 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -762,6 +762,12 @@ input[type="button"] { .ui-tabs .ui-tabs-nav .ui-state-hover a:hover { color: #eff0f1; } +.ui-tabs .ui-tabs-nav .ui-state-active { + background-color: #232629; + border-bottom-color: #3daee9; } + .ui-tabs .ui-tabs-nav .ui-state-active a, .ui-tabs .ui-tabs-nav .ui-state-active a:link { + color: #fcfcfc; } + .ui-state-default.ui-state-disabled { background-color: #4d4d4d; opacity: 0.5; } @@ -2383,17 +2389,8 @@ tags-input .autocomplete { .sequence code { border: none; } -#passman-settings #passman-tabs .ui-widget-header { - border: none; - background: #31363b; - color: #eff0f1; } -#passman-settings #passman-tabs .ui-tabs .ui-tabs-nav li.ui-tabs-active { - margin-bottom: inherit; - padding-bottom: inherit; } - -.ui-tabs .ui-tabs-nav li { - background: #232629; - border-color: #706f6e; } +#passman-settings #mover table tr:hover { + background-color: unset; } .app-ocsms #app-content-header { margin-top: 1px; } From dde8e5ba52fef790a3ff425c4f3579bd2c19bb1f Mon Sep 17 00:00:00 2001 From: Magnus Walbeck Date: Thu, 28 Jun 2018 14:05:12 +0800 Subject: [PATCH 4/9] Change category icon for search in Apps section --- core/css/core/_icons.scss | 3 ++- core/css/server.css | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/css/core/_icons.scss b/core/css/core/_icons.scss index 750702b6..a571f7c0 100644 --- a/core/css/core/_icons.scss +++ b/core/css/core/_icons.scss @@ -260,7 +260,8 @@ select { /* Search ------------------------------------------------------------------- */ -.icon-search { +.icon-search, +.icon-category-search { background-image: url('../img/actions/search.svg?v=1'); } diff --git a/core/css/server.css b/core/css/server.css index 0276d4c9..f9390713 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -206,7 +206,8 @@ select { background-image: url("../img/actions/confirm.svg?v=2"); } /* Search ------------------------------------------------------------------- */ -.icon-search { +.icon-search, +.icon-category-search { background-image: url("../img/actions/search.svg?v=1"); } /* Recent ------------------------------------------------------------------- */ From 8b9807dba2d8857e17141321b73d53c27792822a Mon Sep 17 00:00:00 2001 From: Magnus Walbeck Date: Thu, 28 Jun 2018 14:11:50 +0800 Subject: [PATCH 5/9] Update README --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index e9d67f6e..423ebe81 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,6 @@ If you like the theme and would like to donate you can use the following cryptoc BTC: 1Pp3UG9k6ZkwrVXrhr9kwwvjwDk5Vchu3f BCH: 1C7dQLqMU6Kucxx9GcFDMnTTTsBpeNT9vo -LTC: LLii6QbQiHnkjq2TNcNYC3JafV4mWYXWnx -DOGE: DNsXstU98g61QtF4CKwL6NZE8UAf4eJSdC +LTC: LLii6QbQiHnkjq2TNcNYC3JafV4mWYXWnx Thank you. \ No newline at end of file From 5124ff377715bc062d00927181477a7595ab3b1e Mon Sep 17 00:00:00 2001 From: Magnus Walbeck Date: Sat, 30 Jun 2018 17:30:58 +0800 Subject: [PATCH 6/9] Styling for Passwords #21 --- core/css/apps/_notes.scss | 1 + core/css/apps/_passwords.scss | 232 ++++++++++++++++++++++++++++++++++ core/css/core/_apps.scss | 5 + core/css/core/_icons.scss | 5 + core/css/core/_server.scss | 1 + core/css/server.css | 114 ++++++++++++++++- core/css/server.scss | 3 +- 7 files changed, 358 insertions(+), 3 deletions(-) create mode 100644 core/css/apps/_passwords.scss diff --git a/core/css/apps/_notes.scss b/core/css/apps/_notes.scss index 8b26703a..b24122e5 100644 --- a/core/css/apps/_notes.scss +++ b/core/css/apps/_notes.scss @@ -67,6 +67,7 @@ .CodeMirror { background-color: $background-normal; color: $foreground-normal; + border-color: $decoration-normal; } .CodeMirror-cursor { diff --git a/core/css/apps/_passwords.scss b/core/css/apps/_passwords.scss new file mode 100644 index 00000000..e646089c --- /dev/null +++ b/core/css/apps/_passwords.scss @@ -0,0 +1,232 @@ +.app-passwords { + + #app-navigation { + + li { + color: $foreground-normal; + + &.active { + color: $foreground-active; + } + } + + .nav-icon-recent, + .nav-icon-security { + background-image: none; + } + } + + #app-content { + + // General styling for controls + #controls { + + .crumbmenu .menu, + .passwords-more-menu .menu { + border: none; + border-color: $decoration-normal; + transition: border .25s ease-in-out, max-height .25s ease-in-out; + } + + .crumbmenu.active .menu, + .passwords-more-menu.active .menu { + border: 1px solid $decoration-normal; + } + } + + // General styling for lists in app-content window + .item-list { + + .row { + border-bottom-color: $decoration-normal; + + &:hover { + background-color: $background-active-hover; + } + + &.header, + &.header .date { + color: $foreground-normal; + } + + .date { + color: $foreground-inactive; + } + + .genericIcon { + color: $foreground-normal; + } + + &.footer:hover { + background-color: $background-normal; + } + } + + .row .more { + + &:hover { + color: $foreground-normal; + } + + .popovermenu.bubble.menu li { + color: $foreground-normal; + opacity: 0.7; + + &:hover { + background-color: $background-active-hover; + color: $foreground-active; + opacity: 1; + } + + a { + color: $foreground-active; + } + } + } + } + + // Styling for Backup section + .backup-dialog { + + h1 { + border-color: $decoration-normal; + background-color: $background-dark; + + &::before { + color: $foreground-normal; + border-color: $decoration-normal; + } + } + } + + // Styling for help section + .help .handbook-page { + + blockquote { + border-left-color: $decoration-active; + background-color: $background-alternate; + } + + .md-image-container { + + .md-image-link { + border-color: $decoration-normal; + } + + .md-image-caption { + border-top-color: $decoration-normal; + color: $foreground-inactive; + } + } + } + + // App content sidebar + .app-content-right { + background-color: $background-normal; + border-left-color: $decoration-normal; + + .item-details { + + .infos { + color: $foreground-inactive; + + .tags-container { + color: #000; + } + } + + .tab-container .tab-titles .tab-title { + color: $foreground-normal; + + &.active { + color: $foreground-active; + } + } + + .details div:not(.header) { + color: $foreground-normal; + + span { + color: $foreground-normal; + } + } + } + } + } + + #app-popup { + + // Popup for creating new password + #passwords-create-new { + + .window { + background-color: $background-normal; + + // Popup header styling + .title { + color: $foreground-active !important; + background-color: $background-active-alternate !important; + } + + // Popup Content + form.content { + + .section-title, .open .foldout-title { + border-color: $decoration-normal !important; + } + + // Notes Editor + .notes-container { + + .editor-toolbar { + + a { + color: $foreground-normal !important; + + &:hover { + background-color: $background-normal; + border-color: $decoration-active; + } + + &.active { + background-color: $background-active; + border-color: $decoration-active; + } + } + + &.disabled-for-preview a:not(.no-disable) { + background-color: $background-alternate; + border: none; + } + } + + .CodeMirror .editor-preview { + background-color: $background-normal; + } + + .CodeMirror span.CodeMirror-selectedtext { + background-color: $background-active; + padding: 1px 0; + } + } + } + } + } + } +} + +// Yes button for creating new tag +.oc-dialog-buttonrow.twobuttons button.primary { + border-color: $decoration-normal; + + &:hover, &:active, &:focus { + border-color: $decoration-active; + } +} + +// Warning styling for reset and delete buttons in settings +.app-passwords #app-content .app-content-left.settings section.danger input[type="button"]:hover { + background-color: $background-negative !important; + border-color: $foreground-negative !important; + color: $foreground-active !important; +} \ No newline at end of file diff --git a/core/css/core/_apps.scss b/core/css/core/_apps.scss index d105ca97..31bf5ca9 100644 --- a/core/css/core/_apps.scss +++ b/core/css/core/_apps.scss @@ -194,6 +194,11 @@ /* App Settings ------------------------------------------------------------- */ +#app-navigation #app-settings { + background-color: $background-normal; + border-color: $decoration-normal; +} + #app-settings-header { border-color: $decoration-normal; background-color: $background-normal; diff --git a/core/css/core/_icons.scss b/core/css/core/_icons.scss index a571f7c0..cf4e3604 100644 --- a/core/css/core/_icons.scss +++ b/core/css/core/_icons.scss @@ -707,6 +707,11 @@ a.impersonate img.svg { filter: invert(95%); } +// Home icon in controls in passwords app +.app-passwords #app-content #controls img[src$="/core/img/places/home.svg"] { + filter: invert(95%); +} + // Apps with generic icons names .app-settings { diff --git a/core/css/core/_server.scss b/core/css/core/_server.scss index ddbe9308..25803366 100644 --- a/core/css/core/_server.scss +++ b/core/css/core/_server.scss @@ -137,6 +137,7 @@ div.crumb span.icon-shared, div.crumb span.icon-public { background-color: $background-normal; color: $foreground-normal; border: 1px solid $decoration-normal; + filter: none; &::after { border-bottom-color: $decoration-normal; diff --git a/core/css/server.css b/core/css/server.css index f9390713..8e01c3ea 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -505,6 +505,9 @@ a.impersonate img.svg { #ldapSettings .ui-accordion .ui-accordion-header .ui-accordion-header-icon { filter: invert(95%); } +.app-passwords #app-content #controls img[src$="/core/img/places/home.svg"] { + filter: invert(95%); } + .app-settings #app-navigation img[src$="/img/app-dark.svg"] { filter: invert(95%); } .app-settings #app-navigation img[src$="/settings/img/password.svg"], @@ -867,7 +870,8 @@ div.crumb span.icon-shared, div.crumb span.icon-public { .popovermenu { background-color: #31363b; color: #eff0f1; - border: 1px solid #706f6e; } + border: 1px solid #706f6e; + filter: none; } .popovermenu::after { border-bottom-color: #706f6e; } .popovermenu li > a { @@ -1424,6 +1428,10 @@ ul.multiselectoptions { color: #eff0f1; } /* App Settings ------------------------------------------------------------- */ +#app-navigation #app-settings { + background-color: #31363b; + border-color: #706f6e; } + #app-settings-header { border-color: #706f6e; background-color: #31363b; } @@ -2228,7 +2236,8 @@ textarea.message-body { .CodeMirror { background-color: #31363b; - color: #eff0f1; } + color: #eff0f1; + border-color: #706f6e; } .CodeMirror-cursor { border-left-color: rgba(189, 195, 199, 0.4); } @@ -2796,4 +2805,105 @@ button#deleteaccount { .app-quicknotes .quicknote .icon-delete:hover, .app-quicknotes .quicknote .icon-delete:focus { background-image: url("/core/css/../img/actions/delete-hover.svg?v=1"); } +.app-passwords #app-navigation li { + color: #eff0f1; } + .app-passwords #app-navigation li.active { + color: #fcfcfc; } +.app-passwords #app-navigation .nav-icon-recent, +.app-passwords #app-navigation .nav-icon-security { + background-image: none; } +.app-passwords #app-content #controls .crumbmenu .menu, +.app-passwords #app-content #controls .passwords-more-menu .menu { + border: none; + border-color: #706f6e; + transition: border .25s ease-in-out, max-height .25s ease-in-out; } +.app-passwords #app-content #controls .crumbmenu.active .menu, +.app-passwords #app-content #controls .passwords-more-menu.active .menu { + border: 1px solid #706f6e; } +.app-passwords #app-content .item-list .row { + border-bottom-color: #706f6e; } + .app-passwords #app-content .item-list .row:hover { + background-color: rgba(61, 174, 233, 0.25); } + .app-passwords #app-content .item-list .row.header, .app-passwords #app-content .item-list .row.header .date { + color: #eff0f1; } + .app-passwords #app-content .item-list .row .date { + color: #bdc3c7; } + .app-passwords #app-content .item-list .row .genericIcon { + color: #eff0f1; } + .app-passwords #app-content .item-list .row.footer:hover { + background-color: #31363b; } +.app-passwords #app-content .item-list .row .more:hover { + color: #eff0f1; } +.app-passwords #app-content .item-list .row .more .popovermenu.bubble.menu li { + color: #eff0f1; + opacity: 0.7; } + .app-passwords #app-content .item-list .row .more .popovermenu.bubble.menu li:hover { + background-color: rgba(61, 174, 233, 0.25); + color: #fcfcfc; + opacity: 1; } + .app-passwords #app-content .item-list .row .more .popovermenu.bubble.menu li a { + color: #fcfcfc; } +.app-passwords #app-content .backup-dialog h1 { + border-color: #706f6e; + background-color: #232629; } + .app-passwords #app-content .backup-dialog h1::before { + color: #eff0f1; + border-color: #706f6e; } +.app-passwords #app-content .help .handbook-page blockquote { + border-left-color: #3daee9; + background-color: #4d4d4d; } +.app-passwords #app-content .help .handbook-page .md-image-container .md-image-link { + border-color: #706f6e; } +.app-passwords #app-content .help .handbook-page .md-image-container .md-image-caption { + border-top-color: #706f6e; + color: #bdc3c7; } +.app-passwords #app-content .app-content-right { + background-color: #31363b; + border-left-color: #706f6e; } + .app-passwords #app-content .app-content-right .item-details .infos { + color: #bdc3c7; } + .app-passwords #app-content .app-content-right .item-details .infos .tags-container { + color: #000; } + .app-passwords #app-content .app-content-right .item-details .tab-container .tab-titles .tab-title { + color: #eff0f1; } + .app-passwords #app-content .app-content-right .item-details .tab-container .tab-titles .tab-title.active { + color: #fcfcfc; } + .app-passwords #app-content .app-content-right .item-details .details div:not(.header) { + color: #eff0f1; } + .app-passwords #app-content .app-content-right .item-details .details div:not(.header) span { + color: #eff0f1; } +.app-passwords #app-popup #passwords-create-new .window { + background-color: #31363b; } + .app-passwords #app-popup #passwords-create-new .window .title { + color: #fcfcfc !important; + background-color: #1d99f3 !important; } + .app-passwords #app-popup #passwords-create-new .window form.content .section-title, .app-passwords #app-popup #passwords-create-new .window form.content .open .foldout-title { + border-color: #706f6e !important; } + .app-passwords #app-popup #passwords-create-new .window form.content .notes-container .editor-toolbar a { + color: #eff0f1 !important; } + .app-passwords #app-popup #passwords-create-new .window form.content .notes-container .editor-toolbar a:hover { + background-color: #31363b; + border-color: #3daee9; } + .app-passwords #app-popup #passwords-create-new .window form.content .notes-container .editor-toolbar a.active { + background-color: #3daee9; + border-color: #3daee9; } + .app-passwords #app-popup #passwords-create-new .window form.content .notes-container .editor-toolbar.disabled-for-preview a:not(.no-disable) { + background-color: #4d4d4d; + border: none; } + .app-passwords #app-popup #passwords-create-new .window form.content .notes-container .CodeMirror .editor-preview { + background-color: #31363b; } + .app-passwords #app-popup #passwords-create-new .window form.content .notes-container .CodeMirror span.CodeMirror-selectedtext { + background-color: #3daee9; + padding: 1px 0; } + +.oc-dialog-buttonrow.twobuttons button.primary { + border-color: #706f6e; } + .oc-dialog-buttonrow.twobuttons button.primary:hover, .oc-dialog-buttonrow.twobuttons button.primary:active, .oc-dialog-buttonrow.twobuttons button.primary:focus { + border-color: #3daee9; } + +.app-passwords #app-content .app-content-left.settings section.danger input[type="button"]:hover { + background-color: #da4453 !important; + border-color: #da4453 !important; + color: #fcfcfc !important; } + /*# sourceMappingURL=server.css.map */ diff --git a/core/css/server.scss b/core/css/server.scss index 1d474d67..66a3a27a 100644 --- a/core/css/server.scss +++ b/core/css/server.scss @@ -47,4 +47,5 @@ @import 'apps/deck'; @import 'apps/fulltextsearch'; @import 'apps/weather'; -@import 'apps/quicknotes'; \ No newline at end of file +@import 'apps/quicknotes'; +@import 'apps/passwords'; \ No newline at end of file From ce623ebae600517e2457b0df978d234e724fe01a Mon Sep 17 00:00:00 2001 From: Magnus Walbeck Date: Tue, 10 Jul 2018 15:36:05 +0800 Subject: [PATCH 7/9] Fix styling for Passman #25 --- core/css/apps/_passman.scss | 33 +++++++++++++++++++++++++++++++-- core/css/server.css | 14 ++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/core/css/apps/_passman.scss b/core/css/apps/_passman.scss index 912c7aea..bb042d9e 100644 --- a/core/css/apps/_passman.scss +++ b/core/css/apps/_passman.scss @@ -1,7 +1,27 @@ .app-passman { - #app-navigation .taginput:hover { - background: none; + #app-navigation { + + .taginput:hover { + background: none; + } + + .nav-trashbin a { + background-color: $background-normal !important; + + &:hover { + background-color: $background-active-hover !important; + } + + &.active { + background-color: $background-active !important; + border-left: none; + } + } + + .nav-icon-systemtagsfilter { + background-image: none; + } } .link { @@ -124,6 +144,15 @@ border-color: $decoration-active; } } + + .icon-label .icon-picker .cell { + border-color: $decoration-normal; + background-color: $background-normal; + + &:hover { + border-color: $decoration-active; + } + } } } diff --git a/core/css/server.css b/core/css/server.css index 8e01c3ea..7d0ea9f5 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -2247,6 +2247,15 @@ textarea.message-body { .app-passman #app-navigation .taginput:hover { background: none; } +.app-passman #app-navigation .nav-trashbin a { + background-color: #31363b !important; } + .app-passman #app-navigation .nav-trashbin a:hover { + background-color: rgba(61, 174, 233, 0.25) !important; } + .app-passman #app-navigation .nav-trashbin a.active { + background-color: #3daee9 !important; + border-left: none; } +.app-passman #app-navigation .nav-icon-systemtagsfilter { + background-image: none; } .app-passman .link { color: #2980b9 !important; } .app-passman #app-content #app-content-wrapper .credential-table tr td { @@ -2315,6 +2324,11 @@ textarea.message-body { border: 1px solid #706f6e; } .app-passman #app-content .inputfile + label:hover { border-color: #3daee9; } +.app-passman #app-content .icon-label .icon-picker .cell { + border-color: #706f6e; + background-color: #31363b; } + .app-passman #app-content .icon-label .icon-picker .cell:hover { + border-color: #3daee9; } .vault_wrapper { box-shadow: none; From 72e9f6b91f281ab027476a4d3854b2b5d6ade9ee Mon Sep 17 00:00:00 2001 From: Magnus Walbeck Date: Tue, 10 Jul 2018 17:42:14 +0800 Subject: [PATCH 8/9] Add styling for Files Right click #26 --- core/css/apps/_files-rightclick.scss | 13 +++++++++++++ core/css/core/_server.scss | 9 +++++++++ core/css/server.css | 10 ++++++++++ core/css/server.scss | 3 ++- 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 core/css/apps/_files-rightclick.scss diff --git a/core/css/apps/_files-rightclick.scss b/core/css/apps/_files-rightclick.scss new file mode 100644 index 00000000..40d5ba0c --- /dev/null +++ b/core/css/apps/_files-rightclick.scss @@ -0,0 +1,13 @@ +#rightClickMenu { + + li.action-0 { + + &:hover { + background-color: $background-active-hover; + } + + > a:hover { + background-color: unset; + } + } +} \ No newline at end of file diff --git a/core/css/core/_server.scss b/core/css/core/_server.scss index 25803366..8e37e362 100644 --- a/core/css/core/_server.scss +++ b/core/css/core/_server.scss @@ -175,6 +175,15 @@ div.crumb span.icon-shared, div.crumb span.icon-public { } } +.bubble li > a { + color: $foreground-normal; + + &:hover { + background-color: $background-active-hover; + } +} + + #expanddiv { background-color: $background-normal; box-shadow: none; diff --git a/core/css/server.css b/core/css/server.css index 7d0ea9f5..9bb61357 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -894,6 +894,11 @@ div.crumb span.icon-shared, div.crumb span.icon-public { .bubble::after, .app-navigation-entry-menu::after { border-bottom-color: #706f6e; } +.bubble li > a { + color: #eff0f1; } + .bubble li > a:hover { + background-color: rgba(61, 174, 233, 0.25); } + #expanddiv { background-color: #31363b; box-shadow: none; @@ -2920,4 +2925,9 @@ button#deleteaccount { border-color: #da4453 !important; color: #fcfcfc !important; } +#rightClickMenu li.action-0:hover { + background-color: rgba(61, 174, 233, 0.25); } +#rightClickMenu li.action-0 > a:hover { + background-color: unset; } + /*# sourceMappingURL=server.css.map */ diff --git a/core/css/server.scss b/core/css/server.scss index 66a3a27a..d4518d4c 100644 --- a/core/css/server.scss +++ b/core/css/server.scss @@ -48,4 +48,5 @@ @import 'apps/fulltextsearch'; @import 'apps/weather'; @import 'apps/quicknotes'; -@import 'apps/passwords'; \ No newline at end of file +@import 'apps/passwords'; +@import 'apps/files-rightclick'; \ No newline at end of file From 1ed4095653baab3798cad825483def71fa07681e Mon Sep 17 00:00:00 2001 From: Magnus Walbeck Date: Tue, 10 Jul 2018 17:46:52 +0800 Subject: [PATCH 9/9] Bump version number --- core/css/server.css | 2 +- core/css/server.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index 9bb61357..5812a75b 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1,7 +1,7 @@ /* ============================================================================= * Nextcloud breeze dark theme -* Version: 13.0.3 +* Version: 13.0.4 * Check it out at https://github.com/mwalbeck/nextcloud-breeze-dark ============================================================================= */ diff --git a/core/css/server.scss b/core/css/server.scss index d4518d4c..ec86eb44 100644 --- a/core/css/server.scss +++ b/core/css/server.scss @@ -1,7 +1,7 @@ /* ============================================================================= * Nextcloud breeze dark theme -* Version: 13.0.3 +* Version: 13.0.4 * Check it out at https://github.com/mwalbeck/nextcloud-breeze-dark ============================================================================= */