diff options
| -rw-r--r-- | web/assets/css/custom.css | 15 | ||||
| -rw-r--r-- | web/html/common/qrcode_modal.html | 6 | ||||
| -rw-r--r-- | web/html/login.html | 5 | ||||
| -rw-r--r-- | web/html/xui/form/stream/stream_grpc.html | 4 | ||||
| -rw-r--r-- | web/html/xui/form/tls_settings.html | 22 | ||||
| -rw-r--r-- | web/html/xui/inbounds.html | 2 |
6 files changed, 34 insertions, 20 deletions
diff --git a/web/assets/css/custom.css b/web/assets/css/custom.css index 308d24a6..65a5181d 100644 --- a/web/assets/css/custom.css +++ b/web/assets/css/custom.css @@ -680,7 +680,7 @@ style attribute { .dark .ant-table-row-expand-icon { color: #fff; background-color: #fff0; - border-color: #9ea2a8; + border-color: rgb(255 255 255 / 20%); } .dark .ant-table-row-expand-icon:hover { @@ -1099,3 +1099,16 @@ li.ant-select-dropdown-menu-item:empty:after { max-height: 400px; overflow-y: auto; } + +.ant-table-row-expand-icon { + border-radius: 6px; +} + +.qr-bg { + background-color: #fff; + display: flex; + justify-content: center; + align-content: center; + padding: 0.5rem; + border-radius: 1rem; +} diff --git a/web/html/common/qrcode_modal.html b/web/html/common/qrcode_modal.html index 668f426c..3c4fd929 100644 --- a/web/html/common/qrcode_modal.html +++ b/web/html/common/qrcode_modal.html @@ -9,12 +9,12 @@ </a-tag> <template v-if="app.subSettings.enable && qrModal.subId"> <a-divider>Subscription</a-divider> - <canvas @click="copyToClipboard('qrCode-sub',genSubLink(qrModal.client.subId))" id="qrCode-sub" style="width: 100%; height: 100%;"></canvas> + <div class="qr-bg"><canvas @click="copyToClipboard('qrCode-sub',genSubLink(qrModal.client.subId))" id="qrCode-sub" style="width: 100%; height: 100%;"></canvas></div> </template> <a-divider>{{ i18n "pages.inbounds.client" }}</a-divider> <template v-for="(row, index) in qrModal.qrcodes"> <a-tag color="green" style="margin: 10px 0; display: block; text-align: center;">[[ row.remark ]]</a-tag> - <canvas @click="copyToClipboard('qrCode-'+index, row.link)" :id="'qrCode-'+index" style="width: 100%; height: 100%;"></canvas> + <div class="qr-bg"><canvas @click="copyToClipboard('qrCode-'+index, row.link)" :id="'qrCode-'+index" style="width: 100%; height: 100%;"></canvas></div> </template> </a-modal> @@ -87,4 +87,4 @@ }); </script> -{{end}}
\ No newline at end of file +{{end}} diff --git a/web/html/login.html b/web/html/login.html index 8d377381..3ec9da2e 100644 --- a/web/html/login.html +++ b/web/html/login.html @@ -123,8 +123,9 @@ background-origin: border-box; background-clip: padding-box, border-box; background-size: 300%; - transition: all 0.5s ease; + transition: all 0.3s cubic-bezier(.645,.045,.355,1); width: 100%; + z-index: 1; } .dark .wave-btn-bg:hover {animation: wave-btn-tara 4s ease infinite;} .dark .wave-btn-bg-cl { @@ -289,7 +290,7 @@ </a-form-item> <a-form-item> <a-row justify="center" class="centered"> - <div class="wave-btn-bg wave-btn-bg-cl"> + <div class="wave-btn-bg wave-btn-bg-cl" :style="loading ? { width: '54px' } : { display: 'inline-block' }"> <a-button class="ant-btn-primary-login" type="primary" :loading="loading" @click="login" :icon="loading ? 'poweroff' : undefined" :style="loading ? { width: '50px' } : { display: 'inline-block' }"> [[ loading ? '' : '{{ i18n "login" }}' ]] diff --git a/web/html/xui/form/stream/stream_grpc.html b/web/html/xui/form/stream/stream_grpc.html index e8c14e7c..27effccc 100644 --- a/web/html/xui/form/stream/stream_grpc.html +++ b/web/html/xui/form/stream/stream_grpc.html @@ -1,10 +1,10 @@ {{define "form/streamGRPC"}} <a-form :colon="false" :label-col="{ md: {span:6} }" :wrapper-col="{ md: {span:14} }"> <a-form-item label="Service Name"> - <a-input v-model.trim="inbound.stream.grpc.serviceName" style="width: 250px;"></a-input> + <a-input v-model.trim="inbound.stream.grpc.serviceName"></a-input> </a-form-item> <a-form-item label="MultiMode"> <a-switch v-model="inbound.stream.grpc.multiMode"></a-switch> </a-form-item> </a-form> -{{end}}
\ No newline at end of file +{{end}} diff --git a/web/html/xui/form/tls_settings.html b/web/html/xui/form/tls_settings.html index a0c9292a..07527e7f 100644 --- a/web/html/xui/form/tls_settings.html +++ b/web/html/xui/form/tls_settings.html @@ -74,10 +74,10 @@ </a-form-item> <template v-if="cert.useFile"> <a-form-item label='{{ i18n "pages.inbounds.publicKeyPath" }}'> - <a-input v-model.trim="cert.certFile" style="width:250px;"></a-input> + <a-input v-model.trim="cert.certFile"></a-input> </a-form-item> <a-form-item label='{{ i18n "pages.inbounds.keyPath" }}'> - <a-input v-model.trim="cert.keyFile" style="width:250px;"></a-input> + <a-input v-model.trim="cert.keyFile"></a-input> </a-form-item> <a-form-item label=" "> <a-button type="primary" icon="import" @click="setDefaultCertData(index)">{{ i18n @@ -86,10 +86,10 @@ </template> <template v-else> <a-form-item label='{{ i18n "pages.inbounds.publicKeyContent" }}'> - <a-input type="textarea" :rows="3" style="width:250px;" v-model="cert.cert"></a-input> + <a-input type="textarea" :rows="3" v-model="cert.cert"></a-input> </a-form-item> <a-form-item label='{{ i18n "pages.inbounds.keyContent" }}'> - <a-input type="textarea" :rows="3" style="width:250px;" v-model="cert.key"></a-input> + <a-input type="textarea" :rows="3" v-model="cert.key"></a-input> </a-form-item> </template> <a-form-item label='ocspStapling'> @@ -125,10 +125,10 @@ </a-form-item> <template v-if="cert.useFile"> <a-form-item label='{{ i18n "pages.inbounds.publicKeyPath" }}'> - <a-input v-model.trim="cert.certFile" style="width:250px;"></a-input> + <a-input v-model.trim="cert.certFile"></a-input> </a-form-item> <a-form-item label='{{ i18n "pages.inbounds.keyPath" }}'> - <a-input v-model.trim="cert.keyFile" style="width:250px;"></a-input> + <a-input v-model.trim="cert.keyFile"></a-input> </a-form-item> <a-form-item label=" "> <a-button type="primary" icon="import" @click="setDefaultCertXtls(index)">{{ i18n @@ -137,10 +137,10 @@ </template> <template v-else> <a-form-item label='{{ i18n "pages.inbounds.publicKeyContent" }}'> - <a-input type="textarea" :rows="3" style="width:250px;" v-model="cert.cert"></a-input> + <a-input type="textarea" :rows="3" v-model="cert.cert"></a-input> </a-form-item> <a-form-item label='{{ i18n "pages.inbounds.keyContent" }}'> - <a-input type="textarea" :rows="3" style="width:250px;" v-model="cert.key"></a-input> + <a-input type="textarea" :rows="3" v-model="cert.key"></a-input> </a-form-item> </template> </template> @@ -175,10 +175,10 @@ <a-icon @click="inbound.stream.reality.shortIds = RandomUtil.randomShortId()" type="sync"> </a-icon> </a-icon> </template> - <a-input v-model.trim="inbound.stream.reality.shortIds" style="width:250px"></a-input> + <a-input v-model.trim="inbound.stream.reality.shortIds"></a-input> </a-form-item> <a-form-item label='SpiderX'> - <a-input v-model.trim="inbound.stream.reality.settings.spiderX" style="width:250px"></a-input> + <a-input v-model.trim="inbound.stream.reality.settings.spiderX"></a-input> </a-form-item> <a-form-item label='Private Key'> <a-input v-model.trim="inbound.stream.reality.privateKey"></a-input> @@ -191,4 +191,4 @@ </a-form-item> </template> </a-form> -{{end}}
\ No newline at end of file +{{end}} diff --git a/web/html/xui/inbounds.html b/web/html/xui/inbounds.html index 3d1bc625..8203a577 100644 --- a/web/html/xui/inbounds.html +++ b/web/html/xui/inbounds.html @@ -427,7 +427,7 @@ :columns="isMobile ? innerMobileColumns : innerColumns" :data-source="getInboundClients(record)" :pagination=pagination(getInboundClients(record)) - style="margin: -12px 2px -13px;"> + :style="isMobile ? 'margin: -12px 2px -13px;' : 'margin: -12px 22px -13px;'"> {{template "client_table"}} </a-table> </template> |