From fb3b7ffd394b54e44bedea2a48f2146fcdd630aa Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Sat, 31 Mar 2018 12:50:51 +0200 Subject: Use less busy default background. --- static/aurora_borealis.jpg | Bin 0 -> 642707 bytes static/bg.jpg | Bin 229574 -> 0 bytes static/bg2.jpg | Bin 0 -> 229574 bytes static/config.json | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 static/aurora_borealis.jpg delete mode 100644 static/bg.jpg create mode 100644 static/bg2.jpg (limited to 'static') diff --git a/static/aurora_borealis.jpg b/static/aurora_borealis.jpg new file mode 100644 index 00000000..b6a0daf9 Binary files /dev/null and b/static/aurora_borealis.jpg differ diff --git a/static/bg.jpg b/static/bg.jpg deleted file mode 100644 index 60e2311a..00000000 Binary files a/static/bg.jpg and /dev/null differ diff --git a/static/bg2.jpg b/static/bg2.jpg new file mode 100644 index 00000000..60e2311a Binary files /dev/null and b/static/bg2.jpg differ diff --git a/static/config.json b/static/config.json index 6c9c27da..9863ec02 100644 --- a/static/config.json +++ b/static/config.json @@ -1,6 +1,6 @@ { "theme": "pleroma-dark", - "background": "/static/bg.jpg", + "background": "/static/aurora_borealis.jpg", "logo": "/static/logo.png", "defaultPath": "/main/all", "chatDisabled": false, -- cgit v1.2.3-70-g09d2 From 65f82cf29438fc898cb7733f7bfc8a7868e6f4af Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sat, 7 Apr 2018 21:58:29 +0300 Subject: in a decent way. Needs different markup - // -webkit-appearance:none; - // -moz-appearance:none; - // appearance:none; + select { + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + background: transparent; + border: none; + margin: 0; + color: $fallback--fg; + color: var(--fg, $fallback--fg); + padding: 4px 3ch 3px 3px; + width: 100%; + z-index: 1; + } &[type=radio], &[type=checkbox] { @@ -185,7 +213,7 @@ nav { height: 50px; background-repeat: no-repeat; background-position: center; - background-size: contain; + background-size: auto 80%; a i { color: $fallback--link; diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue index 65dc3bab..04f6add4 100644 --- a/src/components/attachment/attachment.vue +++ b/src/components/attachment/attachment.vue @@ -41,6 +41,11 @@ flex: 0 0 auto; max-height: 300px; max-width: 100%; + line-height: 0; + + video { + max-height: 300px; + } } .attachment { diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index 0f99b3b1..929f81ee 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -103,8 +103,8 @@ .attachment { position: relative; - border: $fallback--border; - border: var(--border, $fallback--border); + border: 1px solid $fallback--border; + border: 1px solid var(--border, $fallback--border); margin: 0.5em 0.8em 0.2em 0; } diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue index 5695c554..5fefe714 100644 --- a/src/components/still-image/still-image.vue +++ b/src/components/still-image/still-image.vue @@ -10,53 +10,55 @@ diff --git a/src/components/style_switcher/style_switcher.js b/src/components/style_switcher/style_switcher.js index 5e5ba266..e6b80ac9 100644 --- a/src/components/style_switcher/style_switcher.js +++ b/src/components/style_switcher/style_switcher.js @@ -6,7 +6,7 @@ export default { availableStyles: [], selected: this.$store.state.config.theme, bgColorLocal: '', - fgColorLocal: '', + btnColorLocal: '', textColorLocal: '', linkColorLocal: '', redColorLocal: '#ff0000', @@ -26,7 +26,7 @@ export default { }, mounted () { this.bgColorLocal = rgbstr2hex(this.$store.state.config.colors.bg) - this.fgColorLocal = rgbstr2hex(this.$store.state.config.colors.lightBg) + this.btnColorLocal = rgbstr2hex(this.$store.state.config.colors.lightBg) this.textColorLocal = rgbstr2hex(this.$store.state.config.colors.fg) this.linkColorLocal = rgbstr2hex(this.$store.state.config.colors.link) @@ -37,7 +37,7 @@ export default { }, methods: { setCustomTheme () { - if (!this.bgColorLocal && !this.fgColorLocal && !this.linkColorLocal) { + if (!this.bgColorLocal && !this.btnColorLocal && !this.linkColorLocal) { // reset to picked themes } const rgb = (hex) => { @@ -49,7 +49,7 @@ export default { } : null } const bgRgb = rgb(this.bgColorLocal) - const fgRgb = rgb(this.fgColorLocal) + const btnRgb = rgb(this.btnColorLocal) const textRgb = rgb(this.textColorLocal) const linkRgb = rgb(this.linkColorLocal) @@ -58,11 +58,11 @@ export default { const greenRgb = rgb(this.greenColorLocal) const orangeRgb = rgb(this.orangeColorLocal) - if (bgRgb && fgRgb && linkRgb) { + if (bgRgb && btnRgb && linkRgb) { this.$store.dispatch('setOption', { name: 'customTheme', value: { - fg: fgRgb, + fg: btnRgb, bg: bgRgb, text: textRgb, link: linkRgb, @@ -77,12 +77,12 @@ export default { watch: { selected () { this.bgColorLocal = this.selected[1] - this.fgColorLocal = this.selected[2] + this.btnColorLocal = this.selected[2] this.textColorLocal = this.selected[3] this.linkColorLocal = this.selected[4] this.redColorLocal = this.selected[5] - this.blueColorLocal = this.selected[6] - this.greenColorLocal = this.selected[7] + this.greenColorLocal = this.selected[6] + this.blueColorLocal = this.selected[7] this.orangeColorLocal = this.selected[8] } } diff --git a/src/components/style_switcher/style_switcher.vue b/src/components/style_switcher/style_switcher.vue index 6bdd4391..2ebf2b90 100644 --- a/src/components/style_switcher/style_switcher.vue +++ b/src/components/style_switcher/style_switcher.vue @@ -1,11 +1,15 @@