Просмотр исходного кода

Merge pull request #7663 from weseek/imprv/font-size

imprv: Font size
Yuki Takei 2 лет назад
Родитель
Сommit
e279292e9e

+ 1 - 1
apps/app/src/components/Layout/SearchResultLayout.module.scss

@@ -75,7 +75,7 @@
 
         .wiki {
           padding: 16px;
-          font-size: 13px;
+          font-size: 14px;
         }
       }
     }

+ 1 - 0
apps/app/src/components/PageEditor/CodeMirrorEditor.module.scss

@@ -13,6 +13,7 @@
 
   .CodeMirror {
     font-family: var(--font-family-monospace);
+    font-size: 15px;
 
     pre.CodeMirror-line.grw-cm-header-line {
       padding-top: 0.16em;

+ 0 - 137
apps/app/src/styles/_search.scss

@@ -1,137 +0,0 @@
-// styles for admin user search
-.admin-user-page {
-  .search-typeahead {
-    .search-clear {
-      top: 7px;
-      right: 4px;
-    }
-  }
-}
-
-// layout
-.on-search {
-  .page-wrapper {
-    padding-bottom: unset;
-  }
-
-  .search-control-include-options {
-    .card-body {
-      padding: 5px 10px;
-    }
-  }
-  .search-result-list {
-    .search-result-list-scroll {
-      // subtract the height of GrowiNavbar + (SearchControl component + other factors)
-      height: calc(100vh - (($grw-navbar-height + $grw-navbar-border-width) + 110px));
-      overflow-y: scroll;
-
-      @include media-breakpoint-down(sm) {
-        height: calc(100vh - (($grw-navbar-height + $grw-navbar-border-width + $grw-navbar-bottom-height) + 123px));
-      }
-    }
-
-    .search-result-keyword {
-      font-size: 17.5px;
-      font-weight: bold;
-    }
-    .search-result-select-group {
-      > select {
-        max-width: 8rem;
-      }
-    }
-
-    // list group
-    .page-list {
-      // not show top label in search result list
-      .page-list-meta {
-        .top-label {
-          display: none;
-        }
-      }
-    }
-  }
-
-  .search-result-content {
-    .search-result-content-nav {
-      min-height: $grw-subnav-search-preview-min-height;
-      overflow: auto;
-
-      .grw-subnav {
-        min-height: inherit;
-      }
-    }
-
-    .search-result-content {
-      height: calc(100vh - ($grw-navbar-height + $grw-navbar-border-width));
-
-      > h2 {
-        margin-right: 10px;
-        font-size: 22px;
-        line-height: 1em;
-      }
-
-      &:first-child > h2 {
-        margin-top: 0;
-      }
-
-      .search-result-content-body-container {
-        overflow-y: auto;
-
-        .wiki {
-          padding: 16px;
-          font-size: 13px;
-        }
-      }
-    }
-  }
-}
-
-// support for your search
-.grw-search-table {
-  caption {
-    display: table-header-group;
-  }
-}
-
-@include media-breakpoint-down(sm) {
-  .grw-search-table {
-    th {
-      text-align: right;
-    }
-
-    td {
-      overflow-wrap: anywhere;
-      white-space: normal !important;
-    }
-
-    @include media-breakpoint-down(xs) {
-      th,
-      td {
-        display: block;
-      }
-
-      th {
-        text-align: left;
-      }
-
-      td {
-        padding-top: 0 !important;
-        border-top: none !important;
-      }
-    }
-  }
-}
-
-
-// style to apply when displaying search page
-.on-search {
-  // set sidebar height shown in search page
-  $search-page-sidebar-height: calc(100vh - ($grw-navbar-height + $grw-navbar-border-width));
-
-  .grw-sidebar {
-    height: $search-page-sidebar-height;
-    .data-layout-container {
-      height: 100%;
-    }
-  }
-}

+ 5 - 1
apps/app/src/styles/organisms/_wiki.scss

@@ -11,7 +11,7 @@
     }
   }
 
-  font-size: 15px;
+  font-size: 16px;
 
   // @extend .text-break;
   // https://github.com/twbs/bootstrap/blob/v4.6.1/scss/utilities/_text.scss#L65-L68
@@ -83,6 +83,10 @@
     font-weight: normal;
   }
 
+  table {
+    font-size: 0.95em;
+  }
+
   blockquote {
     padding: 0 20px;
     margin: 0 0 30px 0;

+ 0 - 1
apps/app/src/styles/style-app.scss

@@ -21,7 +21,6 @@
 @import 'mirror_mode';
 @import 'modal';
 @import 'page-path';
-@import 'search';
 @import 'tag';
 @import 'installer';