Przeglądaj źródła

WIP: apply bootstrap theme

Yuki Takei 8 lat temu
rodzic
commit
a5d948d58e

+ 97 - 0
lib/views/layout/layout.html

@@ -111,6 +111,103 @@ gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js
   data-current-username="{% if user %}{{ user.username }}{% endif %}"
  >
 
+<div id="wrapper">
+  <!-- Navigation -->
+  <nav class="navbar navbar-default navbar-static-top m-b-0">
+    <div class="navbar-header">
+      <a class="navbar-toggle hidden-sm hidden-md hidden-lg " href="javascript:void(0)" data-toggle="collapse" data-target=".navbar-collapse">
+        <i class="ti-menu"></i>
+      </a>
+      <div class="top-left-part">
+        <a class="logo" href="index.html">
+          <b>
+            <!--This is dark logo icon-->
+            <img src="../plugins/images/agileadmin-logo.png" alt="home" class="dark-logo" />
+            <!--This is light logo icon-->
+            <img src="../plugins/images/agileadmin-logo-dark.png" alt="home" class="light-logo" />
+          </b>
+          <span class="hidden-xs">
+            <!--This is dark logo text-->
+            <img src="../plugins/images/agileadmin-text.png" alt="home" class="dark-logo" />
+            <!--This is light logo text-->
+            <img src="../plugins/images/agileadmin-text-dark.png" alt="home" class="light-logo" />
+          </span>
+        </a>
+      </div>
+
+      <ul class="nav navbar-top-links navbar-left hidden-xs">
+        <li>
+          <a href="javascript:void(0)" class="open-close hidden-xs waves-effect waves-light">
+            <i class="icon-arrow-left-circle ti-menu"></i>
+          </a>
+        </li>
+        <li>
+          <form role="search" class="app-search hidden-xs">
+            <input type="text" placeholder="Search..." class="form-control">
+            <a href="">
+              <i class="fa fa-search"></i>
+            </a>
+          </form>
+        </li>
+      </ul>
+
+      <ul class="nav navbar-top-links navbar-right pull-right">
+      </ul>
+    </div><!-- /.navbar-header -->
+  </nav>
+
+  <!-- Left navbar-header -->
+  <div class="navbar-default sidebar" role="navigation">
+    <div class="sidebar-nav navbar-collapse slimscrollsidebar">
+      <ul class="nav" id="side-menu"></ul>
+    </div>
+  </div>
+  <!-- Left navbar-header end -->
+
+  <!-- Page Content -->
+  <div id="page-wrapper">
+    <div class="container-fluid">
+      <div class="row bg-title">
+        <div class="col-lg-3 col-md-4 col-sm-4 col-xs-12">
+          <h4 class="page-title">Dashboard 1</h4>
+        </div>
+        <div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
+          <a href="#" target="_blank" class="btn btn-danger pull-right m-l-20 btn-rounded btn-outline hidden-xs hidden-sm waves-effect waves-light">Buy Now</a>
+          <ol class="breadcrumb">
+            <li>
+              <a href="#">Dashboard</a>
+            </li>
+            <li class="active">Dashboard 1</li>
+          </ol>
+        </div>
+        <!-- /.col-lg-12 -->
+      </div>
+      <!-- /.row -->
+
+      <div class="row">
+      </div>
+
+
+    </div><!-- /.container-fluid -->
+
+    <footer class="footer text-center"> 2017 &copy; Agile Admin brought to you by wrappixel.com </footer>
+  </div><!-- /#page-wrapper -->
+
+</div><!-- /#wrapper -->
+<!-- Bootstrap Core JavaScript -->
+<!-- <script src="bootstrap/dist/js/bootstrap.min.js"></script> -->
+<!-- Menu Plugin JavaScript -->
+<!-- <script src="../plugins/bower_components/sidebar-nav/dist/sidebar-nav.min.js"></script> -->
+<!--slimscroll JavaScript -->
+<!-- <script src="js/jquery.slimscroll.js"></script> -->
+<!--Wave Effects -->
+<!-- <script src="js/waves.js"></script> -->
+<!-- Custom Theme JavaScript -->
+<!-- <script src="js/custom.min.js"></script> -->
+<!--Style Switcher -->
+<!-- <script src="../plugins/bower_components/styleswitcher/jQuery.style.switcher.js"></script> -->
+
+
 {% block layout_head_nav %}
 <nav class="crowi-header navbar navbar-default" role="navigation">
   <!-- Brand and toggle get grouped for better mobile display -->

+ 0 - 654
resource/css/_variables.scss

