2
0
Эх сурвалжийг харах

Merge pull request #3149 from weseek/imprv/master-gw4530

imprv/master-gw4530
Yuki Takei 5 жил өмнө
parent
commit
5af8c21cd0

+ 2 - 2
src/client/styles/scss/_user.scss

@@ -44,8 +44,8 @@ $easeInOutCubic: cubic-bezier(0.65, 0, 0.35, 1);
   }
 }
 
-.user-page {
-  .grw-user-page-header {
+.user-page-footer {
+  .grw-user-page-list-m {
     svg {
       width: 35px;
       height: 35px;

+ 0 - 11
src/client/styles/scss/theme/_apply-colors-dark.scss

@@ -382,14 +382,3 @@ ul.pagination {
 .grw-modal-head {
   border-color: $border-color-global;
 }
-
-/*
- * GROWI user page
- */
-.grw-page-list-m {
-  .grw-page-list-title-m {
-    svg {
-      fill: $color-global;
-    }
-  }
-}

+ 0 - 11
src/client/styles/scss/theme/_apply-colors-light.scss

@@ -322,14 +322,3 @@ $border-color: $border-color-global;
 .grw-modal-head {
   border-color: $border-color-global;
 }
-
-/*
- * GROWI user page
- */
-.grw-page-list-m {
-  .grw-page-list-title-m {
-    svg {
-      fill: $color-global;
-    }
-  }
-}

+ 4 - 0
src/client/styles/scss/theme/_reboot-bootstrap-colors.scss

@@ -23,6 +23,10 @@ body {
   color: $body-color;
   // text-align: left; // 3
   background-color: $body-bg; // 2
+
+  svg {
+    fill: $body-color;
+  }
 }
 
 // Links

+ 3 - 3
src/server/views/layout-growi/user_page.html

@@ -12,9 +12,9 @@
   {% include 'widget/comments.html' %}
 
   {% if page %}
-    <div class="container-lg">
+    <div class="container-lg user-page-footer">
 
-      <div class="grw-page-list-m mt-5 pb-5 d-edit-none">
+      <div class="grw-user-page-list-m mt-5 pb-5 d-edit-none">
         <h2 class="grw-user-page-header border-bottom pb-2 mb-3" id="bookmarks-list">
           <i id="user-bookmark-icon"></i>
           Bookmarks
@@ -25,7 +25,7 @@
         </div>
       </div>
 
-      <div class="grw-page-list-m mt-5 pb-5 d-edit-none">
+      <div class="grw-user-page-list-m mt-5 pb-5 d-edit-none">
         <h2 class="grw-user-page-header border-bottom pb-2 mb-3" id="recently-created-list">
           <i id="recent-created-icon"></i>
           Recently Created