Update styles for Rate limit inputs

This commit is contained in:
Angelina Filippova 2020-02-13 19:18:25 +03:00
parent e321c15da5
commit fc3d1627be
3 changed files with 84 additions and 27 deletions

View file

@ -9,7 +9,7 @@
</el-tooltip> </el-tooltip>
</span> </span>
</el-form-item> </el-form-item>
<el-form-item v-for="subSetting in setting.children" :key="subSetting.key" class="settings-input has-nested"> <el-form-item v-for="subSetting in setting.children" :key="subSetting.key" class="settings-input">
<inputs <inputs
:setting-group="settingGroup" :setting-group="settingGroup"
:setting-parent="[...settingParent, subSetting]" :setting-parent="[...settingParent, subSetting]"

View file

@ -18,31 +18,49 @@
</div> </div>
</div> </div>
<div v-if="rateLimitAuthUsers"> <div v-if="rateLimitAuthUsers">
<el-form-item label="Unauthenticated users:" label-width="180px" class="rate-limit settings-input"> <el-form-item class="rate-limit settings-input">
<el-input <div class="rate-limit-label-container">
:value="rateLimitUnauthUsers[0]" <span class="rate-limit-label">
placeholder="scale" Unauthenticated users:
class="scale-input" </span>
@input="parseRateLimiter($event, setting.key, 'scale', 'unauthUsersLimit', [rateLimitUnauthUsers, rateLimitAuthUsers])"/> </div>
<span>:</span> <div class="rate-limit-content">
<el-input <el-input
:value="rateLimitUnauthUsers[1]" :value="rateLimitUnauthUsers[0]"
placeholder="limit" placeholder="scale"
class="limit-input" class="scale-input"
@input="parseRateLimiter($event, setting.key, 'limit', 'unauthUsersLimit', [rateLimitUnauthUsers, rateLimitAuthUsers])"/> @input="parseRateLimiter(
$event, setting.key, 'scale', 'unauthUsersLimit', [rateLimitUnauthUsers, rateLimitAuthUsers]
)"/>
<span>:</span>
<el-input
:value="rateLimitUnauthUsers[1]"
placeholder="limit"
class="limit-input"
@input="parseRateLimiter(
$event, setting.key, 'limit', 'unauthUsersLimit', [rateLimitUnauthUsers, rateLimitAuthUsers]
)"/>
</div>
</el-form-item> </el-form-item>
<el-form-item label="Authenticated users:" label-width="180px" class="rate-limit settings-input"> <el-form-item class="rate-limit settings-input">
<el-input <div class="rate-limit-label-container">
:value="rateLimitAuthUsers[0]" <span class="rate-limit-label">
placeholder="scale" Authenticated users:
class="scale-input" </span>
@input="parseRateLimiter($event, setting.key, 'scale', 'authUserslimit', [rateLimitUnauthUsers, rateLimitAuthUsers])"/> </div>
<span>:</span> <div class="rate-limit-content">
<el-input <el-input
:value="rateLimitAuthUsers[1]" :value="rateLimitAuthUsers[0]"
placeholder="limit" placeholder="scale"
class="limit-input" class="scale-input"
@input="parseRateLimiter($event, setting.key, 'limit', 'authUserslimit', [rateLimitUnauthUsers, rateLimitAuthUsers])"/> @input="parseRateLimiter($event, setting.key, 'scale', 'authUserslimit', [rateLimitUnauthUsers, rateLimitAuthUsers])"/>
<span>:</span>
<el-input
:value="rateLimitAuthUsers[1]"
placeholder="limit"
class="limit-input"
@input="parseRateLimiter($event, setting.key, 'limit', 'authUserslimit', [rateLimitUnauthUsers, rateLimitAuthUsers])"/>
</div>
</el-form-item> </el-form-item>
<div class="limit-button-container"> <div class="limit-button-container">
<el-button :size="isDesktop ? 'medium' : 'mini'" class="icon-minus-button" icon="el-icon-minus" circle @click="toggleLimits(['', ''], setting.key)"/> <el-button :size="isDesktop ? 'medium' : 'mini'" class="icon-minus-button" icon="el-icon-minus" circle @click="toggleLimits(['', ''], setting.key)"/>

View file

@ -47,6 +47,8 @@
line-height: 22px; line-height: 22px;
margin: 5px 0 0 0; margin: 5px 0 0 0;
overflow-wrap: break-word; overflow-wrap: break-word;
overflow: hidden;
text-overflow: ellipsis;
code { code {
display: inline; display: inline;
line-height: 22px; line-height: 22px;
@ -168,6 +170,27 @@
margin-left: 8px; margin-left: 8px;
margin-right: 10px margin-right: 10px
} }
.rate-limit {
.el-form-item__content {
width: 100%;
display: flex;
}
}
.rate-limit-content {
width: 100%;
}
.rate-limit-label {
float: right;
}
.rate-limit-label-container {
font-size: 14px;
color: #606266;
font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei";
font-weight: 700;
height: 36px;
width: 240px;
margin-right: 10px;
}
.relays-container { .relays-container {
margin: 0 15px; margin: 0 15px;
} }
@ -270,12 +293,16 @@
.input-container { .input-container {
width: 100%; width: 100%;
.el-form-item { .el-form-item {
margin-right: 15px; margin: 0;
padding: 0 15px 10px 0;
} }
.settings-delete-button { .settings-delete-button {
margin: 4px 7px 0 -5px; margin: 4px 7px 0 -5px;
} }
} }
.limit-input {
width: 46%;
}
.proxy-url-input { .proxy-url-input {
flex-direction: column; flex-direction: column;
align-items: flex-start; align-items: flex-start;
@ -289,6 +316,17 @@
width: 100%; width: 100%;
margin-left: 0; margin-left: 0;
} }
.rate-limit {
.el-form-item__content {
flex-direction: column;
}
}
.rate-limit-label {
float: left;
}
.scale-input {
width: 46%;
}
.setting-label { .setting-label {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -296,7 +334,8 @@
.settings-input { .settings-input {
display: inline-block; display: inline-block;
width: 90%; width: 90%;
margin: 0 0 10px 0; padding: 0 15px 10px 0;
margin: 0;
} }
.socks5-checkbox-container { .socks5-checkbox-container {
width: 100%; width: 100%;