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

WIP: apply bootstrap theme

* adjust header layout
Yuki Takei 8 лет назад
Родитель
Сommit
12f27a98e4

+ 1 - 1
resource/js/legacy/crowi.js

@@ -526,7 +526,7 @@ $(function() {
     var $header = $('#page-header');
     if ($header.length > 0) {
       var headerHeight = $header.outerHeight(true);
-      $('.header-wrap').css({height: (headerHeight + 16) + 'px'});
+      $('.header-wrap').css({height: (headerHeight + 0) + 'px'});
       $header.affix({
         offset: {
           top: function() {

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

@@ -849,8 +849,8 @@ label{
 .bg-title{
   background: $extralight;
   overflow:hidden;
-  padding:15px 15px 10px;
-  margin-bottom:25px;
+  padding: 4px 8px 4px;
+  margin-bottom:10px;
   margin-left:-25.5px;
   margin-right:-25.5px;
 

+ 0 - 1
resource/styles/index.js

@@ -1,4 +1,3 @@
 import './scss/vendor.scss';
 
 import './scss/crowi.scss';
-import './agile-admin/inverse/colors/default.scss';

+ 1 - 0
resource/styles/scss/crowi.scss

@@ -6,6 +6,7 @@
 
 // agile-admin theme
 @import '../agile-admin/inverse/style';
+@import '../agile-admin/inverse/colors/default.scss';
 @import 'override-agileadmin';
 @import 'override-rbt';