Yuki Takei 8 лет назад
Родитель
Сommit
aae98d3f10
2 измененных файлов с 29 добавлено и 7 удалено
  1. 6 2
      lib/views/layout/layout.html
  2. 23 5
      resource/styles/scss/_layout.scss

+ 6 - 2
lib/views/layout/layout.html

@@ -130,7 +130,7 @@ gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js
             <!-- <svg viewBox="0 0 448 448">
               <path d="M0 376v-48q0-3.25 2.375-5.625t5.625-2.375h48q3.25 0 5.625 2.375t2.375 5.625v48q0 3.25-2.375 5.625t-5.625 2.375h-48q-3.25 0-5.625-2.375t-2.375-5.625zM0 280v-48q0-3.25 2.375-5.625t5.625-2.375h48q3.25 0 5.625 2.375t2.375 5.625v48q0 3.25-2.375 5.625t-5.625 2.375h-48q-3.25 0-5.625-2.375t-2.375-5.625zM0 184v-48q0-3.25 2.375-5.625t5.625-2.375h48q3.25 0 5.625 2.375t2.375 5.625v48q0 3.25-2.375 5.625t-5.625 2.375h-48q-3.25 0-5.625-2.375t-2.375-5.625zM0 88v-48q0-3.25 2.375-5.625t5.625-2.375h48q3.25 0 5.625 2.375t2.375 5.625v48q0 3.25-2.375 5.625t-5.625 2.375h-48q-3.25 0-5.625-2.375t-2.375-5.625zM96 376v-48q0-3.25 2.375-5.625t5.625-2.375h336q3.25 0 5.625 2.375t2.375 5.625v48q0 3.25-2.375 5.625t-5.625 2.375h-336q-3.25 0-5.625-2.375t-2.375-5.625zM96 280v-48q0-3.25 2.375-5.625t5.625-2.375h336q3.25 0 5.625 2.375t2.375 5.625v48q0 3.25-2.375 5.625t-5.625 2.375h-336q-3.25 0-5.625-2.375t-2.375-5.625zM96 184v-48q0-3.25 2.375-5.625t5.625-2.375h336q3.25 0 5.625 2.375t2.375 5.625v48q0 3.25-2.375 5.625t-5.625 2.375h-336q-3.25 0-5.625-2.375t-2.375-5.625zM96 88v-48q0-3.25 2.375-5.625t5.625-2.375h336q3.25 0 5.625 2.375t2.375 5.625v48q0 3.25-2.375 5.625t-5.625 2.375h-336q-3.25 0-5.625-2.375t-2.375-5.625z"></path>
             </svg> -->
-            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 226.44 196.11">
+            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 226.44 196.11" class="light-logo">
               <polygon points="56.61 196.11 169.83 196.11 226.44 98.06 188.7 98.06 150.96 163.43 75.48 163.43 56.61 196.11" />
               <polygon points="75.48 98.05 94.35 65.37 150.96 65.38 207.57 65.37 207.57 65.38 226.44 98.06 169.83 98.06 113.22 98.06 94.39 130.66 94.3 130.66 84.92 114.4 75.48 98.05" />
               <polygon points="0 98.06 56.6 0 113.22 0.01 169.83 0.01 169.83 0.01 188.69 32.68 132.09 32.69 75.47 32.69 18.86 130.74 0 98.06" />
@@ -142,7 +142,11 @@ gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js
             <!-- <img src="../plugins/images/agileadmin-text.png" alt="home" class="dark-logo" /> -->
             <!--This is light logo text-->
             <!-- <img src="../plugins/images/agileadmin-text-dark.png" alt="home" class="light-logo" /> -->
-            {% block title %}{{ config.crowi['app:title']|default('Crowi') }}{% endblock %}
+            <svg xmlns="http://www.w3.org/2000/svg" class="light-logo-text">
+              <text x="0" y="35" font-size="30" font-weight="bold">
+                {% block title %}{{ config.crowi['app:title']|default('GROWI') }}{% endblock %}
+              </text>
+            </svg>
           </span>
         </a>
       </div>

+ 23 - 5
resource/styles/scss/_layout.scss

@@ -16,11 +16,29 @@
     }
 
     // logo
-    .logo svg {
-      padding: 12px;
-      width: 60px;
-      height: 60px;
-      fill: gray;
+    .top-left-part {
+      line-height: 0%;
+      a {
+        text-transform: none;
+      }
+    }
+    .logo {
+      svg.dark-logo, svg.dark-logo-text {
+        fill: white;
+      }
+      svg.light-logo, svg.light-logo-text {
+        fill: #4F5467;
+      }
+      svg.dark-logo, svg.light-logo {
+        padding: 12px;
+        width: 60px;
+        height: 60px;
+      }
+      svg.dark-logo-text, svg.light-logo-text {
+        padding-top: 9px;
+        width: 156px;
+        height: 60px;
+      }
     }
 
     .crowi-header { // {{{