takahiros 6 лет назад
Родитель
Сommit
920e8963e1

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

@@ -174,7 +174,7 @@
 
 // bg-title for .row
 .bg-title {
-  padding: 6px 0;
+  padding: initial;
   margin-right: -15px;
   margin-left: -15px;
   overflow: unset;

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

@@ -32,4 +32,4 @@ $grw-floral-white: floralwhite;
 // see also '_on-edit.scss'
 $nav-main-left-tab-width: 95px;
 $nav-main-tab-height: 44px;
-$nav-main-tab-font-size: 16px;
+$nav-main-tab-font-size: 14px;

+ 10 - 4
src/client/styles/scss/_override-bootstrap.scss

@@ -23,16 +23,14 @@
 }
 
 //** override bootstrap nav nav-tabs nav-item
-@mixin grw-nav-tab-set($min-width: initial, $padding-x: 1em) {
+@mixin grw-nav-tab-set {
   position: relative;
-  min-width: $min-width;
   text-align: center;
   $active-tab-border-width: 1px;
   $active-tab-border-bg: white;
   a {
     display: block;
-    height: $nav-main-tab-height;
-    padding: ($nav-main-tab-height - $nav-main-tab-font-size)/2 $padding-x;
+    padding: 10px 15px;
     font-size: $nav-main-tab-font-size;
   }
   &.active {
@@ -55,3 +53,11 @@
 .nav.nav-tabs > .nav-item {
   @include grw-nav-tab-set;
 }
+
+.nav.nav-tabs.grw-nab-tabs-left-top > .nav-item {
+  @include grw-nav-tab-set;
+  a {
+    min-width: 95px;
+    padding: 10px 0;
+  }
+}

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

@@ -1,5 +1,5 @@
 <div class="page-list-container">
-  <ul class="nav nav-tabs grw-nav-tabs-wide">
+  <ul class="nav nav-tabs">
       <li class="nav-item active"><a href="#view-list" data-toggle="tab">{{ t('List View') }}</a></li>
       {% if getConfig('crowi', 'customize:isEnabledTimeline') %}
       <li class="nav-item"><a href="#view-timeline" data-toggle="tab">{{ t('Timeline View') }}</a></li>

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

@@ -1,5 +1,5 @@
 {% if page %}
-<ul class="nav nav-tabs hidden-print">
+<ul class="nav nav-tabs grw-nab-tabs-left-top hidden-print">
 
   {#
     Left Tabs