Skip to content

Commit

Permalink
Merge pull request #1361 from lvuch/lh-0921
Browse files Browse the repository at this point in the history
ui design polish
  • Loading branch information
vincent99 committed Sep 22, 2020
2 parents 1554abf + c346872 commit 128a66c
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 8 deletions.
2 changes: 1 addition & 1 deletion components/form/ArrayList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ export default {
<template>
<div>
<div v-if="title" class="clearfix">
<label :style="{'color': 'var(--input-label)', 'font-size':'14px'}">{{ title }} <i v-if="protip" v-tooltip="protip" class="icon icon-info" style="font-size: 12px" /></label>
<label :style="{'color': 'var(--input-label)', 'font-size':'14px'}">{{ title }} <i v-if="protip" v-tooltip="protip" class="icon icon-info" style="font-size: 14px" /></label>
</div>

<template v-if="rows.length">
Expand Down
2 changes: 1 addition & 1 deletion components/form/KeyValue.vue
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ export default {
<div v-if="rows.length || isView" :class="{'extra-column':threeColumns}" class="kv-row headers">
<label class="text-label" :class="{'view':isView}">
{{ keyLabel }}
<i v-if="protip && !isView" v-tooltip="protip" class="icon icon-info" style="font-size: 12px" />
<i v-if="protip && !isView" v-tooltip="protip" class="icon icon-info" style="font-size: 14px" />
</label>
<label class="text-label" :class="{'view':isView}">{{ valueLabel }}</label>
<span v-if="threeColumns" :class="{'view':isView}" />
Expand Down
14 changes: 11 additions & 3 deletions components/form/RadioButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,13 @@ export default {
}
}
.radio-group {
.text-label {
display: block;
padding-bottom: 5px;
}
}
.radio-container {
position: relative;
display: inline-flex;
Expand All @@ -122,6 +129,7 @@ export default {
cursor: pointer;
user-select: none;
border-radius: var(--border-radius);
padding-bottom: 5px;
.radio-label {
color: var(--input-label);
Expand All @@ -131,10 +139,10 @@ export default {
.radio-custom {
height: 14px;
width: 14px;
background-color: var(--body-bg);
background-color: var(--input-bg);
border-radius: 50%;
transition: all 0.3s ease-out;
border: 1px solid var(--border);
border: 1.5px solid var(--border);
&:focus {
outline: none;
Expand All @@ -152,7 +160,7 @@ export default {
-ms-transform: rotate(0deg) scale(1);
transform: rotate(0deg) scale(1);
opacity:1;
border: 1px solid var(--input-label);
border: 1.5px solid var(--dropdown-text);
}
input:disabled ~ .radio-custom {
Expand Down
4 changes: 2 additions & 2 deletions edit/catalog.cattle.io.clusterrepo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default {
<NameNsDescription v-model="value" :mode="mode" :namespaced="isNamespaced" />

<h2>{{ t('catalog.repo.target.label') }}</h2>
<div class="row">
<div class="row mb-10">
<div class="col span-6">
<RadioGroup
v-model="isGit"
Expand All @@ -43,7 +43,7 @@ export default {
</div>
</div>

<div v-if="isGit" class="row">
<div v-if="isGit" class="row mb-10">
<div class="col span-6">
<LabeledInput
v-model="value.spec.gitRepo"
Expand Down
2 changes: 1 addition & 1 deletion edit/service.vue
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ export default {
v-if="checkTypeIs('ClusterIP') || checkTypeIs('LoadBalancer') || checkTypeIs('NodePort')"
v-tooltip="t('servicesPage.ips.clusterIpHelpText')"
class="icon icon-info"
style="font-size: 12px"
style="font-size: 14px"
/>
</template>
</LabeledInput>
Expand Down

0 comments on commit 128a66c

Please sign in to comment.