فهرست منبع

add kibela theme color

mayu morita 7 سال پیش
والد
کامیت
3ba1dd5415

+ 1 - 0
config/webpack.common.js

@@ -38,6 +38,7 @@ 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 - 0
lib/views/admin/customize.html

@@ -69,6 +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>
             {# Dark Themes #}
             <div class="d-flex">

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

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

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

@@ -0,0 +1,41 @@
+@import '../variables';
+
+$themecolor: #00587A;
+$themelight: #F7FBFD;
+$subthemecolor: #186718;
+
+
+$topbar: $themecolor;
+$sidebar: $themelight;
+$bodycolor: $themelight;
+
+$headingtext: $themecolor;
+$bodytext: $themecolor;
+$linktext: lighten($themecolor,5%);
+$linktext-hover: lighten($linktext, 12%);
+$sidebar-text: $themecolor;
+
+$primary: $themecolor;
+$info: lighten($themecolor,20%);
+
+$logo-mark-fill: lighten(desaturate($topbar, 30%), 20%);
+$wikilinktext: lighten($themecolor, 20%);
+$wikilinktext-hover: lighten($wikilinktext, 20%);
+$inline-code-color: $subthemecolor;
+$inline-code-bg: lighten($subthemecolor,70%);
+
+@import 'apply-colors';
+@import 'apply-colors-light';
+
+
+// change color of highlighted header in wiki (default: orange)
+.wiki {
+  .code-line.revision-head.highlighted {
+    background-color: lighten($themecolor,20%);
+    color: $themelight;
+
+    .icon-note, .icon-link {
+      color: $themelight;
+    }
+  }
+}

+ 0 - 3
resource/styles/scss/_layout_kibela.scss

@@ -66,9 +66,6 @@
 .kibela.main-container {
   .content-main {
     padding: 0;
-    border-radius: 0.5em;
-    border-top: solid 0.2em #5584E1;
-    z-index: absolute;
   }
 
   .revision-toc {

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

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