fix: minor color scheme inconsistencies

This commit is contained in:
liyasthomas
2021-07-25 16:23:29 +05:30
parent 56c2e1094d
commit 3862a926ab
32 changed files with 66 additions and 37 deletions

View File

@@ -35,11 +35,6 @@
@apply text-primary; @apply text-primary;
} }
::placeholder {
@apply text-secondaryLight;
@apply opacity-25;
}
html { html {
scroll-behavior: smooth; scroll-behavior: smooth;
} }
@@ -162,6 +157,7 @@ hr {
@apply text-secondaryDark text-lg; @apply text-secondaryDark text-lg;
} }
.textarea,
.input, .input,
.select { .select {
@apply flex flex-1; @apply flex flex-1;
@@ -189,7 +185,7 @@ pre.ace_editor {
@apply z-0; @apply z-0;
} }
select { .select {
@apply appearance-none; @apply appearance-none;
@apply cursor-pointer; @apply cursor-pointer;
@@ -323,7 +319,6 @@ input[type="checkbox"] {
.splitpanes__splitter { .splitpanes__splitter {
@apply relative; @apply relative;
@apply bg-primaryLight; @apply bg-primaryLight;
@apply transition;
} }
.splitpanes--vertical > .splitpanes__splitter { .splitpanes--vertical > .splitpanes__splitter {
@@ -339,7 +334,7 @@ input[type="checkbox"] {
@apply inset-0; @apply inset-0;
@apply bg-dividerLight; @apply bg-dividerLight;
@apply opacity-0; @apply opacity-0;
@apply z-1; @apply z-30;
@apply transition; @apply transition;
content: ""; content: "";
@@ -348,7 +343,7 @@ input[type="checkbox"] {
.splitpanes__splitter::after { .splitpanes__splitter::after {
@apply absolute; @apply absolute;
@apply inset-0; @apply inset-0;
@apply z-1; @apply z-30;
@apply transition; @apply transition;
@apply flex; @apply flex;
@apply items-center; @apply items-center;

View File

@@ -16,17 +16,17 @@
// Light Text color // Light Text color
--secondary-light-color: theme("colors.true-gray.500"); --secondary-light-color: theme("colors.true-gray.500");
// Dark Text color // Dark Text color
--secondary-dark-color: theme("colors.white"); --secondary-dark-color: theme("colors.true-gray.100");
// Border color // Border color
--divider-color: theme("colors.true-gray.700"); --divider-color: theme("colors.true-gray.700");
// Light Border color // Light Border color
--divider-light-color: theme("colors.true-gray.800"); --divider-light-color: theme("colors.dark.600");
// Dark Border color // Dark Border color
--divider-dark-color: theme("colors.true-gray.600"); --divider-dark-color: theme("colors.dark.200");
// Error color // Error color
--error-color: theme("colors.true-gray.600"); --error-color: theme("colors.dark.800");
// Tooltip color // Tooltip color
--tooltip-color: theme("colors.true-gray.200"); --tooltip-color: theme("colors.true-gray.100");
// Editor theme // Editor theme
--editor-theme: "merbivore_soft"; --editor-theme: "merbivore_soft";
} }
@@ -62,25 +62,25 @@
// Background color // Background color
--primary-color: theme("colors.dark.900"); --primary-color: theme("colors.dark.900");
// Light Background color // Light Background color
--primary-light-color: theme("colors.dark.700"); --primary-light-color: theme("colors.dark.800");
// Dark Background color // Dark Background color
--primary-dark-color: theme("colors.dark.800"); --primary-dark-color: theme("colors.true-gray.900");
// Text color // Text color
--secondary-color: theme("colors.true-gray.400"); --secondary-color: theme("colors.true-gray.400");
// Light Text color // Light Text color
--secondary-light-color: theme("colors.true-gray.600"); --secondary-light-color: theme("colors.true-gray.500");
// Dark Text color // Dark Text color
--secondary-dark-color: theme("colors.true-gray.100"); --secondary-dark-color: theme("colors.true-gray.100");
// Border color // Border color
--divider-color: theme("colors.dark.800"); --divider-color: theme("colors.true-gray.800");
// Light Border color // Light Border color
--divider-light-color: theme("colors.dark.700"); --divider-light-color: theme("colors.true-gray.900");
// Dark Border color // Dark Border color
--divider-dark-color: theme("colors.dark.600"); --divider-dark-color: theme("colors.dark.200");
// Error color // Error color
--error-color: theme("colors.dark.800"); --error-color: theme("colors.dark.800");
// Tooltip color // Tooltip color
--tooltip-color: theme("colors.true-gray.200"); --tooltip-color: theme("colors.true-gray.100");
// Editor theme // Editor theme
--editor-theme: "vibrant_ink"; --editor-theme: "vibrant_ink";
} }

View File

@@ -11,11 +11,12 @@
items-center items-center
justify-center justify-center
focus:outline-none focus:outline-none
hover:bg-primaryDark
" "
:class="[ :class="[
color color
? `text-${color}-400 hover:text-${color}-600 focus:text-${color}-600` ? `text-${color}-400 hover:text-${color}-600 focus:text-${color}-600`
: 'text-secondary hover:text-secondaryDark hover:bg-primaryDark focus:text-secondaryDark', : 'text-secondary hover:text-secondaryDark focus:text-secondaryDark',
label ? 'px-3' : 'px-2', label ? 'px-3' : 'px-2',
rounded ? 'rounded-full' : 'rounded', rounded ? 'rounded-full' : 'rounded',
{ 'opacity-75 cursor-not-allowed': disabled }, { 'opacity-75 cursor-not-allowed': disabled },

View File

@@ -27,6 +27,7 @@
py-3 py-3
px-4 px-4
focus:outline-none focus:outline-none
select
" "
@change="updateSelectedTeam(myTeams[$event.target.value])" @change="updateSelectedTeam(myTeams[$event.target.value])"
> >

View File

@@ -88,6 +88,7 @@
/> />
<SmartItem <SmartItem
icon="delete" icon="delete"
color="red"
:label="$t('delete')" :label="$t('delete')"
@click.native=" @click.native="
confirmRemove = true confirmRemove = true

View File

@@ -84,6 +84,7 @@
/> />
<SmartItem <SmartItem
icon="delete" icon="delete"
color="red"
:label="$t('delete')" :label="$t('delete')"
@click.native=" @click.native="
confirmRemove = true confirmRemove = true

View File

@@ -80,6 +80,7 @@
/> />
<SmartItem <SmartItem
icon="delete" icon="delete"
color="red"
:label="$t('delete')" :label="$t('delete')"
@click.native=" @click.native="
confirmRemove = true confirmRemove = true

View File

@@ -47,6 +47,7 @@
v-tippy="{ theme: 'tooltip' }" v-tippy="{ theme: 'tooltip' }"
:title="$t('import')" :title="$t('import')"
icon="check_box_outline_blank" icon="check_box_outline_blank"
color="green"
@click.native="$emit('select-collection')" @click.native="$emit('select-collection')"
/> />
<ButtonSecondary <ButtonSecondary
@@ -104,6 +105,7 @@
/> />
<SmartItem <SmartItem
icon="delete" icon="delete"
color="red"
:label="$t('delete')" :label="$t('delete')"
@click.native=" @click.native="
confirmRemove = true confirmRemove = true

View File

@@ -89,6 +89,7 @@
/> />
<SmartItem <SmartItem
icon="delete" icon="delete"
color="red"
:label="$t('delete')" :label="$t('delete')"
@click.native=" @click.native="
confirmRemove = true confirmRemove = true

View File

@@ -91,6 +91,7 @@
/> />
<SmartItem <SmartItem
icon="delete" icon="delete"
color="red"
:label="$t('delete')" :label="$t('delete')"
@click.native=" @click.native="
confirmRemove = true confirmRemove = true

View File

@@ -39,6 +39,7 @@
v-tippy="{ theme: 'tooltip' }" v-tippy="{ theme: 'tooltip' }"
:title="$t('import')" :title="$t('import')"
icon="check_box_outline_blank" icon="check_box_outline_blank"
color="green"
@click.native="$emit('select-collection')" @click.native="$emit('select-collection')"
/> />
<ButtonSecondary <ButtonSecondary
@@ -101,6 +102,7 @@
<SmartItem <SmartItem
v-if="collectionsType.selectedTeam.myRole !== 'VIEWER'" v-if="collectionsType.selectedTeam.myRole !== 'VIEWER'"
icon="delete" icon="delete"
color="red"
:label="$t('delete')" :label="$t('delete')"
@click.native=" @click.native="
confirmRemove = true confirmRemove = true

View File

@@ -86,6 +86,7 @@
<SmartItem <SmartItem
v-if="collectionsType.selectedTeam.myRole !== 'VIEWER'" v-if="collectionsType.selectedTeam.myRole !== 'VIEWER'"
icon="delete" icon="delete"
color="red"
:label="$t('delete')" :label="$t('delete')"
@click.native=" @click.native="
confirmRemove = true confirmRemove = true

View File

@@ -84,6 +84,7 @@
/> />
<SmartItem <SmartItem
icon="delete" icon="delete"
color="red"
:label="$t('delete')" :label="$t('delete')"
@click.native=" @click.native="
confirmRemove = true confirmRemove = true

View File

@@ -87,6 +87,7 @@
v-tippy="{ theme: 'tooltip' }" v-tippy="{ theme: 'tooltip' }"
:title="$t('delete')" :title="$t('delete')"
icon="delete" icon="delete"
color="red"
@click.native="removeEnvironmentVariable(index)" @click.native="removeEnvironmentVariable(index)"
/> />
</div> </div>

View File

@@ -58,6 +58,7 @@
/> />
<SmartItem <SmartItem
icon="delete" icon="delete"
color="red"
:label="$t('delete')" :label="$t('delete')"
@click.native=" @click.native="
confirmRemove = true confirmRemove = true

View File

@@ -15,6 +15,7 @@
py-3 py-3
px-4 px-4
focus:outline-none focus:outline-none
select
" "
> >
<option :value="-1">No environment</option> <option :value="-1">No environment</option>

View File

@@ -25,9 +25,9 @@
<ButtonSecondary <ButtonSecondary
v-tippy="{ theme: 'tooltip' }" v-tippy="{ theme: 'tooltip' }"
icon="delete" icon="delete"
color="red"
:title="$t('delete')" :title="$t('delete')"
class="group-hover:inline-flex hidden" class="group-hover:inline-flex hidden"
color="red"
data-testid="delete_history_entry" data-testid="delete_history_entry"
@click.native="$emit('delete-entry')" @click.native="$emit('delete-entry')"
/> />

View File

@@ -43,9 +43,9 @@
<ButtonSecondary <ButtonSecondary
v-tippy="{ theme: 'tooltip' }" v-tippy="{ theme: 'tooltip' }"
icon="delete" icon="delete"
color="red"
:title="$t('delete')" :title="$t('delete')"
class="group-hover:inline-flex hidden" class="group-hover:inline-flex hidden"
color="red"
data-testid="delete_history_entry" data-testid="delete_history_entry"
@click.native="$emit('delete-entry')" @click.native="$emit('delete-entry')"
/> />

View File

@@ -103,6 +103,7 @@
: 'check_box_outline_blank' : 'check_box_outline_blank'
: 'check_box' : 'check_box'
" "
color="green"
@click.native="toggleActive(index, param)" @click.native="toggleActive(index, param)"
/> />
</div> </div>
@@ -128,6 +129,7 @@
v-tippy="{ theme: 'tooltip' }" v-tippy="{ theme: 'tooltip' }"
:title="$t('delete')" :title="$t('delete')"
icon="delete" icon="delete"
color="red"
@click.native="removeRequestBodyParam(index)" @click.native="removeRequestBodyParam(index)"
/> />
</div> </div>

View File

@@ -94,6 +94,7 @@
: 'check_box_outline_blank' : 'check_box_outline_blank'
: 'check_box' : 'check_box'
" "
color="green"
@click.native=" @click.native="
updateHeader(index, { updateHeader(index, {
key: header.key, key: header.key,
@@ -108,6 +109,7 @@
v-tippy="{ theme: 'tooltip' }" v-tippy="{ theme: 'tooltip' }"
:title="$t('delete')" :title="$t('delete')"
icon="delete" icon="delete"
color="red"
@click.native="deleteHeader(index)" @click.native="deleteHeader(index)"
/> />
</div> </div>

View File

@@ -7,14 +7,16 @@
</div> </div>
</template> </template>
<template #body> <template #body>
<textarea <div class="flex flex-col px-2">
id="import-curl" <textarea
v-model="curl" id="import-curl"
class="textarea" v-model="curl"
autofocus class="textarea"
rows="8" autofocus
:placeholder="$t('enter_curl')" rows="8"
></textarea> :placeholder="$t('enter_curl')"
></textarea>
</div>
</template> </template>
<template #footer> <template #footer>
<span> <span>

View File

@@ -103,6 +103,7 @@
: 'check_box_outline_blank' : 'check_box_outline_blank'
: 'check_box' : 'check_box'
" "
color="green"
@click.native=" @click.native="
updateParam(index, { updateParam(index, {
key: param.key, key: param.key,
@@ -117,6 +118,7 @@
v-tippy="{ theme: 'tooltip' }" v-tippy="{ theme: 'tooltip' }"
:title="$t('delete')" :title="$t('delete')"
icon="delete" icon="delete"
color="red"
@click.native="deleteParam(index)" @click.native="deleteParam(index)"
/> />
</div> </div>

View File

@@ -49,6 +49,7 @@
v-tippy="{ theme: 'tooltip' }" v-tippy="{ theme: 'tooltip' }"
:title="$t('delete')" :title="$t('delete')"
icon="delete" icon="delete"
color="red"
@click.native="removeOAuthToken(index)" @click.native="removeOAuthToken(index)"
/> />
</li> </li>

View File

@@ -109,6 +109,7 @@
v-tippy="{ theme: 'tooltip' }" v-tippy="{ theme: 'tooltip' }"
:title="$t('delete')" :title="$t('delete')"
icon="delete" icon="delete"
color="red"
@click.native="removeCommunicationInput({ index })" @click.native="removeCommunicationInput({ index })"
/> />
</div> </div>

View File

@@ -113,6 +113,7 @@
: 'check_box_outline_blank' : 'check_box_outline_blank'
: 'check_box' : 'check_box'
" "
color="green"
@click.native=" @click.native="
protocol.active = protocol.hasOwnProperty('active') protocol.active = protocol.hasOwnProperty('active')
? !protocol.active ? !protocol.active
@@ -125,6 +126,7 @@
v-tippy="{ theme: 'tooltip' }" v-tippy="{ theme: 'tooltip' }"
:title="$t('delete')" :title="$t('delete')"
icon="delete" icon="delete"
color="red"
@click.native="deleteProtocol({ index })" @click.native="deleteProtocol({ index })"
/> />
</div> </div>

View File

@@ -213,7 +213,7 @@ export default {
@apply z-50; @apply z-50;
@apply shadow-lg; @apply shadow-lg;
top: calc(100% - 8px); top: calc(100% - 4px);
border-radius: 0 0 8px 8px; border-radius: 0 0 8px 8px;
li { li {

View File

@@ -6,7 +6,7 @@
v-tippy="{ theme: 'tooltip' }" v-tippy="{ theme: 'tooltip' }"
:title="`${color.charAt(0).toUpperCase()}${color.slice(1)}`" :title="`${color.charAt(0).toUpperCase()}${color.slice(1)}`"
:class="{ :class="{
'bg-primaryLight !text-accent hover:text-accent': color === activeColor, 'bg-primaryLight !text-accent hover:text-accent': color === active,
}" }"
:icon="getIcon(color)" :icon="getIcon(color)"
@click.native="setBGMode(color)" @click.native="setBGMode(color)"
@@ -31,7 +31,7 @@ export default Vue.extend({
}, },
subscriptions() { subscriptions() {
return { return {
activeColor: getSettingSubject("BG_COLOR"), active: getSettingSubject("BG_COLOR"),
} }
}, },
methods: { methods: {

View File

@@ -24,9 +24,9 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
$useBorder: false; $useBorder: false;
$borderColor: var(--divider-dark-color); $borderColor: var(--divider-color);
$activeColor: var(--accent-color); $activeColor: var(--accent-color);
$inactiveColor: var(--divider-dark-color); $inactiveColor: var(--divider-color);
$inactiveHandleColor: var(--primary-color); $inactiveHandleColor: var(--primary-color);
$activeHandleColor: var(--primary-color); $activeHandleColor: var(--primary-color);
$width: 2rem; $width: 2rem;

View File

@@ -96,6 +96,7 @@
v-tippy="{ theme: 'tooltip' }" v-tippy="{ theme: 'tooltip' }"
:title="$t('delete')" :title="$t('delete')"
icon="delete" icon="delete"
color="red"
@click.native="removeExistingTeamMember(member.user.uid)" @click.native="removeExistingTeamMember(member.user.uid)"
/> />
</li> </li>
@@ -173,6 +174,7 @@
v-tippy="{ theme: 'tooltip' }" v-tippy="{ theme: 'tooltip' }"
:title="$t('delete')" :title="$t('delete')"
icon="delete" icon="delete"
color="red"
@click.native="removeTeamMember(index)" @click.native="removeTeamMember(index)"
/> />
</li> </li>

View File

@@ -36,6 +36,7 @@
<SmartItem <SmartItem
v-if="team.myRole === 'OWNER'" v-if="team.myRole === 'OWNER'"
icon="delete" icon="delete"
color="red"
:label="$t('delete')" :label="$t('delete')"
@click.native=" @click.native="
deleteTeam deleteTeam

View File

@@ -251,6 +251,7 @@
: 'check_box_outline_blank' : 'check_box_outline_blank'
: 'check_box' : 'check_box'
" "
color="green"
@click.native=" @click.native="
$store.commit('setActiveGQLHeader', { $store.commit('setActiveGQLHeader', {
index, index,
@@ -266,6 +267,7 @@
v-tippy="{ theme: 'tooltip' }" v-tippy="{ theme: 'tooltip' }"
:title="$t('delete')" :title="$t('delete')"
icon="delete" icon="delete"
color="red"
@click.native="removeRequestHeader(index)" @click.native="removeRequestHeader(index)"
/> />
</div> </div>

View File

@@ -326,6 +326,7 @@
v-tippy="{ theme: 'tooltip' }" v-tippy="{ theme: 'tooltip' }"
:title="$t('delete')" :title="$t('delete')"
icon="delete" icon="delete"
color="red"
/> />
</div> </div>
</div> </div>