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

Merge branch 'master' into match-expressions

This commit is contained in:
Vincent Fiduccia 2020-05-30 02:59:16 -07:00 committed by GitHub
parent b5572b3b83 2d1b526dd0
commit b51a94e5d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/GatekeeperConfig.vue
View File

@ -189,7 +189,7 @@ export default {
this.saving = true; this.saving = true;
await this.ensureNamespace(); await this.ensureNamespace();
await this.config.save(); await this.config.save();
await this.config.waitForCondition('Deployed'); await this.config.waitForCondition('Deployed', 'True', 300000);
this.showYamlEditor = false; this.showYamlEditor = false;
this.saving = false; this.saving = false;
this.$emit('gatekeeperEnabled', this.gatekeeperEnabled = true); this.$emit('gatekeeperEnabled', this.gatekeeperEnabled = true);

4
components/form/MatchExpressions.vue
View File

@ -197,7 +197,9 @@ export default {
<button <button
v-if="!isView" v-if="!isView"
type="button" type="button"
class="btn btn-sm role-link col remove-rule-button" class="btn role-link col remove-rule-button"
:style="{padding:'0px'}"
:disabled="mode==='view'" :disabled="mode==='view'"
@click="removeRule(row)" @click="removeRule(row)"
> >

12
edit/networking.k8s.io.ingress/Rule.vue
View File

@ -65,10 +65,10 @@ export default {
<template> <template>
<div class="rule mt-20" @input="update"> <div class="rule mt-20" @input="update">
<div class="row"> <div class="row">
<div id="host" class="col span-11"> <div id="host" class="col span-6">
<LabeledInput v-model="host" label="Request Host" placeholder="e.g. example.com" /> <LabeledInput v-model="host" label="Request Host" placeholder="e.g. example.com" />
</div> </div>
<div class="col span-1"> <div class="col span-6">
<button class="btn role-link close" @click="removeRule"> <button class="btn role-link close" @click="removeRule">
<i class="icon icon-2x icon-x" /> <i class="icon icon-2x icon-x" />
</button> </button>
@ -85,7 +85,7 @@ export default {
@remove="e=>removePath(i)" @remove="e=>removePath(i)"
/> />
</template> </template>
<button v-if="ruleMode === 'setHost'" :style="{'padding':'0px 0px 0px 5px'}" class="btn btn-sm role-link" @click="addPath"> <button v-if="ruleMode === 'setHost'" class="btn btn-sm role-link" @click="addPath">
add path add path
</button> </button>
</div> </div>
@ -96,7 +96,7 @@ export default {
background: var(--tabbed-container-bg); background: var(--tabbed-container-bg);
border: 1px solid var(--tabbed-border); border: 1px solid var(--tabbed-border);
border-radius: var(--border-radius); border-radius: var(--border-radius);
padding: 40px; padding: 20px;
} }
#host { #host {
@ -107,7 +107,7 @@ export default {
float:right; float:right;
padding: 0px; padding: 0px;
position: relative; position: relative;
top: -25px; top: -10px;
right: -25px; right: -10px;
} }
</style> </style>

2
edit/networking.k8s.io.ingress/RulePath.vue
View File

@ -48,7 +48,7 @@ export default {
<div class="col span-3" :style="{'margin-right': '0px'}"> <div class="col span-3" :style="{'margin-right': '0px'}">
<LabeledInput v-model.number="servicePort" label="Port" placeholder="e.g. 80" /> <LabeledInput v-model.number="servicePort" label="Port" placeholder="e.g. 80" />
</div> </div>
<button class="btn btn-sm role-link col" @click="$emit('remove')"> <button class="btn role-link col" @click="$emit('remove')">
remove remove
</button> </button>
</div> </div>

12
shared/networking.k8s.io.ingress/Certificate.vue
View File

@ -78,14 +78,14 @@ export default {
</div> </div>
</div> </div>
<div v-for="(host, i) in hosts" :key="i" class="row mb-10"> <div v-for="(host, i) in hosts" :key="i" class="row mb-10">
<div :style="{'margin-right': '0px'}" class="col span-11"> <div :style="{'margin-right': '0px'}" class="col span-6">
<LabeledInput :value="host" label="Host" placeholder="e.g. example.com" @input="e=>$set(hosts, i, e)" /> <LabeledInput :value="host" label="Host" placeholder="e.g. example.com" @input="e=>$set(hosts, i, e)" />
</div> </div>
<button class="btn btn-sm role-link col" @click="e=>remove(i)"> <button class="btn role-link col remove" @click="e=>remove(i)">
remove remove
</button> </button>
</div> </div>
<button :style="{'padding':'0px 0px 0px 5px'}" class="bn btn-sm role-link" @click="addHost"> <button class="btn btn-sm role-link" @click="addHost">
add host add host
</button> </button>
</div> </div>
@ -96,8 +96,8 @@ export default {
float:right; float:right;
padding: 0px; padding: 0px;
position: relative; position: relative;
top: -25px; top: -10px;
right: -25px; right: -10px;
} }
.cert:not(:last-of-type) { .cert:not(:last-of-type) {
padding-bottom: 10px; padding-bottom: 10px;
@ -105,7 +105,7 @@ export default {
border-bottom: 1px solid var(--border); border-bottom: 1px solid var(--border);
} }
button { button.remove {
line-height: 40px; line-height: 40px;
} }
</style> </style>