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

WIP: reconstruct layouts

* system-version
Yuki Takei 8 лет назад
Родитель
Сommit
b45ad4ea47

+ 1 - 8
lib/views/layout-crowi/base/layout.html

@@ -18,14 +18,7 @@
     {% block side_footer %}
     {% block side_footer %}
     {% endblock %}
     {% endblock %}
 
 
-    <div id="footer-container" class="footer">
-      <footer class="">
-        <p>
-          <a href="https://github.com/weseek/crowi-plus">crowi-plus</a> {{ crowiVersion() }}
-          <a href="" class="pull-right" data-target="#shortcuts-modal" data-toggle="modal"><i class="fa fa-keyboard-o"></i>&nbsp;<span class="cmd-key"></span>-/</a>
-        </p>
-      </footer>
-    </div>
+    {% include '../../widget/system-version.html' %}
   </aside>
   </aside>
 
 
   <div class="row bg-title">
   <div class="row bg-title">

+ 1 - 1
lib/views/layout-growi/base/layout.html

@@ -41,6 +41,6 @@
 </div><!-- /.container-fluid -->
 </div><!-- /.container-fluid -->
 
 
 <footer class="footer">
 <footer class="footer">
-  {% include '../widget/system-version.html' %}
+  {% include '../../widget/system-version.html' %}
 </footer>
 </footer>
 {% endblock %} {# layout_main #}
 {% endblock %} {# layout_main #}

+ 0 - 0
lib/views/layout-growi/widget/system-version.html → lib/views/widget/system-version.html


+ 4 - 5
resource/styles/scss/_layout_crowi-plus.scss

@@ -14,11 +14,6 @@
     }
     }
   }
   }
 
 
-  @media (max-width: $screen-sm-max) {
-    .system-version {
-      display: none;
-    }
-  }
 }
 }
 
 
 .system-version {
 .system-version {
@@ -30,4 +25,8 @@
   > span {
   > span {
     margin-left: .5em;
     margin-left: .5em;
   }
   }
+
+  @media (max-width: $screen-xs-max) {
+    display: none;
+  }
 }
 }

+ 15 - 0
resource/styles/scss/_layout_crowi.scss

@@ -40,5 +40,20 @@
     .portal-form-button {
     .portal-form-button {
       text-align: center;
       text-align: center;
     }
     }
+
+    .system-version {
+      position: absolute;
+      left: 0.5em;
+      right: 1em;
+      bottom: 0.5em;
+
+      display: flex;
+      justify-content: space-between;
+
+      @media (max-width: $screen-sm-max) {
+        display: none;
+      }
+    }
   }
   }
+
 }
 }