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

WIP: apply bootstrap theme

* layout, tabs
Yuki Takei 8 лет назад
Родитель
Сommit
2396f6e4cf

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

@@ -235,7 +235,7 @@ gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js
       </div>
       </div>
       <!-- /.row -->
       <!-- /.row -->
 
 
-      <div class="row">
+      <div class="row m-t-15">
         {% block layout_main %}
         {% block layout_main %}
         {% endblock %} {# layout_main #}
         {% endblock %} {# layout_main #}
       </div>
       </div>

+ 1 - 1
lib/views/not_found.html

@@ -53,7 +53,7 @@
     {% endif %}
     {% endif %}
   </ul>
   </ul>
 
 
-  <div class="tab-content wiki-content">
+  <div class="tab-content">
     {% if req.query.renamed %}
     {% if req.query.renamed %}
     <div class="alert alert-info alert-moved">
     <div class="alert alert-info alert-moved">
       <span>
       <span>

+ 3 - 3
lib/views/page.html

@@ -90,7 +90,7 @@
   {% endif %}
   {% endif %}
 
 
   {% if not page.isDeleted() %}
   {% if not page.isDeleted() %}
-  <ul class="nav nav-tabs customtab hidden-print">
+  <ul class="nav nav-tabs hidden-print">
     <li class=" {% if not req.body.pageForm %}active{% endif %}" data-toggle="tooltip" {# data-title="あなたの 確認待ち です" title="" data-placement="bottom" data-trigger="manual" data-tooltip-stay #}>
     <li class=" {% if not req.body.pageForm %}active{% endif %}" data-toggle="tooltip" {# data-title="あなたの 確認待ち です" title="" data-placement="bottom" data-trigger="manual" data-tooltip-stay #}>
       <a href="#revision-body" data-toggle="tab">
       <a href="#revision-body" data-toggle="tab">
       <i class="ti-control-play"></i> View
       <i class="ti-control-play"></i> View
@@ -128,7 +128,7 @@
   </ul>
   </ul>
   {% endif %}
   {% endif %}
 
 
-  <div class="tab-content wiki-content">
+  <div class="tab-content">
   {% if req.query.renamed and not page.isDeleted() %}
   {% if req.query.renamed and not page.isDeleted() %}
   <div class="alert alert-info alert-moved">
   <div class="alert alert-info alert-moved">
     <span>
     <span>
@@ -185,7 +185,7 @@
         <a data-toggle="collapse" data-parent="#revision-toc" href="#revision-toc-content" class="revision-toc-head">{{ t('Table of Contents') }}</a>
         <a data-toggle="collapse" data-parent="#revision-toc" href="#revision-toc-content" class="revision-toc-head">{{ t('Table of Contents') }}</a>
         <div id="revision-toc-content" class="revision-toc-content collapse in"></div>
         <div id="revision-toc-content" class="revision-toc-content collapse in"></div>
       </div>
       </div>
-      <div id="page"></div>
+      <div id="page" class="m-t-5 m-l-5"></div>
     </div>
     </div>
 
 
     {# edit form #}
     {# edit form #}

+ 4 - 2
resource/styles/agile-admin/inverse/eliteadmin.scss

@@ -723,11 +723,13 @@ label{
 
 
 
 
 .container-fluid{
 .container-fluid{
+  /* reset to bootstrap default
   padding-left:25px;
   padding-left:25px;
   padding-right:25px;
   padding-right:25px;
+  */
   padding-bottom:15px;
   padding-bottom:15px;
 }
 }
-
+/* reset to bootstrap default
 .col-lg-1, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-md-1, .col-md-10, .col-md-11, .col-md-12, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-sm-1, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-xs-1, .col-xs-10, .col-xs-11, .col-xs-12, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9 {
 .col-lg-1, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-md-1, .col-md-10, .col-md-11, .col-md-12, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-sm-1, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-xs-1, .col-xs-10, .col-xs-11, .col-xs-12, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9 {
   padding-left:7.5px;
   padding-left:7.5px;
   padding-right:7.5px;
   padding-right:7.5px;
@@ -736,6 +738,7 @@ label{
     margin-right: -7.5px;
     margin-right: -7.5px;
     margin-left: -7.5px;
     margin-left: -7.5px;
 }
 }
+*/
 .btn-group-vertical>.btn:first-child:not(:last-child), .btn-group-vertical>.btn:last-child:not(:first-child){
 .btn-group-vertical>.btn:first-child:not(:last-child), .btn-group-vertical>.btn:last-child:not(:first-child){
   border-radius:$radius;
   border-radius:$radius;
 }
 }
@@ -850,7 +853,6 @@ label{
   background: #fafafa;
   background: #fafafa;
   overflow:hidden;
   overflow:hidden;
   padding: 4px 8px 4px;
   padding: 4px 8px 4px;
-  margin-bottom:10px;
   margin-left:-25.5px;
   margin-left:-25.5px;
   margin-right:-25.5px;
   margin-right:-25.5px;
 
 

+ 10 - 0
resource/styles/scss/_override-agileadmin.scss

@@ -99,3 +99,13 @@
     padding: 10px 15px;
     padding: 10px 15px;
   }
   }
 }
 }
+
+
+/*
+ * Tab
+ */
+.nav-tabs {
+  > li > a {
+    border-radius: 0;
+  }
+}