btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

🐛 Fixed primary theme swatch active state

Browse Source
This commit is contained in:
Liyas Thomas
2020-02-25 06:43:39 +05:30
committed by Dmitry Yankowski
parent 94ee60b832
commit 8e0adc9514
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pages/settings.vue
View File

@@ -12,14 +12,14 @@
/> />
<i v-else class="material-icons">account_circle</i> <i v-else class="material-icons">account_circle</i>
<span> <span>
{{ fb.currentUser.displayName || "Name not found" }} {{ fb.currentUser.displayName || $t("nothing_found") }}
</span> </span>
</button> </button>
<br /> <br />
<button class="icon"> <button class="icon">
<i class="material-icons">email</i> <i class="material-icons">email</i>
<span> <span>
{{ fb.currentUser.email || "Email not found" }} {{ fb.currentUser.email || $t("nothing_found") }}
</span> </span>
</button> </button>
<br /> <br />
@@ -95,7 +95,7 @@
:color="theme.color" :color="theme.color"
:name="theme.name" :name="theme.name"
class="bg" class="bg"
></swatch> />
</span> </span>
</div> </div>
</li> </li>
@@ -106,7 +106,7 @@
<div class="colors"> <div class="colors">
<span <span
:key="entry.color" :key="entry.color"
@click.prevent="setActiveColor(entry.color, entry.vibrant)" @click="setActiveColor(entry.color, entry.vibrant)"
v-for="entry in colors" v-for="entry in colors"
> >
<swatch <swatch
@@ -327,10 +327,12 @@ export default {
settings: { settings: {
SCROLL_INTO_ENABLED: SCROLL_INTO_ENABLED:
typeof this.$store.state.postwoman.settings.SCROLL_INTO_ENABLED !== "undefined" typeof this.$store.state.postwoman.settings.SCROLL_INTO_ENABLED !==
"undefined"
? this.$store.state.postwoman.settings.SCROLL_INTO_ENABLED ? this.$store.state.postwoman.settings.SCROLL_INTO_ENABLED
: true, : true,
THEME_CLASS: "",
THEME_COLOR: "", THEME_COLOR: "",
THEME_TAB_COLOR: "", THEME_TAB_COLOR: "",
THEME_COLOR_VIBRANT: true, THEME_COLOR_VIBRANT: true,