Ver Fonte

Переход на quasar

Book Pauk há 5 anos atrás
pai
commit
fa9b3116f1

+ 11 - 51
client/components/Reader/SettingsPage/SettingsPage.vue

@@ -39,11 +39,15 @@
                 <div v-if="selectedTab == 'profiles'" class="fit tab-panel">
                 <div v-if="selectedTab == 'profiles'" class="fit tab-panel">
                     @@include('./include/ProfilesTab.inc');
                     @@include('./include/ProfilesTab.inc');
                 </div>
                 </div>
-
                 <!-- Вид ------------------------------------------------------------------------->                    
                 <!-- Вид ------------------------------------------------------------------------->                    
                 <div v-if="selectedTab == 'view'" class="fit column">
                 <div v-if="selectedTab == 'view'" class="fit column">
                     @@include('./include/ViewTab.inc');
                     @@include('./include/ViewTab.inc');
                 </div>
                 </div>
+                <!-- Кнопки ---------------------------------------------------------------------->
+                <div v-if="selectedTab == 'buttons'" class="fit tab-panel">
+                    @@include('./include/ButtonsTab.inc');
+                </div>
+
             </div>
             </div>
 
 
         </div>
         </div>
@@ -53,13 +57,6 @@
 <script>
 <script>
 /*
 /*
             <el-tabs type="border-card" tab-position="left" v-model="selectedTabOld">
             <el-tabs type="border-card" tab-position="left" v-model="selectedTabOld">
-
-                <!-- Вид ------------------------------------------------------------------------->                    
-                @@include('./includeOld/ViewTabOld.inc');
-
-                <!-- Кнопки ---------------------------------------------------------------------->
-                @@include('./includeOld/ButtonsTabOld.inc');
-
                 <!-- Управление ------------------------------------------------------------------>
                 <!-- Управление ------------------------------------------------------------------>
                 @@include('./includeOld/KeysTabOld.inc');
                 @@include('./includeOld/KeysTabOld.inc');
 
 
@@ -526,7 +523,7 @@ class SettingsPage extends Vue {
 }
 }
 
 
 .part-header {
 .part-header {
-    border-bottom: 2px solid #bbbbbb;
+    border-top: 2px solid #bbbbbb;
     font-weight: bold;
     font-weight: bold;
     font-size: 110%;
     font-size: 110%;
     margin-top: 15px;
     margin-top: 15px;
@@ -547,7 +544,11 @@ class SettingsPage extends Vue {
     width: 110px;
     width: 110px;
 }
 }
 
 
-.label-1, .label-2 {
+.label-3 {
+    width: 110px;
+}
+
+.label-1, .label-2, .label-3 {
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
     justify-content: center;
     justify-content: center;
@@ -586,44 +587,3 @@ class SettingsPage extends Vue {
     width: 150px;
     width: 150px;
 }
 }
 </style>
 </style>
-
-<style scoped>
-/* TODO: REMOVE */
-.el-form {
-    border-top: 2px solid #bbbbbb;
-    margin-bottom: 5px;
-}
-
-.el-form-item {
-    padding: 0 !important;
-    margin: 0 !important;
-    margin-bottom: 5px !important;
-}
-
-.color-picked {
-    margin-left: 10px;
-    position: relative;
-    top: -11px;
-}
-
-.el-tabs {
-    flex: 1;
-    display: flex;
-}
-
-.el-tab-pane {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    width: 420px;
-    overflow-y: auto;
-    padding: 15px;
-}
-</style>
-
-<style>
-.prompt-dialog {
-    width: 100% !important;
-    max-width: 450px;
-}
-</style>

+ 7 - 8
client/components/Reader/SettingsPage/include/ButtonsTab.inc

@@ -1,9 +1,8 @@
-            <el-tab-pane label="Кнопки">
-                <el-form :model="form" size="mini" label-width="120px" @submit.native.prevent>
-                    <div class="partHeader">Показывать кнопки панели</div>
+<div class="part-header">Показывать кнопки панели</div>
 
 
-                    <el-form-item label="" v-for="item in toolButtons" :key="item.name">
-                        <el-checkbox @change="changeShowToolButton(item.name)" :value="showToolButton[item.name]">{{item.text}}</el-checkbox>
-                    </el-form-item>
-                </el-form>
-            </el-tab-pane>
+<div class="item row" v-for="item in toolButtons" :key="item.name">
+    <div class="label-3"></div>
+    <div class="col row">
+        <q-checkbox size="xs" @input="changeShowToolButton(item.name)" :value="showToolButton[item.name]" :label="item.text" />
+    </div>
+</div>