Explorar el Código

WIP: WIP: apply bootstrap theme

Yuki Takei hace 8 años
padre
commit
25dbcdeb92
Se han modificado 2 ficheros con 11 adiciones y 27 borrados
  1. 11 19
      lib/views/layout/layout.html
  2. 0 8
      resource/styles/scss/_layout.scss

+ 11 - 19
lib/views/layout/layout.html

@@ -187,11 +187,11 @@ gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js
             <img src="{{ user|picture }}" class="img-circle" width="25" /> {{ user.name }}
           </a>
           <ul class="dropdown-menu">
-            <li><a href="/me"><i class="ti-home"></i>{{ t('Home') }}</a></li>
+            <li><a href="/me"><i class="fa-fw ti-home"></i>{{ t('Home') }}</a></li>
             <li role="separator" class="divider"></li>
-            <li><a href="/trash"><i class="ti-trash"></i>{{ t('Deleted Pages') }}</a></li>
+            <li><a href="/trash"><i class="fa-fw ti-trash"></i>{{ t('Deleted Pages') }}</a></li>
             <li role="separator" class="divider"></li>
-            <li><a href="/logout"><i class="ti-power-off"></i>{{ t('Sign out') }}</a></li>
+            <li><a href="/logout"><i class="fa-fw ti-power-off"></i>{{ t('Sign out') }}</a></li>
           </ul>
           <!-- /.dropdown-messages -->
         </li>
@@ -244,6 +244,14 @@ gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js
       <!-- /.row -->
 
       <div class="row">
+        {% block layout_sidebar %}
+        {% endblock %} {# layout_sidebar #}
+
+        {% block layout_main %}
+        {% endblock %} {# layout_main #}
+
+        {% block footer %}
+        {% endblock %}
       </div>
 
 
@@ -254,22 +262,6 @@ gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js
 
 </div><!-- /#wrapper -->
 
-
-<div class="container-fluid">
-  <div class="row">
-
-  {% block layout_sidebar %}
-  {% endblock %} {# layout_sidebar #}
-
-  {% block layout_main %}
-  {% endblock %} {# layout_main #}
-
-{% block footer %}
-{% endblock %}
-
-  </div> {# /.row #}
-</div> {# /.container-fluid #}
-
 {% block body_end %}
 {% endblock %}
 

+ 0 - 8
resource/styles/scss/_layout.scss

@@ -44,16 +44,11 @@
       padding: 5px 8px;
       border: solid 1px #ccc;
       border-right: none;
-      // background: $crowiAsideBackground;
       border-radius: 5px 0 0 5px;
       z-index: 1039;
       font-size: .8em;
 
-      // color: darken($link-color, 15%);
-
       &:hover {
-        // color: darken($link-color, 25%);
-        // background: darken($crowiAsideBackground, 10%);
         text-decoration: none;
         cursor: pointer;
       }
@@ -67,9 +62,6 @@
 } // }}}
 
 .crowi.single.nologin { // {{{
-  //background: lighten($crowiHeaderBackground, 15%);
-  // background: $crowiHeaderBackground;
-
   .installer-header {
     margin-top: 100px;
     text-align: center;