From 791645e620fb98c6e7c32271d91d91ff7e41b892 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 8 Oct 2018 15:15:11 +0200 Subject: Add bulk actions in users table --- client/src/sass/primeng-custom.scss | 38 ++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) (limited to 'client/src/sass') diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 5a03ac9c5..4a19e0275 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -14,8 +14,11 @@ p-table { font-size: 15px !important; + .ui-table-caption { + border: none; + } + td { - // border: 1px solid #E5E5E5 !important; padding-left: 15px !important; &:not(.action-cell) { @@ -28,6 +31,11 @@ p-table { tr { background-color: var(--mainBackgroundColor) !important; height: 46px; + + &.ui-state-highlight { + background-color:var(--submenuColor) !important; + color:var(--mainForegroundColor) !important; + } } .ui-table-tbody { @@ -216,4 +224,32 @@ p-calendar .ui-datepicker { @include glyphicon-light; } } +} + +.ui-chkbox-box { + &.ui-state-active { + border-color: var(--mainColor) !important; + background-color: var(--mainColor) !important; + } + + .ui-chkbox-icon { + position: relative; + + &:after { + content: ''; + position: absolute; + left: 5px; + width: 5px; + height: 12px; + opacity: 0; + transform: rotate(45deg) scale(0); + border-right: 2px solid var(--mainBackgroundColor); + border-bottom: 2px solid var(--mainBackgroundColor); + } + + &.pi-check:after { + opacity: 1; + transform: rotate(45deg) scale(1); + } + } } \ No newline at end of file -- cgit v1.2.3 From b014b6b9c7cb68d09c52b44046afe486c0736426 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 10 Oct 2018 09:43:53 +0200 Subject: Add ability to search on followers/following --- client/src/sass/primeng-custom.scss | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'client/src/sass') diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 4a19e0275..0568de4e2 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -16,6 +16,12 @@ p-table { .ui-table-caption { border: none; + + .caption { + height: 40px; + display: flex; + align-items: center; + } } td { -- cgit v1.2.3 From 017c3dcadf71aef4c1a854e4867b77931747f06e Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 10 Oct 2018 14:35:55 +0200 Subject: Add ability to list all local videos on client --- client/src/sass/include/_mixins.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'client/src/sass') diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 2efd6a1d3..b25d7ae0f 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -29,7 +29,7 @@ display: block; /* Fallback for non-webkit */ display: -webkit-box; - max-height: $font-size*$line-height*$lines-to-show; + max-height: $font-size*$line-height*$lines-to-show + 0.2; /* Fallback for non-webkit */ font-size: $font-size; line-height: $line-height; -- cgit v1.2.3 From 65b21c961c69c4a63c7c0c34be3d6d034a1176c7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 15 Oct 2018 16:43:14 +0200 Subject: Add ability to mute a user/instance by server in client --- client/src/sass/include/_bootstrap-variables.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'client/src/sass') diff --git a/client/src/sass/include/_bootstrap-variables.scss b/client/src/sass/include/_bootstrap-variables.scss index ce2532af5..77a20cfe1 100644 --- a/client/src/sass/include/_bootstrap-variables.scss +++ b/client/src/sass/include/_bootstrap-variables.scss @@ -29,4 +29,6 @@ $input-btn-focus-color: inherit; $input-focus-border-color: #ced4da; $nav-pills-link-active-bg: #F0F0F0; -$nav-pills-link-active-color: #000; \ No newline at end of file +$nav-pills-link-active-color: #000; + +$zindex-dropdown: 10000; \ No newline at end of file -- cgit v1.2.3 From 650e3d5ce380026cc79bcd271915cf7e6f51c24c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 15 Nov 2018 11:54:09 +0100 Subject: Fix miniature with a long name --- client/src/sass/include/_mixins.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'client/src/sass') diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index b25d7ae0f..d6f391a45 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -29,7 +29,7 @@ display: block; /* Fallback for non-webkit */ display: -webkit-box; - max-height: $font-size*$line-height*$lines-to-show + 0.2; + max-height: $font-size * $line-height * $lines-to-show; /* Fallback for non-webkit */ font-size: $font-size; line-height: $line-height; @@ -511,4 +511,4 @@ } } } -} \ No newline at end of file +} -- cgit v1.2.3 From fe05c3acbd48c72ac7e503bebde91830121a0bf1 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 16 Nov 2018 09:16:41 +0100 Subject: Fix player progress bar when changing resolution --- client/src/sass/player/settings-menu.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'client/src/sass') diff --git a/client/src/sass/player/settings-menu.scss b/client/src/sass/player/settings-menu.scss index d065e72fb..61965c85e 100644 --- a/client/src/sass/player/settings-menu.scss +++ b/client/src/sass/player/settings-menu.scss @@ -171,7 +171,7 @@ $setting-transition-easing: ease-out; left: 8px; content: ' '; margin-top: 1px; - background-image: url('#{$assets-path}/player/images/tick.svg'); + background-image: url('#{$assets-path}/player/images/tick-white.svg'); } } } @@ -197,4 +197,4 @@ $setting-transition-easing: ease-out; } } } -} \ No newline at end of file +} -- cgit v1.2.3 From 276d96529529621d5f70473990095495f2743c29 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 18 Dec 2018 11:32:37 +0100 Subject: Add ability to disable and clear history --- client/src/sass/primeng-custom.scss | 68 +++++++++++++++++++++++++++++-------- 1 file changed, 54 insertions(+), 14 deletions(-) (limited to 'client/src/sass') diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 0568de4e2..1d6eebcfa 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -2,7 +2,7 @@ @import '_mixins'; @import '~primeng/resources/primeng.css'; -@import '~primeng/resources/themes/bootstrap/theme.css'; +@import '~primeng/resources/themes/nova-light/theme.css'; @mixin glyphicon-light { font-family: 'Glyphicons Halflings'; @@ -12,10 +12,9 @@ // data table customizations p-table { - font-size: 15px !important; - .ui-table-caption { - border: none; + border: none !important; + background-color: #fff !important; .caption { height: 40px; @@ -24,6 +23,17 @@ p-table { } } + th { + background-color: #fff !important; + outline: 0; + } + + td, th { + font-family: $main-fonts; + font-size: 15px !important; + color: var(--mainForegroundColor) !important; + } + td { padding-left: 15px !important; @@ -35,12 +45,16 @@ p-table { } tr { + outline: 0; background-color: var(--mainBackgroundColor) !important; height: 46px; &.ui-state-highlight { - background-color:var(--submenuColor) !important; - color:var(--mainForegroundColor) !important; + background-color: var(--submenuColor) !important; + + td, td > a { + color: var(--mainForegroundColor) !important; + } } } @@ -56,6 +70,10 @@ p-table { } } + td { + border: none !important; + } + &:first-child td { border-top: none !important; } @@ -93,14 +111,14 @@ p-table { } &.ui-state-highlight { - background-color:var(--submenuColor) !important; + background-color: var(--submenuColor) !important; .pi { @extend .glyphicon; - color: #000; - font-size: 11px; - top: 0; + color: #000 !important; + font-size: 11px !important; + top: 0 !important; &.pi-sort-up { @extend .glyphicon-triangle-top; @@ -177,11 +195,12 @@ p-table { a { color: #000 !important; font-weight: $font-semibold !important; - margin: 0 10px !important; + margin: 0 5px !important; outline: 0 !important; border-radius: 3px !important; padding: 5px 2px !important; height: auto !important; + line-height: initial !important; &.ui-state-active { &, &:hover, &:active, &:focus { @@ -210,11 +229,23 @@ p-calendar .ui-datepicker { .ui-datepicker-next { @extend .glyphicon-chevron-right; @include glyphicon-light; + + text-align: right; + + .pi.pi-chevron-right { + display: none !important; + } } .ui-datepicker-prev { @extend .glyphicon-chevron-left; @include glyphicon-light; + + text-align: left; + + .pi.pi-chevron-left { + display: none !important; + } } } @@ -232,6 +263,7 @@ p-calendar .ui-datepicker { } } + .ui-chkbox-box { &.ui-state-active { border-color: var(--mainColor) !important; @@ -240,13 +272,15 @@ p-calendar .ui-datepicker { .ui-chkbox-icon { position: relative; + overflow: visible !important; &:after { content: ''; position: absolute; - left: 5px; + top: 1px; + left: 7px; width: 5px; - height: 12px; + height: 13px; opacity: 0; transform: rotate(45deg) scale(0); border-right: 2px solid var(--mainBackgroundColor); @@ -258,4 +292,10 @@ p-calendar .ui-datepicker { transform: rotate(45deg) scale(1); } } -} \ No newline at end of file +} + +p-inputswitch { + .ui-inputswitch-checked .ui-inputswitch-slider { + background-color: var(--mainColor) !important; + } +} -- cgit v1.2.3 From f8b2c1b4f509c037b9650cca2c5befd21f056df3 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 19 Dec 2018 16:04:34 +0100 Subject: Refractor notification service Shorter name and use primeng component --- client/src/sass/primeng-custom.scss | 45 +++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'client/src/sass') diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 1d6eebcfa..21452fa16 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -299,3 +299,48 @@ p-inputswitch { background-color: var(--mainColor) !important; } } + +p-toast { + .ui-toast-message { + font-family: $main-fonts; + + &.ui-toast-message-success { + color: #fff !important; + background-color: #8BC34A !important; + } + + &.ui-toast-message-error { + color: #fff !important; + background-color: #F44336 !important; + } + + &.ui-toast-message-info { + color: #fff !important; + background-color: #03A9F4 !important; + } + + &.ui-toast-message-info { + color: #fff !important; + background-color: #03A9F4 !important; + } + + .message { + float: left; + + h3 { + font-size: 21px; + } + + p { + font-size: 15px; + } + } + + .glyphicon { + float: right; + font-size: 32px; + margin-top: 15px; + margin-right: 5px; + } + } +} -- cgit v1.2.3 From 4707f410ae44b55e17e1758693dd21cff03b7ef1 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 20 Dec 2018 11:18:29 +0100 Subject: Fix notification with large message --- client/src/sass/primeng-custom.scss | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'client/src/sass') diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 21452fa16..8b3e0b813 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -324,23 +324,24 @@ p-toast { background-color: #03A9F4 !important; } - .message { - float: left; + .notification-block { + display: flex; - h3 { - font-size: 21px; - } + .message { + h3 { + font-size: 21px; + } - p { - font-size: 15px; + p { + font-size: 15px; + } } - } - .glyphicon { - float: right; - font-size: 32px; - margin-top: 15px; - margin-right: 5px; + .glyphicon { + font-size: 32px; + margin-top: 15px; + margin-right: 5px; + } } } } -- cgit v1.2.3 From 6e7e63b83f08ba68edc2bb9f72ff03d1802e45df Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 31 Dec 2018 13:06:11 +0100 Subject: Fix notification icon position --- client/src/sass/primeng-custom.scss | 2 ++ 1 file changed, 2 insertions(+) (limited to 'client/src/sass') diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 8b3e0b813..05db2a2cb 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -328,6 +328,8 @@ p-toast { display: flex; .message { + flex-grow: 1; + h3 { font-size: 21px; } -- cgit v1.2.3 From 2f1548fda32c3ba9e53913270394eedfacd55986 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 8 Jan 2019 11:26:41 +0100 Subject: Add notifications in the client --- client/src/sass/include/_bootstrap-variables.scss | 3 ++- client/src/sass/primeng-custom.scss | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'client/src/sass') diff --git a/client/src/sass/include/_bootstrap-variables.scss b/client/src/sass/include/_bootstrap-variables.scss index 77a20cfe1..7f413836b 100644 --- a/client/src/sass/include/_bootstrap-variables.scss +++ b/client/src/sass/include/_bootstrap-variables.scss @@ -31,4 +31,5 @@ $input-focus-border-color: #ced4da; $nav-pills-link-active-bg: #F0F0F0; $nav-pills-link-active-color: #000; -$zindex-dropdown: 10000; \ No newline at end of file +$zindex-dropdown: 10000; +$zindex-popover: 10000; diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 05db2a2cb..58a6a0004 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -326,6 +326,8 @@ p-toast { .notification-block { display: flex; + align-items: center; + padding: 5px; .message { flex-grow: 1; @@ -336,12 +338,12 @@ p-toast { p { font-size: 15px; + margin-bottom: 0; } } .glyphicon { font-size: 32px; - margin-top: 15px; margin-right: 5px; } } -- cgit v1.2.3 From 3195cd1c118f5e020ab7e635d5a3dcdad2108b1a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 15 Jan 2019 09:25:26 +0100 Subject: Fix notification z-index on modals --- client/src/sass/primeng-custom.scss | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'client/src/sass') diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 58a6a0004..6057b1db0 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -301,6 +301,11 @@ p-inputswitch { } p-toast { + .ui-toast { + // Modal is 10005 + z-index: 10010 !important; + } + .ui-toast-message { font-family: $main-fonts; -- cgit v1.2.3 From 457bb213b273a9b206cc5654eb085cede4e916ad Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 16 Jan 2019 16:05:40 +0100 Subject: Refactor how we use icons Inject them in an angular component so we can easily change their color --- client/src/sass/application.scss | 9 +++--- client/src/sass/include/_mixins.scss | 49 +++++++++++++++++++++++---------- client/src/sass/include/_variables.scss | 9 ++++-- 3 files changed, 45 insertions(+), 22 deletions(-) (limited to 'client/src/sass') diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 2356f9837..37837bfc0 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -23,7 +23,7 @@ body { // now beware node-sass requires interpolation // for css custom properties #{$var} --mainColor: #{$orange-color}; - --mainHoverColor: #{$orange-hoover-color}; + --mainHoverColor: #{$orange-hover-color}; --mainBackgroundColor: #{$bg-color}; --mainForegroundColor: #{$fg-color}; --menuBackgroundColor: #{$menu-background}; @@ -229,13 +229,12 @@ label { font-weight: $font-semibold; } - .close { + my-global-icon { @include icon(24px); position: relative; top: 3px; float: right; - background-image: url('../assets/images/global/cross.svg'); margin: 0; padding: 0; @@ -324,7 +323,7 @@ ngb-tabset.bootstrap { table { .action-button-edit, .action-button-delete { &:hover, &:active, &:focus, &[disabled], &.disabled { - background-color: $grey-color !important; + background-color: $grey-background-color !important; } } } @@ -389,4 +388,4 @@ table { } } } -} \ No newline at end of file +} diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index d6f391a45..1da240db8 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -55,6 +55,18 @@ hyphens: auto; } +@mixin apply-svg-color ($color) { + /deep/ svg { + path[fill="#000000"], g[fill="#000000"], rect[fill="#000000"] { + fill: $color; + } + + path[stroke="#000000"], g[stroke="#000000"], rect[stroke="#000000"] { + stroke: $color; + } + } +} + @mixin peertube-input-text($width) { display: inline-block; height: $button-height; @@ -110,22 +122,30 @@ color: #fff; background-color: #C6C6C6; } + + my-global-icon { + @include apply-svg-color(#fff) + } } @mixin grey-button { &, &:active, &:focus { - background-color: $grey-color; - color: #585858; + background-color: $grey-background-color; + color: $grey-foreground-color; } &:hover, &:active, &:focus, &[disabled], &.disabled { - color: #585858; - background-color: $grey-hoover-color; + color: $grey-foreground-color; + background-color: $grey-background-hover-color; } &[disabled], &.disabled { cursor: default; } + + my-global-icon { + @include apply-svg-color($grey-foreground-color) + } } @mixin peertube-button { @@ -148,6 +168,15 @@ @include peertube-button; } +@mixin button-with-icon($width: 20px, $margin-right: 3px, $top: -1px) { + my-global-icon { + position: relative; + width: $width; + margin-right: $margin-right; + top: $top; + } +} + @mixin peertube-button-file ($width) { position: relative; overflow: hidden; @@ -455,18 +484,10 @@ } } -@mixin create-button ($imageUrl) { +@mixin create-button { @include peertube-button-link; @include orange-button; - - .icon.icon-add { - @include icon(20px); - - position: relative; - top: -1px; - margin-right: 5px; - background-image: url($imageUrl); - } + @include button-with-icon(20px, 5px, -1px); } @mixin row-blocks { diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index fdf33b12a..3780b7501 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss @@ -6,10 +6,13 @@ $font-regular: 400; $font-semibold: 600; $font-bold: 700; -$grey-color: #E5E5E5; -$grey-hoover-color: #EFEFEF;; +$grey-background-color: #E5E5E5; +$grey-background-hover-color: #EFEFEF; +$grey-foreground-color: #585858; +$grey-foreground-hover-color: #303030; + $orange-color: #F1680D; -$orange-hoover-color: #F97D46; +$orange-hover-color: #F97D46; $bg-color: #fff; $fg-color: #000; -- cgit v1.2.3 From 17bb716bc49b30cc8f22e32f73b9b53ab9ae560d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 17 Jan 2019 11:16:08 +0100 Subject: Fix some styles Video edit tags, dropdown actions font ... --- client/src/sass/include/_mixins.scss | 1 + client/src/sass/primeng-custom.scss | 55 +++++++++++++++++++++--------------- 2 files changed, 34 insertions(+), 22 deletions(-) (limited to 'client/src/sass') diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 1da240db8..8749649d3 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -76,6 +76,7 @@ border-radius: 3px; padding-left: 15px; padding-right: 15px; + font-size: 15px; &::placeholder { color: var(--inputPlaceholderColor); diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 6057b1db0..7ba011180 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -263,33 +263,40 @@ p-calendar .ui-datepicker { } } +.ui-chkbox { -.ui-chkbox-box { - &.ui-state-active { - border-color: var(--mainColor) !important; - background-color: var(--mainColor) !important; + &, .ui-chkbox-box { + width: 18px !important; + height: 18px !important; } - .ui-chkbox-icon { - position: relative; - overflow: visible !important; - - &:after { - content: ''; - position: absolute; - top: 1px; - left: 7px; - width: 5px; - height: 13px; - opacity: 0; - transform: rotate(45deg) scale(0); - border-right: 2px solid var(--mainBackgroundColor); - border-bottom: 2px solid var(--mainBackgroundColor); + .ui-chkbox-box { + &.ui-state-active { + border-color: var(--mainColor) !important; + background-color: var(--mainColor) !important; } - &.pi-check:after { - opacity: 1; - transform: rotate(45deg) scale(1); + .ui-chkbox-icon { + position: relative; + overflow: visible !important; + + &:after { + content: ''; + position: absolute; + top: 1px; + left: 6px; + width: 5px; + height: 12px; + opacity: 0; + transform: rotate(45deg) scale(0); + border-right: 2px solid var(--mainBackgroundColor); + border-bottom: 2px solid var(--mainBackgroundColor); + } + + &.pi-check:after { + opacity: 1; + transform: rotate(45deg) scale(1); + } } } } @@ -354,3 +361,7 @@ p-toast { } } } + +.ui-widget { + font-family: $main-fonts !important; +} -- cgit v1.2.3 From f2fab901df31a0e7081f4bb225f28e98798950b0 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 17 Jan 2019 11:30:47 +0100 Subject: Fix invisible things in dark mode --- client/src/sass/application.scss | 4 ++++ client/src/sass/include/_mixins.scss | 4 ++-- client/src/sass/primeng-custom.scss | 8 ++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) (limited to 'client/src/sass') diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 37837bfc0..783464f86 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -290,6 +290,10 @@ ngb-tabset.bootstrap { @include disable-default-a-behaviour; color: var(--mainForegroundColor) !important; + + &.active { + color: #000 !important; + } } } } diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 8749649d3..5b3346508 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -57,11 +57,11 @@ @mixin apply-svg-color ($color) { /deep/ svg { - path[fill="#000000"], g[fill="#000000"], rect[fill="#000000"] { + path[fill="#000000"], g[fill="#000000"], rect[fill="#000000"], circle[fill="#000000"] { fill: $color; } - path[stroke="#000000"], g[stroke="#000000"], rect[stroke="#000000"] { + path[stroke="#000000"], g[stroke="#000000"], rect[stroke="#000000"], circle[stroke="#000000"] { stroke: $color; } } diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 7ba011180..b3aac9d16 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -14,7 +14,7 @@ p-table { .ui-table-caption { border: none !important; - background-color: #fff !important; + background-color: var(--mainBackgroundColor) !important; .caption { height: 40px; @@ -24,7 +24,7 @@ p-table { } th { - background-color: #fff !important; + background-color: var(--mainBackgroundColor) !important; outline: 0; } @@ -122,10 +122,14 @@ p-table { &.pi-sort-up { @extend .glyphicon-triangle-top; + + color: var(--mainForegroundColor) !important; } &.pi-sort-down { @extend .glyphicon-triangle-bottom; + + color: var(--mainForegroundColor) !important; } } } -- cgit v1.2.3 From aa87909287c4f4d38696244e32828265b040c7d5 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 17 Jan 2019 11:51:08 +0100 Subject: Fix calendar in dark mode --- client/src/sass/application.scss | 8 ++++---- client/src/sass/include/_mixins.scss | 4 ++++ client/src/sass/primeng-custom.scss | 8 +++++++- 3 files changed, 15 insertions(+), 5 deletions(-) (limited to 'client/src/sass') diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 783464f86..478737a43 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -290,12 +290,12 @@ ngb-tabset.bootstrap { @include disable-default-a-behaviour; color: var(--mainForegroundColor) !important; - - &.active { - color: #000 !important; - } } } + + .nav-pills .nav-link.active { + color: #000 !important; + } } .nav-tabs .nav-link.active { diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 5b3346508..e18e9ae9d 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -261,6 +261,10 @@ color: transparent; text-shadow: 0 0 0 #000; } + + option { + color: #000; + } } } diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index b3aac9d16..6e502b028 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -197,7 +197,7 @@ p-table { height: auto !important; a { - color: #000 !important; + color: var(--mainForegroundColor) !important; font-weight: $font-semibold !important; margin: 0 5px !important; outline: 0 !important; @@ -234,6 +234,7 @@ p-calendar .ui-datepicker { @extend .glyphicon-chevron-right; @include glyphicon-light; + color: #000 !important; text-align: right; .pi.pi-chevron-right { @@ -245,6 +246,7 @@ p-calendar .ui-datepicker { @extend .glyphicon-chevron-left; @include glyphicon-light; + color: #000 !important; text-align: left; .pi.pi-chevron-left { @@ -258,11 +260,15 @@ p-calendar .ui-datepicker { .pi.pi-chevron-up { @extend .glyphicon-chevron-up; @include glyphicon-light; + + color: #000 !important; } .pi.pi-chevron-down { @extend .glyphicon-chevron-down; @include glyphicon-light; + + color: #000 !important; } } } -- cgit v1.2.3