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

Merge branch 'master' into refactor/headers

Browse Source
This commit is contained in:
James George
2020-02-11 15:52:54 +05:30
committed by GitHub
parent 9ecec8ce17 015fd24e03
commit af18b95ffa
3 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
components/settings/swatch.vue
View File

@@ -4,10 +4,9 @@
:data-color="color" :data-color="color"
:class="{ active: active }" :class="{ active: active }"
v-tooltip="{ content: name || color }" v-tooltip="{ content: name || color }"
:style="{ backgroundColor: color }"
> >
<span :style="{ backgroundColor: color }" class="preview"> <i v-if="active" class="material-icons activeTick">done</i>
<i v-if="active" class="material-icons activeTick">done</i>
</span>
</div> </div>
</template> </template>
@@ -17,6 +16,7 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin: 8px; margin: 8px;
padding: 16px;
border-radius: 100%; border-radius: 100%;
border: 3px solid var(--bg-dark-color); border: 3px solid var(--bg-dark-color);
cursor: pointer; cursor: pointer;
@@ -33,19 +33,8 @@
border: 3px solid var(--fg-color); border: 3px solid var(--fg-color);
} }
.preview { .activeTick {
vertical-align: middle; position: absolute;
display: inline-block;
border-radius: 100%;
padding: 16px;
position: relative;
.activeTick {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
} }
} }
</style> </style>

6
package-lock.json generated
View File

@@ -1176,9 +1176,9 @@
"dev": true "dev": true
}, },
"@hapi/hoek": { "@hapi/hoek": {
"version": "8.5.0", "version": "8.5.1",
"resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.0.tgz", "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz",
"integrity": "sha512-7XYT10CZfPsH7j9F1Jmg1+d0ezOux2oM2GfArAzLwWe4mE2Dr3hVjsAL6+TFY49RRJlCdJDMw3nJsLFroTc8Kw==", "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==",
"dev": true "dev": true
}, },
"@hapi/joi": { "@hapi/joi": {

5
pages/settings.vue
View File

@@ -339,8 +339,9 @@ export default {
"https://postwoman.apollotv.xyz/", "https://postwoman.apollotv.xyz/",
PROXY_KEY: this.$store.state.postwoman.settings.PROXY_KEY || "", PROXY_KEY: this.$store.state.postwoman.settings.PROXY_KEY || "",
EXTENSIONS_ENABLED: EXTENSIONS_ENABLED:
(typeof this.$store.state.postwoman.settings.EXTENSIONS_ENABLED !== 'undefined') ? typeof this.$store.state.postwoman.settings.EXTENSIONS_ENABLED !==
this.$store.state.postwoman.settings.EXTENSIONS_ENABLED "undefined"
? this.$store.state.postwoman.settings.EXTENSIONS_ENABLED
: true : true
}, },