@@ -1,654 +0,0 @@
-// crowi
-$brand-primary:         #43676b;
-
-$crowiHeaderBackground: darken($brand-primary, 15%);
-$crowiHeaderHeight: 50px;
-
-// $crowiAsideBackground:   darken($crowiHeaderBackground, 5%);
-$crowiAsideBackground: #fcfcfc;
-
-$crowiFooterBackground:  $crowiHeaderBackground;
-$crowiFooterHeight: 34px;
-
-
-
-//
-// Variables
-// --------------------------------------------------
-
-
-// Global values
-// --------------------------------------------------
-
-// Grays
-// -------------------------
-
-$gray-darker:            lighten(#000, 13.5%); // #222
-$gray-dark:              lighten(#000, 20%);   // #333
-// $gray:                   lighten(#000, 33.5%); // #555
-// $gray-light:             lighten(#000, 60%);   // #999
-// $gray-lighter:           lighten(#000, 93.5%); // #eee
-//
-// // Brand colors
-// // -------------------------
-//
-//$brand-primary: #4d4398;
-//$brand-primary: #622d18;
-//$brand-primary: #e5a323;
-// $brand-success:         #5cb85c;
-// $brand-warning:         #f0ad4e;
-// $brand-danger:          #d9534f;
-// $brand-info:            #5bc0de;
-
-//
-// // Scaffolding
-// // -------------------------
-//
-//$body-bg:              $crowiHeaderBackground;
-// $text-color:            $gray-dark;
-//
-// // Links
-// // -------------------------
-//
-$link-color:            $brand-primary;
-$link-hover-color:      darken($link-color, 15%);
-//
-// // Typography
-// // -------------------------
-//
-// $font-family-sans-serif:  "Helvetica Neue", Helvetica, Arial, sans-serif;
-// $font-family-serif:       Georgia, "Times New Roman", Times, serif;
-// $font-family-monospace:   Monaco, Menlo, Consolas, "Courier New", monospace;
-// $font-family-base:        $font-family-sans-serif;
-//
-// $font-size-base:          14px;
-// $font-size-large:         ceil($font-size-base * 1.25); // ~18px
-// $font-size-small:         ceil($font-size-base * 0.85); // ~12px
-//
-// $font-size-h1:            floor($font-size-base * 2.6); // ~36px
-// $font-size-h2:            floor($font-size-base * 2.15); // ~30px
-// $font-size-h3:            ceil($font-size-base * 1.7); // ~24px
-// $font-size-h4:            ceil($font-size-base * 1.25); // ~18px
-// $font-size-h5:            $font-size-base;
-// $font-size-h6:            ceil($font-size-base * 0.85); // ~12px
-//
-// $line-height-base:        1.428571429; // 20/14
-// $line-height-computed:    floor($font-size-base * $line-height-base); // ~20px
-//
-// $headings-font-family:    $font-family-base;
-// $headings-font-weight:    500;
-// $headings-line-height:    1.1;
-// $headings-color:          inherit;
-//
-//
-// // Iconography
-// // -------------------------
-//
-// $icon-font-path:          "../fonts/";
-// $icon-font-name:          "glyphicons-halflings-regular";
-//
-//
-// // Components
-// // -------------------------
-// // Based on 14px font-size and 1.428 line-height (~20px to start)
-//
-// $padding-base-vertical:          6px;
-// $padding-base-horizontal:        12px;
-//
-// $padding-large-vertical:         10px;
-// $padding-large-horizontal:       16px;
-//
-// $padding-small-vertical:         5px;
-// $padding-small-horizontal:       10px;
-//
-// $line-height-large:              1.33;
-// $line-height-small:              1.5;
-//
-// $border-radius-base:             4px;
-// $border-radius-large:            6px;
-// $border-radius-small:            3px;
-//
-// $component-active-color:         #fff;
-// $component-active-bg:            $brand-primary;
-//
-// $caret-width-base:               4px;
-// $caret-width-large:              5px;
-//
-// // Tables
-// // -------------------------
-//
-// $table-cell-padding:                 8px;
-// $table-condensed-cell-padding:       5px;
-//
-// $table-bg:                           transparent; // overall background-color
-// $table-bg-accent:                    #f9f9f9; // for striping
-// $table-bg-hover:                     #f5f5f5;
-// $table-bg-active:                    $table-bg-hover;
-//
-// $table-border-color:                 #ddd; // table and cell border
-//
-//
-// // Buttons
-// // -------------------------
-//
-// $btn-font-weight:                normal;
-//
-// $btn-default-color:              #333;
-// $btn-default-bg:                 #fff;
-// $btn-default-border:             #ccc;
-//
-// $btn-primary-color:              #fff;
-// $btn-primary-bg:                 $brand-primary;
-// $btn-primary-border:             darken($btn-primary-bg, 5%);
-//
-// $btn-success-color:              #fff;
-// $btn-success-bg:                 $brand-success;
-// $btn-success-border:             darken($btn-success-bg, 5%);
-//
-// $btn-warning-color:              #fff;
-// $btn-warning-bg:                 $brand-warning;
-// $btn-warning-border:             darken($btn-warning-bg, 5%);
-//
-// $btn-danger-color:               #fff;
-// $btn-danger-bg:                  $brand-danger;
-// $btn-danger-border:              darken($btn-danger-bg, 5%);
-//
-// $btn-info-color:                 #fff;
-// $btn-info-bg:                    $brand-info;
-// $btn-info-border:                darken($btn-info-bg, 5%);
-//
-// $btn-link-disabled-color:        $gray-light;
-//
-//
-// // Forms
-// // -------------------------
-//
-// $input-bg:                       #fff;
-// $input-bg-disabled:              $gray-lighter;
-//
-// $input-color:                    $gray;
-// $input-border:                   #ccc;
-// $input-border-radius:            $border-radius-base;
-// $input-border-focus:             #66afe9;
-//
-// $input-color-placeholder:        $gray-light;
-//
-// $input-height-base:              ($line-height-computed + ($padding-base-vertical * 2) + 2);
-// $input-height-large:             (floor($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2);
-// $input-height-small:             (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2);
-//
-// $legend-color:                   $gray-dark;
-// $legend-border-color:            #e5e5e5;
-//
-// $input-group-addon-bg:           $gray-lighter;
-// $input-group-addon-border-color: $input-border;
-//
-//
-// // Dropdowns
-// // -------------------------
-//
-// $dropdown-bg:                    #fff;
-// $dropdown-border:                rgba(0,0,0,.15);
-// $dropdown-fallback-border:       #ccc;
-// $dropdown-divider-bg:            #e5e5e5;
-//
-$dropdown-link-color:            $gray-dark;
-$dropdown-link-hover-color:      darken($gray-dark, 5%);
-$dropdown-link-hover-bg:         #f5f5f5;
-//
-// $dropdown-link-active-color:     $component-active-color;
-// $dropdown-link-active-bg:        $component-active-bg;
-//
-// $dropdown-link-disabled-color:   $gray-light;
-//
-// $dropdown-header-color:          $gray-light;
-//
-// $dropdown-caret-color:           #000;
-//
-//
-// // COMPONENT VARIABLES
-// // --------------------------------------------------
-//
-//
-// // Z-index master list
-// // -------------------------
-// // Used for a bird's eye view of components dependent on the z-axis
-// // Try to avoid customizing these :)
-//
-// $zindex-navbar:            1000;
-// $zindex-dropdown:          1000;
-// $zindex-popover:           1010;
-// $zindex-tooltip:           1030;
-// $zindex-navbar-fixed:      1030;
-// $zindex-modal-background:  1040;
-// $zindex-modal:             1050;
-//
-// // Media queries breakpoints
-// // --------------------------------------------------
-//
-// // Extra small screen / phone
-// // Note: Deprecated $screen-xs and $screen-phone as of v3.0.1
-// $screen-xs:                  480px;
-// $screen-xs-min:              $screen-xs;
-// $screen-phone:               $screen-xs-min;
-//
-// // Small screen / tablet
-// // Note: Deprecated $screen-sm and $screen-tablet as of v3.0.1
-// $screen-sm:                  768px;
-// $screen-sm-min:              $screen-sm;
-// $screen-tablet:              $screen-sm-min;
-//
-// // Medium screen / desktop
-// // Note: Deprecated $screen-md and $screen-desktop as of v3.0.1
-// $screen-md:                  992px;
-// $screen-md-min:              $screen-md;
-// $screen-desktop:             $screen-md-min;
-//
-// // Large screen / wide desktop
-// // Note: Deprecated $screen-lg and $screen-lg-desktop as of v3.0.1
-// $screen-lg:                  1200px;
-// $screen-lg-min:              $screen-lg;
-// $screen-lg-desktop:          $screen-lg-min;
-//
-// // So media queries don't overlap when required, provide a maximum
-// $screen-xs-max:              ($screen-sm-min - 1);
-// $screen-sm-max:              ($screen-md-min - 1);
-// $screen-md-max:              ($screen-lg-min - 1);
-//
-//
-// // Grid system
-// // --------------------------------------------------
-//
-// // Number of columns in the grid system
-// $grid-columns:              12;
-// // Padding, to be divided by two and applied to the left and right of all columns
-// $grid-gutter-width:         30px;
-// // Point at which the navbar stops collapsing
-// $grid-float-breakpoint:     $screen-sm-min;
-//
-//
-// // Navbar
-// // -------------------------
-//
-// // Basics of a navbar
-// $navbar-height:                    50px;
-// $navbar-margin-bottom:             $line-height-computed;
-// $navbar-border-radius:             $border-radius-base;
-// $navbar-padding-horizontal:        floor($grid-gutter-width / 2);
-// $navbar-padding-vertical:          (($navbar-height - $line-height-computed) / 2);
-//
-// $navbar-default-color:             #777;
-// $navbar-default-bg:                #f8f8f8;
-// $navbar-default-border:            darken($navbar-default-bg, 6.5%);
-//
-// // Navbar links
-// $navbar-default-link-color:                #777;
-// $navbar-default-link-hover-color:          #333;
-// $navbar-default-link-hover-bg:             transparent;
-// $navbar-default-link-active-color:         #555;
-// $navbar-default-link-active-bg:            darken($navbar-default-bg, 6.5%);
-// $navbar-default-link-disabled-color:       #ccc;
-// $navbar-default-link-disabled-bg:          transparent;
-//
-// // Navbar brand label
-// $navbar-default-brand-color:               $navbar-default-link-color;
-// $navbar-default-brand-hover-color:         darken($navbar-default-brand-color, 10%);
-// $navbar-default-brand-hover-bg:            transparent;
-//
-// // Navbar toggle
-// $navbar-default-toggle-hover-bg:           #ddd;
-// $navbar-default-toggle-icon-bar-bg:        #ccc;
-// $navbar-default-toggle-border-color:       #ddd;
-//
-//
-// // Inverted navbar
-// //
-// // Reset inverted navbar basics
-// $navbar-inverse-color:                      $gray-light;
-// $navbar-inverse-bg:                         #222;
-// $navbar-inverse-border:                     darken($navbar-inverse-bg, 10%);
-//
-// // Inverted navbar links
-// $navbar-inverse-link-color:                 $gray-light;
-// $navbar-inverse-link-hover-color:           #fff;
-// $navbar-inverse-link-hover-bg:              transparent;
-// $navbar-inverse-link-active-color:          $navbar-inverse-link-hover-color;
-// $navbar-inverse-link-active-bg:             darken($navbar-inverse-bg, 10%);
-// $navbar-inverse-link-disabled-color:        #444;
-// $navbar-inverse-link-disabled-bg:           transparent;
-//
-// // Inverted navbar brand label
-// $navbar-inverse-brand-color:                $navbar-inverse-link-color;
-// $navbar-inverse-brand-hover-color:          #fff;
-// $navbar-inverse-brand-hover-bg:             transparent;
-//
-// // Inverted navbar toggle
-// $navbar-inverse-toggle-hover-bg:            #333;
-// $navbar-inverse-toggle-icon-bar-bg:         #fff;
-// $navbar-inverse-toggle-border-color:        #333;
-//
-//
-// // Navs
-// // -------------------------
-//
-// $nav-link-padding:                          10px 15px;
-// $nav-link-hover-bg:                         $gray-lighter;
-//
-// $nav-disabled-link-color:                   $gray-light;
-// $nav-disabled-link-hover-color:             $gray-light;
-//
-// $nav-open-link-hover-color:                 #fff;
-// $nav-open-caret-border-color:               #fff;
-//
-// // Tabs
-// $nav-tabs-border-color:                     #ddd;
-//
-// $nav-tabs-link-hover-border-color:          $gray-lighter;
-//
-// $nav-tabs-active-link-hover-bg:             $body-bg;
-// $nav-tabs-active-link-hover-color:          $gray;
-// $nav-tabs-active-link-hover-border-color:   #ddd;
-//
-// $nav-tabs-justified-link-border-color:            #ddd;
-// $nav-tabs-justified-active-link-border-color:     $body-bg;
-//
-// // Pills
-// $nav-pills-border-radius:                   $border-radius-base;
-// $nav-pills-active-link-hover-bg:            $component-active-bg;
-// $nav-pills-active-link-hover-color:         $component-active-color;
-//
-//
-// // Pagination
-// // -------------------------
-//
-// $pagination-bg:                        #fff;
-// $pagination-border:                    #ddd;
-//
-// $pagination-hover-bg:                  $gray-lighter;
-//
-// $pagination-active-bg:                 $brand-primary;
-// $pagination-active-color:              #fff;
-//
-// $pagination-disabled-color:            $gray-light;
-//
-//
-// // Pager
-// // -------------------------
-//
-// $pager-border-radius:                  15px;
-// $pager-disabled-color:                 $gray-light;
-//
-//
-// // Jumbotron
-// // -------------------------
-//
-// $jumbotron-padding:              30px;
-// $jumbotron-color:                inherit;
-// $jumbotron-bg:                   $gray-lighter;
-// $jumbotron-heading-color:        inherit;
-// $jumbotron-font-size:            ceil($font-size-base * 1.5);
-//
-//
-// // Form states and alerts
-// // -------------------------
-//
-// $state-success-text:             #468847;
-// $state-success-bg:               #dff0d8;
-// $state-success-border:           darken(spin($state-success-bg, -10), 5%);
-//
-// $state-info-text:                #3a87ad;
-// $state-info-bg:                  #d9edf7;
-// $state-info-border:              darken(spin($state-info-bg, -10), 7%);
-//
-// $state-warning-text:             #c09853;
-// $state-warning-bg:               #fcf8e3;
-// $state-warning-border:           darken(spin($state-warning-bg, -10), 5%);
-//
-// $state-danger-text:              #b94a48;
-// $state-danger-bg:                #f2dede;
-// $state-danger-border:            darken(spin($state-danger-bg, -10), 5%);
-//
-//
-// // Tooltips
-// // -------------------------
-// $tooltip-max-width:           200px;
-// $tooltip-color:               #fff;
-// $tooltip-bg:                  #000;
-//
-// $tooltip-arrow-width:         5px;
-// $tooltip-arrow-color:         $tooltip-bg;
-//
-//
-// // Popovers
-// // -------------------------
-// $popover-bg:                          #fff;
-// $popover-max-width:                   276px;
-// $popover-border-color:                rgba(0,0,0,.2);
-// $popover-fallback-border-color:       #ccc;
-//
-// $popover-title-bg:                    darken($popover-bg, 3%);
-//
-// $popover-arrow-width:                 10px;
-// $popover-arrow-color:                 #fff;
-//
-// $popover-arrow-outer-width:           ($popover-arrow-width + 1);
-// $popover-arrow-outer-color:           rgba(0,0,0,.25);
-// $popover-arrow-outer-fallback-color:  #999;
-//
-//
-// // Labels
-// // -------------------------
-//
-// $label-default-bg:            $gray-light;
-// $label-primary-bg:            $brand-primary;
-// $label-success-bg:            $brand-success;
-// $label-info-bg:               $brand-info;
-// $label-warning-bg:            $brand-warning;
-// $label-danger-bg:             $brand-danger;
-//
-// $label-color:                 #fff;
-// $label-link-hover-color:      #fff;
-//
-//
-// // Modals
-// // -------------------------
-// $modal-inner-padding:         20px;
-//
-// $modal-title-padding:         15px;
-// $modal-title-line-height:     $line-height-base;
-//
-// $modal-content-bg:                             #fff;
-// $modal-content-border-color:                   rgba(0,0,0,.2);
-// $modal-content-fallback-border-color:          #999;
-//
-// $modal-backdrop-bg:           #000;
-// $modal-header-border-color:   #e5e5e5;
-// $modal-footer-border-color:   $modal-header-border-color;
-//
-//
-// // Alerts
-// // -------------------------
-// $alert-padding:               15px;
-// $alert-border-radius:         $border-radius-base;
-// $alert-link-font-weight:      bold;
-//
-// $alert-success-bg:            $state-success-bg;
-// $alert-success-text:          $state-success-text;
-// $alert-success-border:        $state-success-border;
-//
-// $alert-info-bg:               $state-info-bg;
-// $alert-info-text:             $state-info-text;
-// $alert-info-border:           $state-info-border;
-//
-// $alert-warning-bg:            $state-warning-bg;
-// $alert-warning-text:          $state-warning-text;
-// $alert-warning-border:        $state-warning-border;
-//
-// $alert-danger-bg:             $state-danger-bg;
-// $alert-danger-text:           $state-danger-text;
-// $alert-danger-border:         $state-danger-border;
-//
-//
-// // Progress bars
-// // -------------------------
-// $progress-bg:                 #f5f5f5;
-// $progress-bar-color:          #fff;
-//
-// $progress-bar-bg:             $brand-primary;
-// $progress-bar-success-bg:     $brand-success;
-// $progress-bar-warning-bg:     $brand-warning;
-// $progress-bar-danger-bg:      $brand-danger;
-// $progress-bar-info-bg:        $brand-info;
-//
-//
-// // List group
-// // -------------------------
-// $list-group-bg:               #fff;
-// $list-group-border:           #ddd;
-// $list-group-border-radius:    $border-radius-base;
-//
-// $list-group-hover-bg:         #f5f5f5;
-// $list-group-active-color:     $component-active-color;
-// $list-group-active-bg:        $component-active-bg;
-// $list-group-active-border:    $list-group-active-bg;
-//
-// $list-group-link-color:          #555;
-// $list-group-link-heading-color:  #333;
-//
-//
-// // Panels
-// // -------------------------
-// $panel-bg:                    #fff;
-// $panel-inner-border:          #ddd;
-// $panel-border-radius:         $border-radius-base;
-// $panel-footer-bg:             #f5f5f5;
-//
-// $panel-default-text:          $gray-dark;
-// $panel-default-border:        #ddd;
-// $panel-default-heading-bg:    #f5f5f5;
-//
-// $panel-primary-text:          #fff;
-// $panel-primary-border:        $brand-primary;
-// $panel-primary-heading-bg:    $brand-primary;
-//
-// $panel-success-text:          $state-success-text;
-// $panel-success-border:        $state-success-border;
-// $panel-success-heading-bg:    $state-success-bg;
-//
-// $panel-warning-text:          $state-warning-text;
-// $panel-warning-border:        $state-warning-border;
-// $panel-warning-heading-bg:    $state-warning-bg;
-//
-// $panel-danger-text:           $state-danger-text;
-// $panel-danger-border:         $state-danger-border;
-// $panel-danger-heading-bg:     $state-danger-bg;
-//
-// $panel-info-text:             $state-info-text;
-// $panel-info-border:           $state-info-border;
-// $panel-info-heading-bg:       $state-info-bg;
-//
-//
-// // Thumbnails
-// // -------------------------
-// $thumbnail-padding:           4px;
-// $thumbnail-bg:                $body-bg;
-// $thumbnail-border:            #ddd;
-// $thumbnail-border-radius:     $border-radius-base;
-//
-// $thumbnail-caption-color:     $text-color;
-// $thumbnail-caption-padding:   9px;
-//
-//
-// // Wells
-// // -------------------------
-// $well-bg:                     #f5f5f5;
-//
-//
-// // Badges
-// // -------------------------
-// $badge-color:                 #fff;
-// $badge-link-hover-color:      #fff;
-// $badge-bg:                    $gray-light;
-//
-// $badge-active-color:          $link-color;
-// $badge-active-bg:             #fff;
-//
-// $badge-font-weight:           bold;
-// $badge-line-height:           1;
-// $badge-border-radius:         10px;
-//
-//
-// // Breadcrumbs
-// // -------------------------
-// $breadcrumb-bg:               #f5f5f5;
-// $breadcrumb-color:            #ccc;
-// $breadcrumb-active-color:     $gray-light;
-// $breadcrumb-separator:        "/";
-//
-//
-// // Carousel
-// // ------------------------
-//
-// $carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6);
-//
-// $carousel-control-color:                      #fff;
-// $carousel-control-width:                      15%;
-// $carousel-control-opacity:                    .5;
-// $carousel-control-font-size:                  20px;
-//
-// $carousel-indicator-active-bg:                #fff;
-// $carousel-indicator-border-color:             #fff;
-//
-// $carousel-caption-color:                      #fff;
-//
-//
-// // Close
-// // ------------------------
-// $close-font-weight:           bold;
-// $close-color:                 #000;
-// $close-text-shadow:           0 1px 0 #fff;
-//
-//
-// // Code
-// // ------------------------
-// $code-color:                  #c7254e;
-// $code-bg:                     #f9f2f4;
-//
-// $pre-bg:                      #f5f5f5;
-// $pre-color:                   $gray-dark;
-// $pre-border-color:            #ccc;
-// $pre-scrollable-max-height:   340px;
-//
-// // Type
-// // ------------------------
-// $text-muted:                  $gray-light;
-// $abbr-border-color:           $gray-light;
-// $headings-small-color:        $gray-light;
-// $blockquote-small-color:      $gray-light;
-// $blockquote-border-color:     $gray-lighter;
-// $page-header-border-color:    $gray-lighter;
-//
-// // Miscellaneous
-// // -------------------------
-//
-// // Hr border color
-// $hr-border:                   $gray-lighter;
-//
-// // Horizontal forms & lists
-// $component-offset-horizontal: 180px;
-//
-//
-// // Container sizes
-// // --------------------------------------------------
-//
-// // Small screen / tablet
-// $container-tablet:             ((720px + $grid-gutter-width));
-// $container-sm:                 $container-tablet;
-//
-// // Medium screen / desktop
-// $container-desktop:            ((940px + $grid-gutter-width));
-// $container-md:                 $container-desktop;
-//
-// // Large screen / wide desktop
-// $container-large-desktop:      ((1140px + $grid-gutter-width));
-// $container-lg:                 $container-large-desktop;

+ 6 - 1
resource/styles/index.js

@@ -1,2 +1,7 @@
+import './scss/vendor.scss';
+
+// agile-admin theme
 import './agile-admin/inverse/style.scss';
-import '../css/crowi.scss';
+import './agile-admin/inverse/colors/default.scss';
+
+import './scss/crowi.scss';

+ 1 - 1
resource/styles/presentation.js

@@ -1 +1 @@
-import '../css/crowi-reveal.scss';
+import './scss/crowi-reveal.scss';

+ 0 - 0
resource/css/_admin.scss → resource/styles/scss/_admin.scss


+ 0 - 0
resource/css/_attachments.scss → resource/styles/scss/_attachments.scss


+ 2 - 2
resource/css/_comment.scss → resource/styles/scss/_comment.scss

@@ -1,5 +1,5 @@
 // import crowi variable
-@import 'utilities';
+// @import 'utilities';
 
 .crowi.main-container {
   .page-comment-delete-modal .modal-content {
@@ -90,7 +90,7 @@
 
     .page-comment.page-comment-me {
       //color: lighten($crowiHeaderBackground, 65%);
-      color: $crowiHeaderBackground;
+      // color: $crowiHeaderBackground;
       .page-comment-main {
 
         .page-comment-body,

+ 0 - 0
resource/css/_comment_crowi-plus.scss → resource/styles/scss/_comment_crowi-plus.scss


+ 0 - 0
resource/css/_delete.scss → resource/styles/scss/_delete.scss


+ 2 - 2
resource/css/_form.scss → resource/styles/scss/_form.scss

@@ -1,5 +1,5 @@
-// import crowi variable
-@import 'utilities';
+// import Growi variable
+@import 'variables';
 
 .crowi.main-container .main .content-main.on-edit { // {{{ Edit Form of Page
   padding: 0;

+ 6 - 6
resource/css/_layout.scss → resource/styles/scss/_layout.scss

@@ -7,8 +7,8 @@
 
     .crowi-header { // {{{
       z-index: 1040;
-      background: $crowiHeaderBackground;
-      height: $crowiHeaderHeight;
+      // background: $crowiHeaderBackground;
+      // height: $crowiHeaderHeight;
       border-radius: 0;
       border: none;
       margin-bottom: 0;
@@ -23,7 +23,7 @@
         }
       }
       .navbar-collapse {
-        background: $crowiHeaderBackground;
+        // background: $crowiHeaderBackground;
       }
 
       > div > .navbar-nav li button {
@@ -88,7 +88,7 @@
       padding: 5px 8px;
       border: solid 1px #ccc;
       border-right: none;
-      background: $crowiAsideBackground;
+      // background: $crowiAsideBackground;
       border-radius: 5px 0 0 5px;
       z-index: 1039;
       font-size: .8em;
@@ -97,7 +97,7 @@
 
       &:hover {
         color: darken($link-color, 25%);
-        background: darken($crowiAsideBackground, 10%);
+        // background: darken($crowiAsideBackground, 10%);
         text-decoration: none;
         cursor: pointer;
       }
@@ -112,7 +112,7 @@
 
 .crowi.single.nologin { // {{{
   //background: lighten($crowiHeaderBackground, 15%);
-  background: $crowiHeaderBackground;
+  // background: $crowiHeaderBackground;
 
   .installer-header {
     margin-top: 100px;

+ 0 - 0
resource/css/_layout_crowi-plus.scss → resource/styles/scss/_layout_crowi-plus.scss


+ 0 - 0
resource/css/_mixins.scss → resource/styles/scss/_mixins.scss


+ 5 - 5
resource/css/_page.scss → resource/styles/scss/_page.scss

@@ -171,14 +171,14 @@
     z-index: 1030;
     position: fixed;
     padding: 65px 0 0 0;
-    margin-bottom: $crowiFooterHeight;
+    // margin-bottom: $crowiFooterHeight;
     color: #333;
     height: 100%;
     right: 0;
     top: 0;
     overflow: auto;
     border-left: solid 1px #ccc;
-    background: $crowiAsideBackground;
+    // background: $crowiAsideBackground;
 
     transition: .3s ease;
     -webkit-transition: .3s ease;
@@ -238,7 +238,7 @@
 
 
     .side-content {
-      margin-bottom: $crowiFooterHeight + $crowiHeaderHeight;
+      // margin-bottom: $crowiFooterHeight + $crowiHeaderHeight;
       color: #666;
       padding: 15px;
 
@@ -272,7 +272,7 @@
     height: 26px;
     padding: 4px;
     color: #444;
-    background: $crowiAsideBackground;
+    // background: $crowiAsideBackground;
     border-top-left-radius: 5px;
     z-index: 1055;
 
@@ -362,7 +362,7 @@
         display: block;
 
         &:hover {
-          background: darken($crowiAsideBackground, 10%);
+          // background: darken($crowiAsideBackground, 10%);
           text-decoration: none;
           color: darken($link-color, 35%);
         }

+ 0 - 0
resource/css/_page_crowi-plus.scss → resource/styles/scss/_page_crowi-plus.scss


+ 0 - 0
resource/css/_page_list.scss → resource/styles/scss/_page_list.scss


+ 0 - 0
resource/css/_portal.scss → resource/styles/scss/_portal.scss


+ 0 - 0
resource/css/_search.scss → resource/styles/scss/_search.scss


+ 0 - 0
resource/css/_shortcuts.scss → resource/styles/scss/_shortcuts.scss


+ 0 - 0
resource/css/_user.scss → resource/styles/scss/_user.scss


+ 0 - 0
resource/css/_user_crowi-plus.scss → resource/styles/scss/_user_crowi-plus.scss


+ 21 - 20
resource/css/_utilities.scss → resource/styles/scss/_utilities.scss

@@ -1,3 +1,4 @@
+/*
 // crowi
 $brand-primary:         #43676b;
 
@@ -9,7 +10,7 @@ $crowiAsideBackground: #fcfcfc;
 
 $crowiFooterBackground:  $crowiHeaderBackground;
 $crowiFooterHeight: 34px;
-
+*/
 
 
 //
@@ -23,8 +24,8 @@ $crowiFooterHeight: 34px;
 // Grays
 // -------------------------
 
-$gray-darker:            lighten(#000, 13.5%); // #222
-$gray-dark:              lighten(#000, 20%);   // #333
+// $gray-darker:            lighten(#000, 13.5%); // #222
+// $gray-dark:              lighten(#000, 20%);   // #333
 // $gray:                   lighten(#000, 33.5%); // #555
 // $gray-light:             lighten(#000, 60%);   // #999
 // $gray-lighter:           lighten(#000, 93.5%); // #eee
@@ -50,16 +51,16 @@ $gray-dark:              lighten(#000, 20%);   // #333
 // // Links
 // // -------------------------
 //
-$link-color:            $brand-primary;
-$link-hover-color:      darken($link-color, 15%);
+// $link-color:            $brand-primary;
+// $link-hover-color:      darken($link-color, 15%);
 //
 // // Typography
 // // -------------------------
 //
-$font-family-sans-serif:  Lato, -apple-system, BlinkMacSystemFont, 'Hiragino Kaku Gothic ProN', Meiryo, sans-serif;
+// $font-family-sans-serif:  Lato, -apple-system, BlinkMacSystemFont, 'Hiragino Kaku Gothic ProN', Meiryo, sans-serif;
 // $font-family-serif:       Georgia, "Times New Roman", Times, serif;
-$font-family-monospace:   Osaka-Mono, "MS Gothic", Monaco, Menlo, Consolas, "Courier New", monospace;
-$font-family-monospace-not-strictly:   Monaco, Menlo, Consolas, "Courier New", MeiryoKe_Console, "M+ 1m", monospace;
+// $font-family-monospace:   Osaka-Mono, "MS Gothic", Monaco, Menlo, Consolas, "Courier New", monospace;
+// $font-family-monospace-not-strictly:   Monaco, Menlo, Consolas, "Courier New", MeiryoKe_Console, "M+ 1m", monospace;
 // $font-family-base:        $font-family-sans-serif;
 //
 // $font-size-base:          14px;
@@ -193,9 +194,9 @@ $font-family-monospace-not-strictly:   Monaco, Menlo, Consolas, "Courier New", M
 // $dropdown-fallback-border:       #ccc;
 // $dropdown-divider-bg:            #e5e5e5;
 //
-$dropdown-link-color:            $gray-dark;
-$dropdown-link-hover-color:      darken($gray-dark, 5%);
-$dropdown-link-hover-bg:         #f5f5f5;
+// $dropdown-link-color:            $gray-dark;
+// $dropdown-link-hover-color:      darken($gray-dark, 5%);
+// $dropdown-link-hover-bg:         #f5f5f5;
 //
 // $dropdown-link-active-color:     $component-active-color;
 // $dropdown-link-active-bg:        $component-active-bg;
@@ -660,13 +661,13 @@ $dropdown-link-hover-bg:         #f5f5f5;
 //
 
 // Badget
-@mixin badge-variant($color) {
-  background-color: $color;
+// @mixin badge-variant($color) {
+//   background-color: $color;
 
-  &[href] {
-    &:hover,
-    &:focus {
-      background-color: darken($color, 10%);
-    }
-  }
-}
+//   &[href] {
+//     &:hover,
+//     &:focus {
+//       background-color: darken($color, 10%);
+//     }
+//   }
+// }

+ 5 - 0
resource/styles/scss/_variables.scss

@@ -0,0 +1,5 @@
+$font-family-sans-serif:  Lato, -apple-system, BlinkMacSystemFont, 'Hiragino Kaku Gothic ProN', Meiryo, sans-serif;
+$font-family-serif:       Georgia, "Times New Roman", Times, serif;
+$font-family-monospace:   Osaka-Mono, "MS Gothic", Monaco, Menlo, Consolas, "Courier New", monospace;
+$font-family-monospace-not-strictly:   Monaco, Menlo, Consolas, "Courier New", MeiryoKe_Console, "M+ 1m", monospace;
+$font-family-base:        $font-family-sans-serif;

+ 0 - 0
resource/css/_wiki.scss → resource/styles/scss/_wiki.scss


+ 0 - 0
resource/css/_wiki_crowi-plus.scss → resource/styles/scss/_wiki_crowi-plus.scss


+ 3 - 3
resource/css/crowi-reveal.scss → resource/styles/scss/crowi-reveal.scss

@@ -1,5 +1,5 @@
-// import crowi variable
-@import 'utilities';
+// import Growi variable
+@import 'variables';
 
 .reveal {
   font-size: 32px;
@@ -126,4 +126,4 @@
     // }}}
 
   }
-}
+}

+ 22 - 28
resource/css/crowi.scss → resource/styles/scss/crowi.scss

@@ -1,34 +1,27 @@
 // import crowi variable
-@import 'utilities';
-
-// import bootstrap
-$bootstrap-sass-asset-helper: true;
-@import "~bootstrap-sass/assets/stylesheets/bootstrap";
-
-// import toastr styles
-@import '~toastr/build/toastr';
+@import 'variables';
 
 // crowi component
-@import 'admin';
-@import 'attachments';
-@import 'comment';
-@import 'comment_crowi-plus';
-@import 'delete';
-@import 'form';
-@import 'layout';
-@import 'layout_crowi-plus';
-@import 'page_list';
-@import 'page';
-@import 'page_crowi-plus';
-@import 'portal';
-@import 'search';
-@import 'shortcuts';
-@import 'user';
-@import 'user_crowi-plus';
-@import 'wiki';
-@import 'wiki_crowi-plus';
-
-
+// @import 'admin';
+// @import 'attachments';
+// @import 'comment';
+// @import 'comment_crowi-plus';
+// @import 'delete';
+// @import 'form';
+// @import 'layout';
+// @import 'layout_crowi-plus';
+// @import 'page_list';
+// @import 'page';
+// @import 'page_crowi-plus';
+// @import 'portal';
+// @import 'search';
+// @import 'shortcuts';
+// @import 'user';
+// @import 'user_crowi-plus';
+// @import 'wiki';
+// @import 'wiki_crowi-plus';
+
+/*
 ul {
   padding-left: 18px;
 }
@@ -466,3 +459,4 @@ input.searching {
     content: 'Ctrl';
   }
 }
+*/

+ 6 - 0
resource/styles/scss/vendor.scss

@@ -0,0 +1,6 @@
+// import bootstrap
+$bootstrap-sass-asset-helper: true;
+@import "~bootstrap-sass/assets/stylesheets/bootstrap";
+
+// import toastr styles
+@import '~toastr/build/toastr';