aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRigel Kent <sendmemail@rigelk.eu>2018-09-20 20:57:18 +0200
committerRigel Kent <sendmemail@rigelk.eu>2018-09-20 20:57:18 +0200
commit1fd3ef3fb49cf5482f2ab6f827a2b059a44f409c (patch)
treeeee2ef647a5a099f03cfac15dc6c6869e57a4834
parentf845c68305f61686b5d3336fa9251afeae0c083a (diff)
downloadPeerTube-1fd3ef3fb49cf5482f2ab6f827a2b059a44f409c.tar.gz
PeerTube-1fd3ef3fb49cf5482f2ab6f827a2b059a44f409c.tar.zst
PeerTube-1fd3ef3fb49cf5482f2ab6f827a2b059a44f409c.zip
fix nav tab and tag color in dark theme
-rw-r--r--client/src/app/+admin/follows/following-add/following-add.component.scss7
-rw-r--r--client/src/app/videos/+video-edit/shared/video-edit.component.scss8
-rw-r--r--client/src/sass/application.scss5
-rw-r--r--client/src/sass/primeng-custom.scss17
4 files changed, 26 insertions, 11 deletions
diff --git a/client/src/app/+admin/follows/following-add/following-add.component.scss b/client/src/app/+admin/follows/following-add/following-add.component.scss
index 7594b502c..1baddc95f 100644
--- a/client/src/app/+admin/follows/following-add/following-add.component.scss
+++ b/client/src/app/+admin/follows/following-add/following-add.component.scss
@@ -5,6 +5,13 @@ textarea {
5 height: 250px; 5 height: 250px;
6} 6}
7 7
8.form-control {
9 &, &:focus {
10 background-color: var(--inputColor);
11 color: var(--mainForegroundColor);
12 }
13}
14
8input[type=submit] { 15input[type=submit] {
9 @include peertube-button; 16 @include peertube-button;
10 @include orange-button; 17 @include orange-button;
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.scss b/client/src/app/videos/+video-edit/shared/video-edit.component.scss
index 4d1871231..b039d7ad4 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.scss
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.scss
@@ -164,15 +164,17 @@ p-calendar {
164 tag-input-form { 164 tag-input-form {
165 input { 165 input {
166 height: 30px !important; 166 height: 30px !important;
167 background-color: #fff !important; 167
168 background-color: var(--mainBackgroundColor) !important;
169 color: var(--mainForegroundColor) !important;
168 } 170 }
169 } 171 }
170 172
171 tag { 173 tag {
172 background-color: #E5E5E5 !important; 174 background-color: var(--inputColor) !important;
173 border-radius: 3px !important; 175 border-radius: 3px !important;
174 font-size: 15px !important; 176 font-size: 15px !important;
175 color: #000 !important; 177 color: var(--mainForegroundColor) !important;
176 height: 30px !important; 178 height: 30px !important;
177 line-height: 30px !important; 179 line-height: 30px !important;
178 margin: 0 5px 0 0 !important; 180 margin: 0 5px 0 0 !important;
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index f21b91d2e..bc443b8d5 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -283,6 +283,11 @@ ngb-tabset.bootstrap {
283 } 283 }
284} 284}
285 285
286.nav-tabs .nav-link.active {
287 background-color: var(--mainBackgroundColor) !important;
288 border-bottom: none;
289}
290
286.orange-button { 291.orange-button {
287 @include peertube-button; 292 @include peertube-button;
288 @include orange-button; 293 @include orange-button;
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss
index d99c5b96a..da6799250 100644
--- a/client/src/sass/primeng-custom.scss
+++ b/client/src/sass/primeng-custom.scss
@@ -7,7 +7,7 @@
7@mixin glyphicon-light { 7@mixin glyphicon-light {
8 font-family: 'Glyphicons Halflings'; 8 font-family: 'Glyphicons Halflings';
9 text-decoration: none !important; 9 text-decoration: none !important;
10 color: #000 !important; 10 color: var(--mainForegroundColor) !important;
11} 11}
12 12
13// data table customizations 13// data table customizations
@@ -33,7 +33,7 @@ p-table {
33 .ui-table-tbody { 33 .ui-table-tbody {
34 tr { 34 tr {
35 &:hover { 35 &:hover {
36 background-color: #f0f0f0 !important; 36 background-color: var(--submenuColor) !important;
37 } 37 }
38 38
39 &:not(:hover) { 39 &:not(:hover) {
@@ -60,15 +60,15 @@ p-table {
60 60
61 th { 61 th {
62 border: none !important; 62 border: none !important;
63 border-bottom: 1px solid #f0f0f0 !important; 63 border-bottom: 1px solid var(--submenuColor) !important;
64 text-align: left !important; 64 text-align: left !important;
65 padding: 5px 0 5px 15px !important; 65 padding: 5px 0 5px 15px !important;
66 font-weight: $font-semibold !important; 66 font-weight: $font-semibold !important;
67 color: #000 !important; 67 color: var(--mainForegroundColor) !important;
68 68
69 &.ui-sortable-column:hover { 69 &.ui-sortable-column:hover {
70 background-color: #f0f0f0 !important; 70 background-color: var(--submenuColor) !important;
71 border: 1px solid #f0f0f0 !important; 71 border: 1px solid var(--submenuColor) !important;
72 border-width: 0 1px !important; 72 border-width: 0 1px !important;
73 73
74 &:first-child { 74 &:first-child {
@@ -77,7 +77,7 @@ p-table {
77 } 77 }
78 78
79 &.ui-state-highlight { 79 &.ui-state-highlight {
80 background-color: #fff !important; 80 background-color:var(--submenuColor) !important;
81 81
82 .pi { 82 .pi {
83 @extend .glyphicon; 83 @extend .glyphicon;
@@ -109,8 +109,9 @@ p-table {
109 109
110 p-paginator { 110 p-paginator {
111 .ui-paginator-bottom { 111 .ui-paginator-bottom {
112 background-color: var(--mainBackgroundColor) !important;
112 position: relative; 113 position: relative;
113 border: 1px solid #f0f0f0 !important; 114 border: 1px solid var(--submenuColor) !important;
114 height: 40px; 115 height: 40px;
115 display: flex; 116 display: flex;
116 justify-content: center; 117 justify-content: center;