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

WIP: apply bootstrap theme

* adjust list view
Yuki Takei 8 лет назад
Родитель
Сommit
0636fb1f36

+ 1 - 1
lib/views/crowi-plus/widget/page_list_container.html

@@ -17,7 +17,7 @@
     {% endif  %}
 
     {# list view #}
-    <div class="active tab-pane fade page-list-container in" id="view-list">
+    <div class="p-t-10 active tab-pane fade page-list-container in" id="view-list">
       {% include '../../widget/page_list.html' with { pages: pages, pager: pager, viewConfig: viewConfig } %}
     </div>
 

+ 19 - 17
lib/views/not_found.html

@@ -26,11 +26,24 @@
 
 {% block content_main_before %}
   <h2 class="message-not-found text-muted">
-    <i class="fa fa-info-circle" aria-hidden="true"></i>
+    <i class="icon-info" aria-hidden="true"></i>
     Page is not found
   </h2>
 {% endblock %}
 
+{% if req.query.renamed %}
+<div class="alert alert-info alert-moved">
+  <span>
+    <strong>{{ t('Moved') }}: </strong> {{ t('page_page.notice.moved', req.query.renamed) }}
+  </span>
+</div>
+{% endif %}
+{% if req.query.unlinked %}
+<div class="alert alert-info alert-unlinked">
+  <strong>{{ t('Unlinked') }}: </strong> {{ t('page_page.notice.unlinked') }}
+</div>
+{% endif %}
+
 <div id="content-main" class="content-main content-main-not-found page-list"
   data-path="{{ path }}"
   data-path-shortname="{{ path|path2name }}"
@@ -42,35 +55,24 @@
 
     <li>
       <a {% if user %}href="#edit-form" data-toggle="tab"{% endif %} class="edit-button {% if not user %}edit-button-disabled{% endif %}">
-        <i class="fa fa-pencil-square-o"></i> {{ t('Create') }}
+        <i class="icon-note"></i> {{ t('Create') }}
       </a>
     </li>
 
     {% if user %}
     <li class="dropdown pull-right">
-      <a href="#" onclick="history.back();"><i class="fa fa-times"></i> {{ t('Cancel') }}</a>
+      <a href="#" onclick="history.back();"><i class="icon-close"></i> {{ t('Cancel') }}</a>
     </li>
     {% endif %}
   </ul>
 
   <div class="tab-content">
-    {% if req.query.renamed %}
-    <div class="alert alert-info alert-moved">
-      <span>
-        <strong>{{ t('Moved') }}: </strong> {{ t('page_page.notice.moved', req.query.renamed) }}
-      </span>
-    </div>
-    {% endif %}
-    {% if req.query.unlinked %}
-    <div class="alert alert-info">
-      <strong>{{ t('Unlinked') }}: </strong> {{ t('page_page.notice.unlinked') }}
-    </div>
-    {% endif %}
-
     {# list view #}
     <div class="active tab-pane page-list-container" id="revision-body">
       {% if pages.length == 0 %}
-        There are no pages under <strong>{{ path }}</strong>.
+        <div class="m-t-20">
+          There are no pages under <strong>{{ path }}</strong>.
+        </div>
       {% endif  %}
 
       {% include 'widget/page_list.html' with { pages: pages, pager: pager, viewConfig: viewConfig } %}

+ 1 - 1
lib/views/page_list.html

@@ -202,7 +202,7 @@
     {% endif  %}
 
     {# list view #}
-    <div class="active tab-pane fade page-list-container in" id="view-list">
+    <div class="p-t-10 active tab-pane fade page-list-container in" id="view-list">
       {% include 'widget/page_list.html' with { pages: pages, pager: pager, viewConfig: viewConfig } %}
     </div>
 

+ 0 - 4
resource/styles/scss/_page_crowi-plus.scss

@@ -77,8 +77,4 @@
 
 .crowi-plus .crowi-plus-widget.page-list-container {
   margin-top: 30px;
-
-  .tab-content {
-    margin-top: 15px;
-  }
 }

+ 2 - 26
resource/styles/scss/_portal.scss

@@ -1,27 +1,8 @@
-.portal-header {
-}
-
-.portal-label {
-  background: #5bc0de;
-  //float: right;
-  font-weight: bold;
-  padding: 2px 4px;
-  //margin: 1em 8px 0;
-  font-size: .8em;
-  color: #fff;
-  border-radius: 4px;
-}
-
 .portal {
   .wiki {
-    margin-bottom: 16px;
-    padding-bottom: 16px;
-  }
-
-  .portal-form {
-
+    margin-bottom: 1em;
+    padding-bottom: 1em;
   }
-
 } // .portal
 
 .portal-side {
@@ -29,8 +10,3 @@
     text-align: center;
   }
 } // .portal-side
-
-
-.portal-warning-modal {
-  z-index: 1062;
-}

+ 1 - 1
resource/styles/scss/crowi.scss

@@ -24,7 +24,7 @@
 @import 'page_list';
 @import 'page';
 @import 'page_crowi-plus';
-// @import 'portal';
+@import 'portal';
 @import 'search';
 @import 'shortcuts';
 // @import 'user';