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

fix: minor color scheme inconsistencies

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
components/button/Secondary.vue
View File

@@ -11,11 +11,12 @@
items-center
justify-center
focus:outline-none
hover:bg-primaryDark
"
:class="[
color
? `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',
rounded ? 'rounded-full' : 'rounded',
{ 'opacity-75 cursor-not-allowed': disabled },

1
components/collections/ChooseType.vue
View File

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

1
components/collections/graphql/Collection.vue
View File

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

1
components/collections/graphql/Folder.vue
View File

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

1
components/collections/graphql/Request.vue
View File

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

2
components/collections/my/Collection.vue
View File

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

1
components/collections/my/Folder.vue
View File

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

1
components/collections/my/Request.vue
View File

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

2
components/collections/teams/Collection.vue
View File

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

1
components/collections/teams/Folder.vue
View File

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

1
components/collections/teams/Request.vue
View File

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

1
components/environments/Edit.vue
View File

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

1
components/environments/Environment.vue
View File

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

1
components/environments/index.vue
View File

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

2
components/history/graphql/Card.vue
View File

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

2
components/history/rest/Card.vue
View File

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

2
components/http/BodyParameters.vue
View File

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

2
components/http/Headers.vue
View File

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

18
components/http/ImportCurl.vue
View File

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

2
components/http/Parameters.vue
View File

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

1
components/http/TokenList.vue
View File

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

1
components/realtime/Socketio.vue
View File

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

2
components/realtime/Websocket.vue
View File

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

2
components/smart/AutoComplete.vue
View File

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

4
components/smart/ColorModePicker.vue
View File

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

4
components/smart/Toggle.vue
View File

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

2
components/teams/Edit.vue
View File

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

1
components/teams/Team.vue
View File

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