Procházet zdrojové kódy

implemented the icon color and sizing for userpage Icon

白石誠 před 5 roky
rodič
revize
e19749d419

+ 5 - 7
src/client/styles/scss/_user.scss

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

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

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

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

@@ -15,7 +15,6 @@ $bordercolor-nav-tabs-hover: $gray-200 $gray-200 $bordercolor-nav-tabs !default;
 $color-nav-tabs-link-active: $gray-600 !default;
 $color-nav-tabs-link-active: $gray-600 !default;
 $bordercolor-nav-tabs-active: $bordercolor-nav-tabs $bordercolor-nav-tabs $bgcolor-global !default;
 $bordercolor-nav-tabs-active: $bordercolor-nav-tabs $bordercolor-nav-tabs $bgcolor-global !default;
 $color-seen-user: #549c79 !default;
 $color-seen-user: #549c79 !default;
-$color-user-page-icon: $color-global !default;
 
 
 // override bootstrap variables
 // override bootstrap variables
 $body-bg: $bgcolor-global;
 $body-bg: $bgcolor-global;
@@ -562,10 +561,3 @@ mark.rbt-highlight-text {
 .grw-btn-page-management:focus {
 .grw-btn-page-management:focus {
   background-color: rgba($color-link, 0.15);
   background-color: rgba($color-link, 0.15);
 }
 }
-
-// User page icon
-.grw-user-page-header {
-  svg {
-    fill: $color-user-page-icon;
-  }
-}

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

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

+ 0 - 1
src/client/styles/scss/theme/spring.scss

@@ -77,7 +77,6 @@ html[dark] {
 
 
   // Icon colors
   // Icon colors
   $color-editor-icons: $color-global;
   $color-editor-icons: $color-global;
-  $color-user-page-icon: $subthemecolor;
 
 
   // Border colors
   // Border colors
   $border-color-theme: $gray-300; // former: `$navbar-border: $gray-300;`
   $border-color-theme: $gray-300; // former: `$navbar-border: $gray-300;`

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

@@ -4,40 +4,40 @@
   <div class="container-lg user-page">
   <div class="container-lg user-page">
 
 
     {% include '../widget/page_content.html' %}
     {% include '../widget/page_content.html' %}
-    {% include 'widget/comments.html' %}
-
-    {% if page %}
-      <div class="container-lg">
-
-        <div class="grw-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
-          </h2>
-          <div class="page-list" id="user-bookmark-list">
-            <div class="page-list-container">
-            </div>
+
+  </div>
+{% endblock %}
+
+{% block content_footer %}
+  {% include 'widget/comments.html' %}
+
+  {% if page %}
+    <div class="container-lg">
+
+      <div class="grw-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
+        </h2>
+        <div class="page-list" id="user-bookmark-list">
+          <div class="page-list-container">
           </div>
           </div>
         </div>
         </div>
+      </div>
 
 
-        <div class="grw-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
-          </h2>
-          <div class="page-list" id="user-created-list">
-            <div class="page-list-container">
-            </div>
+      <div class="grw-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
+        </h2>
+        <div class="page-list" id="user-created-list">
+          <div class="page-list-container">
           </div>
           </div>
         </div>
         </div>
-
       </div>
       </div>
-    {% endif %}
 
 
-  </div>
-{% endblock %}
-
-{% block content_footer %}
+    </div>
+  {% endif %}
 
 
   <div id="page-content-footer"></div>
   <div id="page-content-footer"></div>
 {% endblock %}
 {% endblock %}