Yuki Takei 8 лет назад
Родитель
Сommit
bc403c6160
3 измененных файлов с 25 добавлено и 8 удалено
  1. 4 5
      lib/views/not_found.html
  2. 8 3
      resource/css/_page.scss
  3. 13 0
      resource/css/_page_crowi-plus.scss

+ 4 - 5
lib/views/not_found.html

@@ -27,6 +27,10 @@
 {% block content_main %}
 {% block content_main %}
 
 
 {% block content_main_before %}
 {% block content_main_before %}
+  <h2 class="message-not-found text-muted">
+    <i class="fa fa-info-circle" aria-hidden="true"></i>
+    Page is not found
+  </h2>
 {% endblock %}
 {% endblock %}
 
 
 <div id="content-main" class="content-main content-main-not-found page-list"
 <div id="content-main" class="content-main content-main-not-found page-list"
@@ -42,11 +46,6 @@
   data-csrftoken="{{ csrf() }}"
   data-csrftoken="{{ csrf() }}"
   >
   >
 
 
-  <h2 class="message-not-found text-muted">
-    <i class="fa fa-info-circle" aria-hidden="true"></i>
-    Page is not found
-  </h2>
-
   <ul class="nav nav-tabs hidden-print">
   <ul class="nav nav-tabs hidden-print">
     <li class="active"><a href="#revision-body" data-toggle="tab">{{ t('List View') }}</a></li>
     <li class="active"><a href="#revision-body" data-toggle="tab">{{ t('List View') }}</a></li>
 
 

+ 8 - 3
resource/css/_page.scss

@@ -373,11 +373,16 @@
 
 
 } // }}}
 } // }}}
 
 
-.crowi.main-container .content-main.content-main-not-found {
+// for not_found.html
+.crowi.main-container {
   .message-not-found {
   .message-not-found {
     margin-top: 10px;
     margin-top: 10px;
+    margin-left: 16px;
   }
   }
-  .nav {
-    margin-top: 30px;
+
+  .content-main.content-main-not-found {
+    .nav {
+      margin-top: 16px;
+    }
   }
   }
 }
 }

+ 13 - 0
resource/css/_page_crowi-plus.scss

@@ -36,6 +36,19 @@
   }
   }
 }
 }
 
 
+// for not_found.html
+.crowi-plus.main-container {
+  .message-not-found {
+    margin-left: 0;
+  }
+
+  .content-main.content-main-not-found {
+    .nav {
+      margin-top: 32px;
+    }
+  }
+}
+
 .crowi-plus .crowi-plus-widget.page-list-container {
 .crowi-plus .crowi-plus-widget.page-list-container {
   margin-top: 30px;
   margin-top: 30px;