Przeglądaj źródła

apply default theme

Yuki Takei 6 lat temu
rodzic
commit
1574f123ed

+ 1 - 1
src/client/styles/scss/_layout_crowi.scss

@@ -21,7 +21,7 @@
       margin-bottom: 5px;
       margin-left: 5px;
       font-weight: bold;
-      background: $gray-lighter;
+      background: $gray-200;
       border-bottom: solid 1px #aaa;
       border-left: solid 1px #aaa;
       border-radius: 0 5px;

+ 4 - 4
src/client/styles/scss/_login.scss

@@ -1,5 +1,5 @@
 .nologin {
-  $gray-dark-for-login: darken(white, 30%);
+  $gray-800-for-login: darken(white, 30%);
 
   // background color
   background: linear-gradient(45deg, darken($inverse, 30%) 0%, hsla(340, 100%, 55%, 0) 70%),
@@ -74,7 +74,7 @@
     margin-bottom: 10px;
 
     .input-group-addon {
-      color: $gray-dark-for-login;
+      color: $gray-800-for-login;
       text-align: center;
       background-color: rgba(black, 0.4);
       border: none;
@@ -84,7 +84,7 @@
       color: white;
       background-color: rgba(lighten(black, 10%), 0.4);
       &::placeholder {
-        color: $gray-dark-for-login;
+        color: $gray-800-for-login;
       }
     }
   }
