takahiros 6 лет назад
Родитель
Сommit
55e36ea920

+ 7 - 0
src/client/styles/scss/_layout_variable.scss

@@ -20,3 +20,10 @@ $grw-white-green: #f8fffb;
 
 /* blue */
 $grw-alice-blue: aliceblue;
+
+/* white */
+$grw-floral-white: floralwhite;
+
+.bg-grw-floral-white {
+  background: $grw-floral-white;
+}

+ 1 - 1
src/server/views/layout-growi/base/layout.html

@@ -8,7 +8,7 @@
 {% block layout_main %}
 <div class="container-fluid">
 
-  <div class="row hidden-print bg-title d-none d-md-block">
+  <div class="row hidden-print bg-grw-floral-white d-none d-md-block px-3 py-2">
     <div class="col-xs-12 header-container">
       {% block content_header %}
       {% endblock %}

+ 9 - 9
src/server/views/layout-growi/widget/header.html

@@ -18,8 +18,8 @@
       <ul class="authors hidden-sm hidden-xs text-nowrap">
         <li>
           <div class="d-flex align-items-center not-affix">
-            <a class="m-r-5" href="{{ userPageRoot(page.creator) }}" data-toggle="tooltip" data-placement="bottom" title="{{ page.creator.name|default(author.name) }}">
-              <img src="{{ page.creator|default(author)|picture }}" class="picture img-circle">
+            <a class="mr-2" href="{{ userPageRoot(page.creator) }}" data-toggle="tooltip" data-placement="bottom" title="{{ page.creator.name|default(author.name) }}">
+              <img src="{{ page.creator|default(author)|picture }}" class="picture rounded-circle">
             </a>
             <div>
               <div>Created by <a href="{{ userPageRoot(page.creator) }}">{{ page.creator.name|default(author.name) }}</a></div>
@@ -27,18 +27,18 @@
             </div>
           </div>
           <div class="d-flex align-items-center only-affix">
-            <a class="m-r-5" href="{{ userPageRoot(page.creator) }}" data-toggle="tooltip" data-placement="bottom" title="{{ page.creator.name|default(author.name) }}">
-              <img src="{{ page.creator|default(author)|picture }}" class="picture picture-xs img-circle">
+            <a class="mr-2" href="{{ userPageRoot(page.creator) }}" data-toggle="tooltip" data-placement="bottom" title="{{ page.creator.name|default(author.name) }}">
+              <img src="{{ page.creator|default(author)|picture }}" class="picture picture-xs rounded-circle">
             </a>
             <div class="ml-auto">
               <div>Created in <span class="text-muted">{{ page.createdAt|datetz('Y/m/d H:i:s') }}</span></div>
             </div>
           </div>
         </li>
-        <li class="m-t-5">
+        <li class="mt-2">
           <div class="d-flex align-items-center not-affix">
-            <a class="m-r-5" href="{{ userPageRoot(author) }}" data-toggle="tooltip" data-placement="bottom" title="{{ author.name }}">
-              <img src="{{ author|picture }}" class="picture img-circle">
+            <a class="mr-2" href="{{ userPageRoot(author) }}" data-toggle="tooltip" data-placement="bottom" title="{{ author.name }}">
+              <img src="{{ author|picture }}" class="picture rounded-circle">
             </a>
             <div>
               <div>Updated by <a href="{{ userPageRoot(page.revision.author) }}">{{ author.name }}</a></div>
@@ -46,8 +46,8 @@
             </div>
           </div>
           <div class="d-flex align-items-center only-affix">
-            <a class="m-r-5" href="{{ userPageRoot(author) }}" data-toggle="tooltip" data-placement="bottom" title="{{ author.name }}">
-              <img src="{{ author|picture }}" class="picture picture-xs img-circle">
+            <a class="mr-2" href="{{ userPageRoot(author) }}" data-toggle="tooltip" data-placement="bottom" title="{{ author.name }}">
+              <img src="{{ author|picture }}" class="picture picture-xs rounded-circle">
             </a>
             <div class="ml-auto">
               <div>Updated in <span class="text-muted"">{{ page.updatedAt|datetz('Y/m/d H:i:s') }}</span></div>

+ 1 - 1
src/server/views/widget/header-buttons-lg.html

@@ -5,7 +5,7 @@
       {% include 'header-button-like.html' with opts %}
     {% endif %}
   </div>
-  <div class="m-l-5">
+  <div class="ml-1">
     {% if user %}
       {% include 'header-button-bookmark.html' with opts %}
     {% endif %}

+ 1 - 1
src/server/views/widget/header-buttons.html

@@ -4,7 +4,7 @@
       {% include 'header-button-like.html' %}
     {% endif %}
   </div>
-  <div class="m-l-5">
+  <div class="ml-1">
     {% if user %}
       {% include 'header-button-bookmark.html' %}
     {% endif %}