ソースを参照

Поправки разметки

Book Pauk 2 年 前
コミット
529095e014

+ 1 - 1
client/components/Search/AuthorList/AuthorList.vue

@@ -152,7 +152,7 @@ class AuthorList extends BaseList {
     }
 
     get foundCountMessage() {
-        return `Найден${utils.wordEnding(this.list.totalFound, 2)} ${this.list.totalFound} автор${utils.wordEnding(this.list.totalFound)}`;
+        return `Всего найден${utils.wordEnding(this.list.totalFound, 2)} ${this.list.totalFound} автор${utils.wordEnding(this.list.totalFound)}`;
     }    
 
     isFoundSeriesBook(seriesItem, seriesBook) {

+ 16 - 15
client/components/Search/Search.vue

@@ -94,16 +94,6 @@
                             {{ `${(extendedParams ? 'Скрыть' : 'Показать')} дополнительные критерии поиска` }}
                         </q-tooltip>
                     </DivBtn>
-
-                    <div class="q-mx-xs" />
-                    <div class="row items-center q-mt-xs">
-                        <div v-show="list.queryFound > 0">
-                            {{ foundCountMessage }}
-                        </div>
-                        <div v-show="list.queryFound == 0">
-                            Ничего не найдено
-                        </div>
-                    </div>
                 </div>
                 <div v-show="extendedParams" class="row q-mx-md q-mb-sm items-center">
                     <q-input
@@ -122,18 +112,29 @@
                 </div>
             </div>
 
-            <div class="row justify-center" style="min-height: 48px">
-                <PageScroller v-show="pageCount > 1" ref="pageScroller1" v-model="search.page" :page-count="pageCount" />
+            <div class="row items-center q-ml-lg q-mt-sm">
+                <div style="width: 400px; height: 48px">
+                    <PageScroller v-show="pageCount > 1" ref="pageScroller1" v-model="search.page" :page-count="pageCount" />
+                </div>
+
+                <div class="row items-center">
+                    <div v-show="list.queryFound > 0" class="q-pl-sm">
+                        {{ foundCountMessage }}
+                    </div>
+                </div>
             </div>
 
             <!-- Формирование списка ------------------------------------------------------------------------>
-            <component :is="selectedListComponent" v-if="selectedListComponent" ref="list" :list="list" :search="search" :genre-map="genreMap" @list-event="listEvent" />
+            <div v-if="selectedListComponent">
+                <div><hr></div>
+                <component :is="selectedListComponent" ref="list" :list="list" :search="search" :genre-map="genreMap" @list-event="listEvent" />
+                <div><hr></div>
+            </div>
             <!-- Формирование списка конец ------------------------------------------------------------------>
 
-            <div class="row justify-center">
+            <div class="row q-ml-lg q-mb-sm">
                 <PageScroller v-show="pageCount > 1" v-model="search.page" :page-count="pageCount" />
             </div>
-            <div v-show="pageCount <= 1" class="q-mt-lg" />
         </div>
 
         <Dialog v-model="settingsDialogVisible">

+ 1 - 1
client/components/Search/SeriesList/SeriesList.vue

@@ -117,7 +117,7 @@ import _ from 'lodash';
 
 class SeriesList extends BaseList {
     get foundCountMessage() {
-        return `Найден${utils.wordEnding(this.list.totalFound, 4)} ${this.list.totalFound} сери${utils.wordEnding(this.list.totalFound, 1)}`;
+        return `Всего найден${utils.wordEnding(this.list.totalFound, 4)} ${this.list.totalFound} сери${utils.wordEnding(this.list.totalFound, 1)}`;
     }
 
     isFoundSeriesBook(seriesItem, seriesBook) {

+ 3 - 7
client/components/Search/TitleList/TitleList.vue

@@ -8,14 +8,14 @@
         <!-- Формирование списка ------------------------------------------------------------------------>
         <div v-for="item in tableData" :key="item.key" class="column" :class="{'odd-item': item.num % 2}" style="font-size: 120%">
             <BookView
-                class="book-row"
+                class="q-ml-md"
                 title-list
                 :book="item.book" :genre-map="genreMap" :show-read-link="showReadLink" @book-event="bookEvent"
             />
             <BookView
                 v-for="book in item.books" :key="book.id"
                 :book="book" :genre-map="genreMap"
-                class="book-row"
+                class="q-ml-md"
                 title-list
                 :show-read-link="showReadLink"
                 @book-event="bookEvent"
@@ -43,7 +43,7 @@ import _ from 'lodash';
 
 class TitleList extends BaseList {
     get foundCountMessage() {
-        return `Найден${utils.wordEnding(this.list.totalFound, 7)} ${this.list.totalFound} уникальн${utils.wordEnding(this.list.totalFound, 6)} назван${utils.wordEnding(this.list.totalFound, 3)}`;
+        return `Всего найден${utils.wordEnding(this.list.totalFound, 7)} ${this.list.totalFound} уникальн${utils.wordEnding(this.list.totalFound, 6)} назван${utils.wordEnding(this.list.totalFound, 3)}`;
     }
 
     async updateTableData() {
@@ -153,8 +153,4 @@ export default vueComponent(TitleList);
 .odd-item {
     background-color: #e8e8e8;
 }
-
-.book-row {
-    margin-left: 50px;
-}
 </style>