@@ -227,7 +227,7 @@
     }
   }
   .link-switch {
-    color: $gray-lighter;
+    color: $gray-200;
     &:hover {
       color: white;
     }

+ 1 - 1
src/client/styles/scss/_on-edit.scss

@@ -259,7 +259,7 @@ body.on-edit {
 
     .hackmd-error {
       top: 0;
-      background-color: rgba($gray-dark, 0.8);
+      background-color: rgba($gray-800, 0.8);
     }
 
     .hackmd-status-label {

+ 1 - 10
src/client/styles/scss/_override-bootstrap-variables.scss

@@ -4,16 +4,7 @@
 
 //== Colors
 //
-//## Gray and brand colors for use across Bootstrap.
-$gray-base:              #000 !default;
-$gray-darker:            lighten($gray-base, 13.5%); // #222
-$gray-dark:              lighten($gray-base, 20%);   // #333
-$gray:                   lighten($gray-base, 33.5%); // #555
-$gray-light:             lighten($gray-base, 46.7%); // #777
-$gray-lighter:           lighten($gray-base, 93.5%); // #eee
-$gray-extralight:        #fafafa; // Growi original
-
-//** override bootstrap theme colors
+
 $theme-colors: (
   'primary': #337ab7,
   'success': #00bb83,

+ 1 - 1
src/client/styles/scss/_wiki.scss

@@ -62,7 +62,7 @@ div.body {
     padding: 0 20px;
     margin: 0 0 30px 0;
     font-size: 0.9em;
-    color: lighten($gray-dark, 35%);
+    color: lighten($gray-800, 35%);
   }
 
   img {

+ 0 - 0
src/client/styles/agile-admin/inverse/colors/_apply-colors-dark.scss → src/client/styles/scss/theme/_apply-colors-dark.scss


+ 0 - 0
src/client/styles/agile-admin/inverse/colors/_apply-colors-light.scss → src/client/styles/scss/theme/_apply-colors-light.scss


+ 4 - 108
src/client/styles/agile-admin/inverse/colors/_apply-colors.scss → src/client/styles/scss/theme/_apply-colors.scss

@@ -5,7 +5,7 @@ body {
 /*Top Header Part*/
 
 .logo i {
-  color: $white;
+  color: white;
 }
 
 .logo {
@@ -45,19 +45,12 @@ body {
 }
 
 .navbar-top-links > li > a {
-  color: $white;
+  color: white;
 }
 
 .navbar-top-links .confidential {
   background-color: darken($topbar, 10%);
 }
-/*
-.notify .heartbit{
-    border-color:$white;
-}
-.notify .point{
-  background-color:$danger;
-}*/
 
 /*Right panel*/
 .right-sidebar .rpanel-title {
@@ -73,105 +66,6 @@ body {
   background: darken($bodycolor, 2%);
 }
 
-/*Sidebar*/
-
-.sidebar {
-  background: $sidebar;
-  box-shadow: 1px 0px 20px rgba(0, 0, 0, 0.08);
-  .label-custom {
-    background: $megna;
-  }
-}
-
-#side-menu li a {
-  color: $sidebar-text;
-}
-
-#side-menu li a {
-  color: $sidebar-text;
-  border-left: 0px solid $sidebar;
-}
-
-#side-menu > li > a {
-  &:hover,
-  &:focus {
-    background: rgba(0, 0, 0, 0.03);
-  }
-  &.active {
-
-    font-weight: 500;
-    color: $dark;
-    border-left: 3px solid $themecolor;
-    i {
-      color: $themecolor;
-    }
-  }
-}
-
-#side-menu ul > li > a {
-  &:hover {
-    color: $themecolor;
-  }
-  &.active {
-    font-weight: 500;
-    color: $dark;
-  }
-}
-
-.sidebar #side-menu .user-pro {
-  .nav-second-level a:hover {
-    color: $themecolor;
-  }
-}
-
-/*themecolor*/
-
-.bg-theme {
-  background-color: $danger !important;
-}
-
-.bg-theme-dark {
-  background-color: $megna !important;
-}
-
-/*Chat widget*/
-.chat-list .odd .chat-text {
-  background: $themecolor;
-}
-/*Button*/
-.btn-custom {
-  color: $white;
-  background: $themecolor;
-  border: 1px solid $themecolor;
-  &:hover {
-    color: $white;
-    background: $themecolor;
-    border: 1px solid $themecolor;
-    opacity: 0.8;
-  }
-}
-/*Custom tab*/
-.customtab li.active a,
-.customtab li.active a:hover,
-.customtab li.active a:focus {
-  color: $themecolor;
-  border-bottom: 2px solid $themecolor;
-}
-
-.tabs-vertical li.active a,
-.tabs-vertical li.active a:hover,
-.tabs-vertical li.active a:focus {
-  background: $themecolor;
-  border-right: 2px solid $themecolor;
-}
-/*Nav-pills*/
-.nav-pills > li.active > a,
-.nav-pills > li.active > a:focus,
-.nav-pills > li.active > a:hover {
-  color: $white;
-  background: $themecolor;
-}
-
 /*
  * code color of inline-code
  */
@@ -240,6 +134,7 @@ legend {
  */
 $active-nav-tabs-bgcolor: $bodycolor !default;
 
+/*
 .nav.nav-tabs {
   border-bottom-color: $navbar-border;
 
@@ -267,6 +162,7 @@ $active-nav-tabs-bgcolor: $bodycolor !default;
     }
   }
 }
+*/
 
 /*
  * Form Slider

+ 10 - 0
src/client/styles/scss/theme/_variables.scss

@@ -0,0 +1,10 @@
+// GROWI Official Color
+$growi-green: #74bc46;
+$growi-blue: #175fa5;
+
+// default colors
+$border: #f0f0f0 !default;
+$navbar-border: #ccc !default;
+$active-navbar-border: lighten($navbar-border, 10%) !default;
+$inline-code-color: #c7254e !default;
+$inline-code-bg: #f9f2f4 !default;

+ 20 - 6
src/client/styles/scss/theme/default.scss

@@ -1,8 +1,22 @@
-// import colors
-// @import '../../agile-admin/inverse/colors/default';
+@import '../override-bootstrap';
 
-// apply agile-admin theme
-// @import '../../agile-admin/inverse/style';
+$themecolor: #112744;
 
-// override
-// @import 'override-agileadmin';
+$topbar: #334455;
+$sidebar: #fff;
+$bodycolor: #fff;
+$headingtext: #2b2b2b;
+$bodytext: #333333;
+$linktext: lighten($themecolor, 20%);
+$linktext-hover: lighten($linktext, 20%);
+$sidebar-text: #38495a;
+
+$primary: $themecolor;
+
+$logo-mark-fill: lighten(desaturate($topbar, 10%), 15%);
+$wikilinktext: lighten($themecolor, 20%);
+$wikilinktext-hover: lighten($wikilinktext, 20%);
+
+@import 'variables';
+@import 'apply-colors';
+@import 'apply-colors-light';

+ 1 - 1
src/server/views/widget/page_list_and_timeline_kibela.html

@@ -1,5 +1,5 @@
 <div class="page-list-container">
-  <ul class="nav nav-tabs customtab" role="tablist">
+  <ul class="nav nav-tabs" role="tablist">
       <li class="nav-item">
         <a class="nav-link active" href="#view-list" role="tab" data-toggle="tab">{{ t('List View') }}</a>
       </li>

+ 2 - 2
src/server/views/widget/page_tabs_kibela.html

@@ -1,5 +1,5 @@
 {% if page %}
-<ul class="nav nav-tabs customtab hidden-print">
+<ul class="nav nav-tabs hidden-print">
 
   {#
     Left Tabs
@@ -78,7 +78,7 @@
 
 {% else %} {# for creating portal #}
 
-<ul class="nav nav-tabs customtab nav-tabs-create-portal hidden-print">
+<ul class="nav nav-tabs nav-tabs-create-portal hidden-print">
 
   <li class="nav-item grw-nav-main-left-tab">
     <a id="portal-form-close" class="nav-link" href="#" data-toggle="tab">