Преглед изворни кода

Merge pull request #4222 from weseek/imprv/GW-7185-tags-common

Imprv/gw 7185 tags common
Yuki Takei пре 4 година
родитељ
комит
9a22900dc6

+ 1 - 1
packages/app/src/components/Sidebar/RecentChanges.jsx

@@ -54,7 +54,7 @@ function LargePageItem({ page }) {
             <PagePathHierarchicalLink linkedPagePath={linkedPagePathLatter} basePath={dPagePath.isRoot ? undefined : dPagePath.former} />
             <PagePathHierarchicalLink linkedPagePath={linkedPagePathLatter} basePath={dPagePath.isRoot ? undefined : dPagePath.former} />
             {locked}
             {locked}
           </h5>
           </h5>
-          <div className="mt-1 mb-2">
+          <div className="grw-tag-labels mt-1 mb-2">
             { tagElements }
             { tagElements }
           </div>
           </div>
           <div className="d-flex justify-content-between grw-recent-changes-item-lower pt-1">
           <div className="d-flex justify-content-between grw-recent-changes-item-lower pt-1">

+ 2 - 4
packages/app/src/styles/_tag.scss

@@ -6,9 +6,9 @@
 
 
 .grw-tag-labels {
 .grw-tag-labels {
   .grw-tag-label {
   .grw-tag-label {
-    margin-left: 1px;
     font-size: 12px;
     font-size: 12px;
-    border-radius: $border-radius-xl;
+    font-weight: normal;
+    border-radius: $border-radius-sm;
   }
   }
 }
 }
 
 
@@ -21,7 +21,5 @@
 .grw-recent-changes {
 .grw-recent-changes {
   .grw-tag-label {
   .grw-tag-label {
     font-size: 10px;
     font-size: 10px;
-    font-weight: normal;
-    border-radius: $border-radius-sm;
   }
   }
 }
 }

+ 1 - 1
packages/app/src/styles/theme/_apply-colors-light.scss

@@ -12,7 +12,7 @@ $border-color-table: $gray-200 !default;
 $color-table-hover: $color-table !default;
 $color-table-hover: $color-table !default;
 $bgcolor-table-hover: rgba(black, 0.075) !default;
 $bgcolor-table-hover: rgba(black, 0.075) !default;
 $bgcolor-sidebar-list-group: $bgcolor-list !default;
 $bgcolor-sidebar-list-group: $bgcolor-list !default;
-$color-tags: $gray-500 !default;
+$color-tags: $secondary !default;
 $bgcolor-tags: $gray-200 !default;
 $bgcolor-tags: $gray-200 !default;
 $border-color-global: $gray-300 !default;
 $border-color-global: $gray-300 !default;
 $border-color-toc: $border-color-global !default;
 $border-color-toc: $border-color-global !default;

+ 0 - 5
packages/app/src/styles/theme/_apply-colors.scss

@@ -303,11 +303,6 @@ ul.pagination {
       .list-group-item {
       .list-group-item {
         background-color: transparent;
         background-color: transparent;
 
 
-        .grw-tag-label {
-          color: $secondary;
-          background-color: $gray-200;
-        }
-
         .icon-lock {
         .icon-lock {
           color: $color-link;
           color: $color-link;
         }
         }