From 29007ce05ccf43fcf961fed530303178fd55c9ee Mon Sep 17 00:00:00 2001
From: "Mr. Stallion" <mrstallion@nobody.nowhere.fauxdomain.ext>
Date: Mon, 30 Mar 2020 10:40:25 -0500
Subject: [PATCH] Cleaner ad UI
---
chat/ConversationView.vue | 13 +++++++++++--
components/Dropdown.vue | 5 ++++-
readme.md | 1 +
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/chat/ConversationView.vue b/chat/ConversationView.vue
index aa32cb4..106685d 100644
--- a/chat/ConversationView.vue
+++ b/chat/ConversationView.vue
@@ -67,11 +67,18 @@
<button v-for="mode in modes" class="dropdown-item" :class="{ selected: conversation.mode == mode }" type="button" @click="setMode(mode)">{{l('channel.mode.' + mode)}}</button>
</dropdown>
- <dropdown :keep-open="false" title="Ads" :icon-class="{fas: true, 'fa-pause': !conversation.adManager.isActive(), 'fa-play': conversation.adManager.isActive()}" wrap-class="btn-group ads" link-class="btn btn-secondary dropdown-toggle" v-show="(conversation.channel.mode == 'both' || conversation.channel.mode == 'ads')">
- <button class="dropdown-item" type="button" @click="toggleAutoPostAds()">{{conversation.adManager.isActive() ? 'Stop' : 'Start'}} Posting Ads</button>
+ <dropdown :keep-open="false" wrap-class="btn-group ads" link-style="" link-class="btn btn-secondary dropdown-toggle dropdown-toggle-split" v-show="(conversation.channel.mode == 'both' || conversation.channel.mode == 'ads')">
+ <button class="dropdown-item" type="button" @click="toggleAutoPostAds()">{{conversation.adManager.isActive() ? 'Pause' : 'Start'}} Posting Ads</button>
<button class="dropdown-item" type="button" @click="showAdSettings()">Edit Channel Ads</button>
<div class="dropdown-divider"></div>
<button class="dropdown-item" :class="{ selected: showNonMatchingAds }" type="button" @click="toggleNonMatchingAds()">Show Incompatible Ads</button>
+
+ <template v-slot:split>
+ <a class="btn btn-secondary" @click="toggleAutoPostAds()">
+ <i :class="{fas: true, 'fa-pause': conversation.adManager.isActive(), 'fa-play': !conversation.adManager.isActive()}"></i>
+ {{conversation.adManager.isActive() ? 'Pause' : 'Start'}} Ads
+ </a>
+ </template>
</dropdown>
</div>
@@ -606,6 +613,7 @@
a.btn {
padding-left: 0.5rem;
padding-right: 0.5rem;
+ color: #cbcbe5;
i {
margin-right: 0.4rem;
@@ -687,6 +695,7 @@
.update {
color: rgba(255, 255, 255, 0.6);
font-size: 13px;
+ width: 75%;
}
.next {
diff --git a/components/Dropdown.vue b/components/Dropdown.vue
index 42529e9..6be420c 100644
--- a/components/Dropdown.vue
+++ b/components/Dropdown.vue
@@ -1,7 +1,8 @@
<template>
<div :class="wrapClass" @focusout="blur">
+ <slot name="split"></slot>
<a :class="linkClass" aria-haspopup="true" :aria-expanded="isOpen" @click.prevent="isOpen = !isOpen" href="#"
- style="width:100%;text-align:left;align-items:center" role="button" tabindex="-1" ref="button">
+ :style="linkStyle" role="button" tabindex="-1" ref="button">
<i :class="iconClass" v-if="!!iconClass"></i>
<slot name="title">{{title}}</slot>
</a>
@@ -28,6 +29,8 @@
readonly keepOpen?: boolean;
@Prop
readonly title?: string;
+ @Prop({default: 'width:100%;text-align:left;align-items:center'})
+ readonly linkStyle!: string;
@Watch('isOpen')
onToggle(): void {
diff --git a/readme.md b/readme.md
index d88a5df..06f5bec 100644
--- a/readme.md
+++ b/readme.md
@@ -88,6 +88,7 @@ This repository contains a heavily customized version of the mainline F-Chat 3.0
* Conversation bot API
* 'Filter unmatching ads' is not channel specific -- it's either on everywhere or nowhere
* Bug? Usually submissive vs usually submissive shows up as 'maybe'
+* Bug? YOU have 'loves humans'; THEY have 'no furry characters, just humans' -- THEIR ad shows green, not red -- your side of comparison is fully green, they just have 'no furry pairings' in red
# F-List Exported