rancher
/
dashboard
mirror of https://github.com/rancher/dashboard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1696 from lvuch/lh-1023 

divider fix
This commit is contained in:
Vincent Fiduccia 2020-10-26 11:59:18 -07:00 committed by GitHub
parent bf0a157694 97b29116f9
commit 6cfecbfafb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/styles/base/_mixins.scss
View File

@ -58,7 +58,7 @@
padding-bottom: 20px;
}
@mixin divider {
@mixin section-divider {
margin-bottom: 20px;
margin-top: 20px;
}
@ -72,7 +72,7 @@
.clip { @include clip }
.force-wrap { @include force-wrap }
.bordered-section { @include bordered-section }
.divider { @include divider }
.section-divider { @include section-divider }
/// Sets the specified background color and calculates a dark or light contrasted text color.
@mixin contrasted($background-color, $dark: $contrasted-dark, $light: $contrasted-light) {

4
components/AsyncButton.vue
View File

@ -196,7 +196,7 @@ export default {
:tab-index="tabIndex"
@click="clicked"
>
<i v-if="displayIcon" :class="{icon: true, 'icon-lg': true, [displayIcon]: true, 'pr-5': showLabel && displayLabel}" />
<span v-if="showLabel" v-html="displayLabel" />
<i v-if="displayIcon" :class="{icon: true, 'icon-lg': true, [displayIcon]: true}" />
<span v-if="showLabel" class="pl-5" v-html="displayLabel" />
</button>
</template>

2
components/form/Command.vue
View File

@ -146,7 +146,7 @@ export default {
</div>
</div>
</div>
<hr class="divider" />
<hr class="section-divider" />
<h3>{{ t('workload.container.titles.env') }}</h3>
<EnvVars :mode="mode" :config-maps="configMaps" :secrets="secrets" :value="value" />
</div>

10
components/form/Container.vue
View File

@ -78,7 +78,7 @@ export default {
<template>
<div v-if="isView">
<hr class="divider" />
<hr class="section-divider" />
<div>
<div class="row">
<div class="col span-4">
@ -102,7 +102,7 @@ export default {
</div>
</div>
</div>
<hr class="divider" />
<hr class="section-divider" />
<div>
<h3><t k="workload.container.titles.ports" /></h3>
<WorkloadPorts v-if="value.ports" v-model="value.ports" :mode="mode" />
@ -111,13 +111,13 @@ export default {
</div>
</div>
<hr class="divider" />
<hr class="section-divider" />
<div>
<h3><t k="workload.container.titles.command" /></h3>
<Command v-model="value" :mode="mode" :secrets="[]" :config-maps="[]" />
</div>
<hr class="divider" />
<hr class="section-divider" />
<div>
<h3><t k="workload.container.titles.resources" /></h3>
<ContainerResourceLimit v-if="hasResourceLimits" v-model="flatResources" :mode="mode" :show-tip="false" />
@ -126,7 +126,7 @@ export default {
</div>
</div>
<hr class="divider" />
<hr class="section-divider" />
<div>
<h3><t k="workload.container.titles.healthCheck" /></h3>
<HealthCheck v-if="hasHealthCheck" v-model="healthCheck" :mode="mode" />

4
components/form/HealthCheck.vue
View File

@ -54,7 +54,7 @@ export default {
/>
</div>
</div>
<hr class="divider" />
<hr class="section-divider" />
<div>
<div class="row">
@ -68,7 +68,7 @@ export default {
/>
</div>
</div>
<hr class="divider" />
<hr class="section-divider" />
<div class="row">
<Probe

4
components/form/Networking.vue
View File

@ -190,7 +190,7 @@ export default {
</div>
</div>
</div>
<hr class="divider" />
<hr class="section-divider" />
<div>
<h3>{{ t('workload.networking.dns') }}</h3>
@ -225,6 +225,7 @@ export default {
</div>
</div>
</div>
<hr class="section-divider" />
<div class="mt-20">
<div class="row">
@ -241,6 +242,7 @@ export default {
/>
</div>
</div>
<hr class="section-divider" />
<div class="row mt-20">
<div class="col span-12">

2
components/form/PodScheduling.vue
View File

@ -47,7 +47,7 @@ export default {
</h4>
<PodAffinity v-model="podAffinity" :mode="mode" />
</div>
<hr class="divider" />
<hr class="section-divider" />
<h4 class="mb-10">
<t k="workload.scheduling.affinity.antiAffinityTitle" />

6
components/form/Scheduling.vue
View File

@ -78,7 +78,7 @@ export default {
</div>
</template>
</div>
<hr class="divider" />
<hr class="section-divider" />
<div>
<h3 class="mb-10">
@ -88,10 +88,10 @@ export default {
<Tolerations v-model="value.tolerations" :mode="mode" />
</div>
</div>
<hr class="divider" />
<hr class="section-divider" />
<div>
<hr class="divider" />
<hr class="section-divider" />
<h3 class="mb-10">
<t k="workload.scheduling.titles.priority" />
</h3>

4
components/form/Security.vue
View File

@ -131,7 +131,7 @@ export default {
</div>
</div>
</div>
<hr class="divider" />
<hr class="section-divider" />
<div>
<div class="row">
@ -158,7 +158,7 @@ export default {
</div>
</div>
</div>
<hr class="divider" />
<hr class="section-divider" />
<div class="row mb-10">
<div class="col span-6">

4
edit/logging.banzaicloud.io.output/providers/elasticsearch.vue
View File

@ -75,7 +75,7 @@ export default {
</div>
</div>
</div>
<hr class="divider" />
<hr class="section-divider" />
<div>
<h3>{{ t('logging.output.sections.access') }}</h3>
@ -95,7 +95,7 @@ export default {
</div>
</div>
</div>
<hr class="divider" />
<hr class="section-divider" />
<h3>{{ t('logging.output.sections.certificate') }}</h3>
<div class="row mb-10">

2
edit/resources.cattle.io.restore.vue
View File

@ -215,7 +215,7 @@ export default {
</div>
</div>
</div>
<hr class="divider" />
<hr class="section-divider" />
<div>
<div :style="{'align-items':'center'}" class="row mb-10">

12
edit/workload/index.vue
View File

@ -603,7 +603,7 @@ export default {
</div>
</div>
<hr class="divider" />
<hr class="section-divider" />
<div>
<h3>{{ t('workload.container.titles.image') }}</h3>
<div class="row">
@ -626,7 +626,7 @@ export default {
</div>
</div>
<hr class="divider" />
<hr class="section-divider" />
<div>
<h3>{{ t('workload.container.titles.ports') }}</h3>
<div class="row">
@ -634,12 +634,12 @@ export default {
</div>
</div>
<hr class="divider" />
<hr class="section-divider" />
<div>
<h3>{{ t('workload.container.titles.command') }}</h3>
<Command v-model="container" :secrets="namespacedSecrets" :config-maps="namespacedConfigMaps" :mode="mode" />
</div>
<hr class="divider" />
<hr class="section-divider" />
<div>
<h3>{{ t('workload.container.titles.podLabels') }}</h3>
<div class="row mb-20">
@ -679,7 +679,7 @@ export default {
</Tab>
<Tab :label="t('workload.container.titles.resources')" name="resources">
<ContainerResourceLimit v-model="flatResources" :mode="mode" :show-tip="false" />
<hr class="divider" />
<hr class="section-divider" />
<div>
<h3 class="mb-10">
<t k="workload.scheduling.titles.tolerations" />
@ -690,7 +690,7 @@ export default {
</div>
<div>
<hr class="divider" />
<hr class="section-divider" />
<h3 class="mb-10">
<t k="workload.scheduling.titles.priority" />
</h3>

2
edit/workload/storage/ephemeralVolume/index.vue
View File

@ -70,7 +70,7 @@ export default {
</div>
</div>
</div>
<hr class="divider" />
<hr class="section-divider" />
<Mount :pod-spec="podSpec" :name="value.name" :mode="mode" />
</div>
</template>