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

Response to feedback
-Delete unnecessary files.
-Deleted the `!important` description from the color specification.

oshikishintaro 5 лет назад
Родитель
Сommit
b7a9264134

+ 2 - 2
src/client/js/components/User/SeenUserList.jsx

@@ -21,8 +21,8 @@ const SeenUserList = (props) => {
   const { pageContainer } = props;
   const { pageContainer } = props;
   return (
   return (
     <div>
     <div>
-      <Button id="SeenUserPopover" type="button" className="btn btn-seen-user-list border-0 px-1 py-0" style={{ backgroundColor: 'transparent' }}>
-        <span className="mr-2 svg footstamp-icon"><FootstampIcon /></span>
+      <Button id="SeenUserPopover" type="button" className="btn btn-seen-user-lists border-0 px-1 py-0 bg-transparent">
+        <span className="mr-2 footstamp-icon"><FootstampIcon /></span>
         <span className="seen-user-count">{pageContainer.state.countOfSeenUsers}</span>
         <span className="seen-user-count">{pageContainer.state.countOfSeenUsers}</span>
       </Button>
       </Button>
       <Popover placement="bottom" isOpen={popoverOpen} target="SeenUserPopover" toggle={toggle} trigger="legacy">
       <Popover placement="bottom" isOpen={popoverOpen} target="SeenUserPopover" toggle={toggle} trigger="legacy">

+ 14 - 18
src/client/styles/scss/theme/_apply-colors.scss

@@ -247,11 +247,23 @@ pre:not(.hljs):not(.CodeMirror-line) {
 }
 }
 
 
 .top-of-table-contents {
 .top-of-table-contents {
-  border-bottom-color: $bordercolor-nav-tabs;
-
+  border-color: $bordercolor-nav-tabs;
   .table-top-icon {
   .table-top-icon {
     fill: $color-link;
     fill: $color-link;
   }
   }
+  .btn.btn-seen-user-lists {
+    color: $color-seen-user;
+    &:active {
+      color: $color-seen-user;
+    }
+    &:focus {
+      outline: none;
+      box-shadow: none;
+    }
+    .footstamp-icon {
+      fill: $color-seen-user;
+    }
+  }
 }
 }
 
 
 .grw-page-accessories-modal {
 .grw-page-accessories-modal {
@@ -441,19 +453,3 @@ mark.rbt-highlight-text {
 .bg-box {
 .bg-box {
   background-color: $bgcolor-global;
   background-color: $bgcolor-global;
 }
 }
-
-.btn.btn-seen-user-list {
-  @include button-outline-variant($color-seen-user, $color-seen-user, transparent, transparent);
-  &:active {
-    color: $color-seen-user !important;
-  }
-  &:focus {
-    outline: none !important;
-    box-shadow: none !important;
-  }
-  border-left-color: $bordercolor-nav-tabs;
-}
-
-.svg.footstamp-icon {
-  fill: $color-seen-user !important;
-}

+ 0 - 9
src/server/views/layout-growi/widget/liker-and-seenusers.html

@@ -1,9 +0,0 @@
-<div class="liker-and-seenusers">
-
-
-  <div
-    id="seen-user-list"
-    data-user-ids-str="{{ page.seenUsers|slice(-15)|default([])|reverse|join(',') }}"
-    data-sum-of-seen-users="{{ page.seenUsers.length|default(0) }}"
-  ></div>
-</div>