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

ajust revision-toc class position and remove unnecessary files

mayu morita 7 лет назад
Родитель
Сommit
44862cc8db

+ 0 - 1
config/webpack.common.js

@@ -39,7 +39,6 @@ module.exports = (options) => {
       'styles/theme-mono-blue':      './resource/styles/scss/theme/mono-blue.scss',
       'styles/theme-future':         './resource/styles/scss/theme/future.scss',
       'styles/theme-blue-night':     './resource/styles/scss/theme/blue-night.scss',
-      'styles/theme-kibela':         './resource/styles/scss/theme/kibela.scss',
       // styles for external services
       'styles/style-hackmd':         './resource/styles/hackmd/style.scss',
     }, options.entry || {}),  // Merge with env dependent settings

+ 1 - 2
lib/views/admin/customize.html

@@ -69,8 +69,7 @@
               {% include 'widget/theme-colorbox.html' with { name: 'default',  bg: '#ffffff', topbar: '#334455', theme: '#112744' } %}
               {% include 'widget/theme-colorbox.html' with { name: 'nature',   bg: '#f9fff3', topbar: '#118050', theme: '#460039' } %}
               {% include 'widget/theme-colorbox.html' with { name: 'mono-blue',   bg: '#F7FBFD', topbar: '#00587A', theme: '#00587A' } %}
-              {% include 'widget/theme-colorbox.html' with { name: 'kibela',   bg: '#F7FBFD', topbar: '#00587A', theme: '#00587A' } %}
-            </div>
+             </div>
             {# Dark Themes #}
             <div class="d-flex">
               {% include 'widget/theme-colorbox.html' with { name: 'default-dark', bg: '#212731', topbar: '#151515', theme: '#f75b36' } %}

+ 2 - 2
lib/views/layout-kibela/base/layout.html

@@ -3,12 +3,12 @@
 
 
 
-  <div class="row">
+  <div class="row body m-0 p-0">
 
     <div id="main" class="main m-t-15 col-md-7 kibela-block {% if page %}{{ css.grant(page) }}{% endif %} {% block main_css_class %}{% endblock %}">
 
       <div class="row bg-title kibela-title m-10">
-        <div class="col-xs-12 bg-white">
+        <div class="col-xs-12">
           {% block content_header %} {% endblock %}
         </div>
       </div>

+ 1 - 2
lib/views/layout-kibela/page.html

@@ -12,8 +12,7 @@
 
 {% block content_main %}
   <div class="row">
-
-    <div class="col-lg-10 col-md-9">
+    <div class="col-lg-12 bg-white">
 
       {% include '../widget/page_content.html' %}
 

+ 3 - 3
lib/views/layout-kibela/page_list.html

@@ -1,13 +1,13 @@
 {% extends 'base/layout.html' %} {% block content_header %} {% include 'widget/header.html' %} {% endblock %} {% block content_main_before
 %} {% endblock %} {% block content_main %}
-<div class="row p-10">
-  <div class="bg-white p-10">
+<div class="row page-content">
+  <div class="m-t-30">
 
     {% include '../widget/page_content.html' %}
 
   </div>
 
-    <div class="row page-list bg-white p-10 pt-20 {% if isPortal %}m-t-30{% endif %}">
+    <div class="row page-list bg-white {% if isPortal %}m-t-30{% endif %}">
       <div class="col-md-10">
         {% include '../widget/page_list_and_timeline.html' %}
       </div>

+ 0 - 49
resource/styles/agile-admin/inverse/colors/kibela.scss

@@ -1,49 +0,0 @@
-@import '../variables';
-
-$basecolor:#061f2f;
-$themecolor:#0090c8;
-
-$linkcolor: #97d1f0;
-
-$topbar:white;
-$sidebar:#061f2f;
-$bodycolor:#E6E6E6;
-$headingtext: #101313;
-$bodytext: #101313;
-$linktext: $linkcolor;
-$linktext-hover: rgba($linktext, 0.8);
-$sidebar-text:#d3d4d4;
-$dark-themecolor:#4f5467;
-
-$primary: $themecolor;
-
-$logo-mark-fill: lighten(desaturate($topbar, 10%), 15%);
-$wikilinktext: $linkcolor;
-$wikilinktext-hover: rgba($linktext, 0.8);
-
-$dark: darken($bodytext, 5%);
-$border: #fff;
-$navbar-border: lighten($basecolor, 25%);
-$active-navbar-border: darken($navbar-border, 3%);
-$btn-default-bgcolor: darken($basecolor, 10%);
-$inline-code-color: #c1f1f0;
-$inline-code-bg: #0a121b;
-
-@import 'apply-colors';
-@import 'apply-colors-dark';
-
-.wiki {
-  .highlighted {
-   background-color: lighten($themecolor, 20%);
-  }
-}
-
-.panel {
-  &, &.panel-white, &.panel-default {
-    border-color: $bodytext;
-    .panel-heading {
-      color: $basecolor;
-      background-color: 1px solid $bodytext;
-    }
-  }
-}

+ 18 - 2
resource/styles/scss/_layout_kibela.scss

@@ -1,4 +1,10 @@
+
+html, #page-wrapper {
+  background-color: #F4F5F6 !important;
+}
+
 .kibela-block {
+  background-color: white;
   position: absolute;
   top: 0px;
   right: 0px;
@@ -10,6 +16,9 @@
   margin: none !important;
   padding: none !important;
 }
+.kibela-page-content {
+ padding: 15px;
+}
 
 .growi.main-container {
   .content-main {
@@ -18,15 +27,22 @@
 
   .revision-toc {
     &.affix {
-      right: 5rem;
-      margin-top: 10px;
+      right: 8rem;
+      margin-top: 30px;
       top: calc(46px + 5px);
       min-width: calc(#{100/12*2%} - #{$grid-gutter-width});  // width of 2column - padding
+
     }
 
     .revision-toc-content {
       padding: 0;
     }
+    @media screen and (max-width: 1300px) {
+      &.affix {
+      right: 0rem !important;
+      transition: 0.5s ;
+      }
+    }
   }
 }
 

+ 0 - 8
resource/styles/scss/theme/kibela.scss

@@ -1,8 +0,0 @@
-// import colors
-@import '../../agile-admin/inverse/colors/kibela';
-
-// apply agile-admin theme
-@import '../../agile-admin/inverse/style';
-
-// override
-@import 'override-agileadmin';