diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-08-12 10:47:19 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-08-12 10:47:19 +0000 |
| commit | a64fbe661fae18d78be778bbb242eb7c4428f1fe (patch) | |
| tree | 416b97904fbe2fc12ad8f31194eef48823995d6f /src | |
| parent | e21f78e519e4d820fa7ffa76d7273489b106761a (diff) | |
| parent | 3373d287012d66c642249bbe2da48febaa69b12e (diff) | |
Merge branch 'fixSelectOptionStyling' into 'develop'
Fixes selects having unreadable text on some browsers/OSes.
Closes #123
See merge request pleroma/pleroma-fe!296
Diffstat (limited to 'src')
| -rw-r--r-- | src/App.scss | 7 | ||||
| -rw-r--r-- | src/components/style_switcher/style_switcher.vue | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/App.scss b/src/App.scss index f830a33b..2426b998 100644 --- a/src/App.scss +++ b/src/App.scss @@ -168,6 +168,13 @@ input, textarea, .select { } } +option { + color: $fallback--fg; + color: var(--fg, $fallback--fg); + background-color: $fallback--bg; + background-color: var(--bg, $fallback--bg); +} + i[class*=icon-] { color: $fallback--icon; color: var(--icon, $fallback--icon) diff --git a/src/components/style_switcher/style_switcher.vue b/src/components/style_switcher/style_switcher.vue index 7acba1dc..112bbc1e 100644 --- a/src/components/style_switcher/style_switcher.vue +++ b/src/components/style_switcher/style_switcher.vue @@ -3,7 +3,10 @@ <div>{{$t('settings.presets')}} <label for="style-switcher" class='select'> <select id="style-switcher" v-model="selected" class="style-switcher"> - <option v-for="style in availableStyles" :value="style">{{style[0]}}</option> + <option v-for="style in availableStyles" :value="style" :style="{ + backgroundColor: style[1], + color: style[3] + }">{{style[0]}}</option> </select> <i class="icon-down-open"/> </label> |