Pārlūkot izejas kodu

Merge pull request #4169 from weseek/imprv/GW-7037-align-footstamp-icon

aligned in a line
Yuki Takei 4 gadi atpakaļ
vecāks
revīzija
fde7c3ac24

+ 8 - 8
src/client/js/components/Sidebar/RecentChanges.jsx

@@ -83,17 +83,17 @@ class RecentChanges extends React.Component {
               <PagePathHierarchicalLink linkedPagePath={linkedPagePathLatter} basePath={dPagePath.isRoot ? undefined : dPagePath.former} />
               <PagePathHierarchicalLink linkedPagePath={linkedPagePathLatter} basePath={dPagePath.isRoot ? undefined : dPagePath.former} />
               {locked}
               {locked}
             </h5>
             </h5>
-            <div>
+            <div className="mt-1 mb-2">
               { tagElements }
               { tagElements }
             </div>
             </div>
-            <div className="d-flex justify-content-between grw-recent-changes-item-lower mt-1">
-              <div>
-                <span className="footstamp-icon mr-1"><FootstampIcon /></span>
-                <span className="mr-2 grw-list-counts">{page.seenUsers.length}</span>
-                <i className="icon-bubble mr-1"></i>
-                <span className="mr-2 grw-list-counts">{page.commentCount}</span>
+            <div className="d-flex justify-content-between grw-recent-changes-item-lower pt-1">
+              <div className="d-flex">
+                <div className="footstamp-icon mr-1 d-inline-block"><FootstampIcon /></div>
+                <div className="mr-2 grw-list-counts d-inline-block">{page.seenUsers.length}</div>
+                <div className="icon-bubble mr-1 d-inline-block"></div>
+                <div className="mr-2 grw-list-counts d-inline-block">{page.commentCount}</div>
               </div>
               </div>
-              <div className="small mt-auto">
+              <div className="grw-formatted-distance-date small mt-auto">
                 <FormattedDistanceDate id={page.id} date={page.updatedAt} />
                 <FormattedDistanceDate id={page.id} date={page.updatedAt} />
               </div>
               </div>
             </div>
             </div>

+ 11 - 3
src/client/styles/scss/_recent-changes.scss

@@ -1,17 +1,25 @@
 .list-group {
 .list-group {
   .list-group-item {
   .list-group-item {
+    .grw-recent-changes-item-lower {
+      height: 17.5px;
+    }
     .footstamp-icon {
     .footstamp-icon {
       svg {
       svg {
-        width: 13.92px;
-        height: 13.95px;
-        viewbox: 0 0 13.9 13.9;
+        width: 14px;
+        height: 14px;
+        transform: translateY(-3.5px);
       }
       }
     }
     }
 
 
     .grw-list-counts {
     .grw-list-counts {
+      height: 14px;
       font-size: 12px;
       font-size: 12px;
     }
     }
 
 
+    .grw-formatted-distance-date {
+      font-size: 10px;
+    }
+
     .icon-lock {
     .icon-lock {
       font-size: 14px;
       font-size: 14px;
     }
     }