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

modified the size of the icon on user page and the size of it

白石誠 5 лет назад
Родитель
Сommit
5c41a579ba

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

@@ -15,6 +15,7 @@ $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;
@@ -561,3 +562,10 @@ 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;
+  }
+}

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

@@ -77,6 +77,7 @@ 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' %}
-
-  </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">
+    {% 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>
 
 
-      <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 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>
       </div>
+    {% endif %}
 
 
-    </div>
-  {% endif %}
+  </div>
+{% endblock %}
+
+{% block content_footer %}
 
 
   <div id="page-content-footer"></div>
   <div id="page-content-footer"></div>
 {% endblock %}
 {% endblock %}