aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/sass/application.scss2
-rw-r--r--client/src/sass/include/_variables.scss2
-rw-r--r--server/initializers/constants.ts3
3 files changed, 5 insertions, 2 deletions
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index b96cf07c0..bf4cccaaf 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -27,7 +27,7 @@ body {
27 --mainBackgroundColor: #{$bg-color}; 27 --mainBackgroundColor: #{$bg-color};
28 --mainForegroundColor: #{$fg-color}; 28 --mainForegroundColor: #{$fg-color};
29 --submenuColor: #{$sub-menu-color}; 29 --submenuColor: #{$sub-menu-color};
30 --inputColor: #{$input-color}; 30 --inputColor: #{$input-background-color};
31 --inputPlaceholderColor: #{$input-placeholder-color}; 31 --inputPlaceholderColor: #{$input-placeholder-color};
32 32
33 font-family: $main-fonts; 33 font-family: $main-fonts;
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index 0735a00a0..6ea48f800 100644
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -46,7 +46,7 @@ $video-thumbnail-width: 200px;
46 46
47$theater-bottom-space: 85px; 47$theater-bottom-space: 85px;
48 48
49$input-color: inherit; 49$input-background-color: $bg-color;
50$input-placeholder-color: #898989; 50$input-placeholder-color: #898989;
51 51
52/*** map theme ***/ 52/*** map theme ***/
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index efe27a241..ba8b9b6ed 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -755,6 +755,9 @@ function buildLanguages () {
755 }) 755 })
756 .forEach(l => languages[l.iso6391 || l.iso6393] = l.name) 756 .forEach(l => languages[l.iso6391 || l.iso6393] = l.name)
757 757
758 // Override Occitan label
759 languages['oc'] = 'Occitan'
760
758 return languages 761 return languages
759} 762}
760 763