1
0
Эх сурвалжийг харах

UI Improvements and Fixes (#3470)

Tara Rostami 15 цаг өмнө
parent
commit
76afff2a6f

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
web/assets/css/custom.min.css


+ 3 - 3
web/html/index.html

@@ -2,7 +2,7 @@
 {{ template "page/head_end" .}}
 {{ template "page/head_end" .}}
 
 
 {{ template "page/body_start" .}}
 {{ template "page/body_start" .}}
-<a-layout id="app" v-cloak :class="themeSwitcher.currentTheme">
+<a-layout id="app" v-cloak :class="themeSwitcher.currentTheme + ' index-page'">
   <a-sidebar></a-sidebar>
   <a-sidebar></a-sidebar>
   <a-layout id="content-layout">
   <a-layout id="content-layout">
     <a-layout-content>
     <a-layout-content>
@@ -88,7 +88,7 @@
                   </template>
                   </template>
                   <template #extra>
                   <template #extra>
                     <template v-if="status.xray.state != 'error'">
                     <template v-if="status.xray.state != 'error'">
-                      <a-badge status="processing" class="running-animation" :text="status.xray.stateMsg" :color="status.xray.color"/>
+                      <a-badge status="processing" :class="({ green: 'xray-running-animation', orange: 'xray-stop-animation' }[status.xray.color]) || 'xray-processing-animation'" :text="status.xray.stateMsg" :color="status.xray.color"/>
                     </template>
                     </template>
                     <template v-else>
                     <template v-else>
                       <a-popover :overlay-class-name="themeSwitcher.currentTheme">
                       <a-popover :overlay-class-name="themeSwitcher.currentTheme">
@@ -105,7 +105,7 @@
                         <template slot="content">
                         <template slot="content">
                           <span class="max-w-400" v-for="line in status.xray.errorMsg.split('\n')">[[ line ]]</span>
                           <span class="max-w-400" v-for="line in status.xray.errorMsg.split('\n')">[[ line ]]</span>
                         </template>
                         </template>
-                        <a-badge :text="status.xray.stateMsg" :color="status.xray.color"/>
+                        <a-badge :text="status.xray.stateMsg" :color="status.xray.color" :class="status.xray.color === 'red' ? 'xray-error-animation' : ''"/>
                       </a-popover>
                       </a-popover>
                     </template>
                     </template>
                   </template>
                   </template>

+ 3 - 2
web/html/modals/inbound_info_modal.html

@@ -102,14 +102,15 @@
       <a-tag :color="inbound.stream.security == 'none' ? 'red' : 'green'">[[ inbound.stream.security ]]</a-tag>
       <a-tag :color="inbound.stream.security == 'none' ? 'red' : 'green'">[[ inbound.stream.security ]]</a-tag>
       <br />
       <br />
       <td>Authentication</td>
       <td>Authentication</td>
-        <a-tag :color="inbound.settings.selectedAuth ? 'green' : 'red'">[[ inbound.settings.selectedAuth ? inbound.settings.selectedAuth : '' ]]</a-tag>
+        <a-tag v-if="inbound.settings.selectedAuth" color="green">[[ inbound.settings.selectedAuth ? inbound.settings.selectedAuth : '' ]]</a-tag>
+        <a-tag v-else color="red">{{ i18n "none" }}</a-tag>
       <br />
       <br />
       {{ i18n "encryption" }}
       {{ i18n "encryption" }}
         <a-tag :color="inbound.settings.encryption ? 'green' : 'red'">[[ inbound.settings.encryption ? inbound.settings.encryption : '' ]]</a-tag>
         <a-tag :color="inbound.settings.encryption ? 'green' : 'red'">[[ inbound.settings.encryption ? inbound.settings.encryption : '' ]]</a-tag>
       <br />
       <br />
       <template v-if="inbound.stream.security != 'none'">
       <template v-if="inbound.stream.security != 'none'">
         {{ i18n "domainName" }}
         {{ i18n "domainName" }}
-        <a-tag v-if="inbound.serverName" :color="inbound.serverName ? 'green' : 'orange'">[[ inbound.serverName ? inbound.serverName : '' ]]</a-tag>
+        <a-tag v-if="inbound.serverName" color="green">[[ inbound.serverName ? inbound.serverName : '' ]]</a-tag>
         <a-tag v-else color="orange">{{ i18n "none" }}</a-tag>
         <a-tag v-else color="orange">{{ i18n "none" }}</a-tag>
       </template>
       </template>
     </template>
     </template>

+ 3 - 3
web/html/subscription.html

@@ -9,7 +9,7 @@
 {{ template "page/head_end" .}}
 {{ template "page/head_end" .}}
 
 
 {{ template "page/body_start" .}}
 {{ template "page/body_start" .}}
-<a-layout id="app" v-cloak :class="themeSwitcher.currentTheme">
+<a-layout id="app" v-cloak :class="themeSwitcher.currentTheme + ' subscription-page'">
     <a-layout-content class="p-2">
     <a-layout-content class="p-2">
         <a-row type="flex" justify="center" class="mt-2">
         <a-row type="flex" justify="center" class="mt-2">
             <a-col :xs="24" :sm="22" :md="18" :lg="14" :xl="12">
             <a-col :xs="24" :sm="22" :md="18" :lg="14" :xl="12">
@@ -200,7 +200,7 @@
                                     style="text-align:center;">
                                     style="text-align:center;">
                                     <!-- Android dropdown -->
                                     <!-- Android dropdown -->
                                     <a-dropdown :trigger="['click']">
                                     <a-dropdown :trigger="['click']">
-                                        <a-button :block="isMobile"
+                                        <a-button icon="android" :block="isMobile"
                                             :style="{ marginTop: isMobile ? '6px' : 0 }"
                                             :style="{ marginTop: isMobile ? '6px' : 0 }"
                                             size="large" type="primary">
                                             size="large" type="primary">
                                             Android <a-icon type="down" />
                                             Android <a-icon type="down" />
@@ -225,7 +225,7 @@
                                     style="text-align:center;">
                                     style="text-align:center;">
                                     <!-- iOS dropdown -->
                                     <!-- iOS dropdown -->
                                     <a-dropdown :trigger="['click']">
                                     <a-dropdown :trigger="['click']">
-                                        <a-button :block="isMobile"
+                                        <a-button icon="apple" :block="isMobile"
                                             :style="{ marginTop: isMobile ? '6px' : 0 }"
                                             :style="{ marginTop: isMobile ? '6px' : 0 }"
                                             size="large" type="primary">
                                             size="large" type="primary">
                                             iOS <a-icon type="down" />
                                             iOS <a-icon type="down" />

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно