Răsfoiți Sursa

.bg-title -> .grw-subnav

Yuki Takei 6 ani în urmă
părinte
comite
360c72cb5b

+ 1 - 1
src/client/js/legacy/crowi.js

@@ -119,7 +119,7 @@ Crowi.handleKeyCtrlSlashHandler = (event) => {
 Crowi.initAffix = () => {
   const $affixContent = $('#page-header');
   if ($affixContent.length > 0) {
-    const $affixContentContainer = $('.row.bg-title');
+    const $affixContentContainer = $('.row.grw-subnav');
     const containerHeight = $affixContentContainer.outerHeight(true);
     $affixContent.affix({
       offset: {

+ 1 - 1
src/client/styles/agile-admin/inverse/colors/antarctic.scss

@@ -71,7 +71,7 @@ table,
   background-color: $background-color;
 }
 
-.bg-title,
+.grw-subnav,
 .nav-navbar {
   background-color: $themelight;
 }

+ 1 - 1
src/client/styles/agile-admin/inverse/colors/christmas.scss

@@ -53,7 +53,7 @@ $active-nav-tabs-bgcolor: white;
   background-attachment: fixed;
 }
 
-.bg-title {
+.grw-subnav {
   background-color: #ffffff;
 }
 

+ 1 - 1
src/client/styles/agile-admin/inverse/colors/future.scss

@@ -31,7 +31,7 @@ $inline-code-bg: darken($bodycolor, 5%);
 @import 'apply-colors-dark';
 
 .main-container:not(.on-edit) {
-  .bg-title {
+  .grw-subnav {
     border-bottom: 1px solid rgb(131, 228, 215);
   }
 }

+ 1 - 1
src/client/styles/agile-admin/inverse/colors/halloween.scss

@@ -70,7 +70,7 @@ $inline-code-bg: #0a121b;
   background-attachment: fixed;
 }
 
-.bg-title {
+.grw-subnav {
   background-color: rgba(0, 0, 0, 0.3);
 }
 

+ 1 - 1
src/client/styles/agile-admin/inverse/colors/wood.scss

@@ -46,7 +46,7 @@ $active-nav-tabs-bgcolor: #fffffc;
   background-attachment: fixed;
 }
 
-.bg-title {
+.grw-subnav {
   background-color: rgba(226, 221, 192, 0.205);
 }
 

+ 1 - 1
src/client/styles/agile-admin/inverse/eliteadmin.scss

@@ -1054,7 +1054,7 @@ pre {
 
 // Page title
 
-.bg-title {
+.grw-subnav {
   overflow: hidden;
   padding: 6px 15px;
   margin-left: -25.5px;

+ 1 - 1
src/client/styles/agile-admin/inverse/responsive.scss

@@ -77,7 +77,7 @@
 
     }
     .row-in-br{ border-right:0px; border-bottom:1px solid $border;}
-    .bg-title{
+    .grw-subnav{
       .breadcrumb{
         float:left;
         margin-top:0px;

+ 5 - 10
src/client/styles/scss/_layout.scss

@@ -180,17 +180,12 @@
   }
 }
 
-// header widget area
-.grw-title-bar {
-  background: $grw-floral-white;
-}
-
-// bg-title for .row
-.bg-title {
-  padding: initial;
-  margin-right: -15px;
-  margin-left: -15px;
+.grw-subnav {
   overflow: unset;
+
+  .grw-title-bar {
+    background: $grw-floral-white;
+  }
 }
 
 //@each $

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

@@ -199,7 +199,7 @@ body:not(.aside-hidden) #toggle-crowi-sidebar {
     right: -25%;
   }
 
-  .bg-title .col-md-9,
+  .grw-subnav .col-md-9,
   .main {
     width: 100%;
   }

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

@@ -86,7 +86,7 @@ body.kibela {
     border-radius: 0.35em;
   }
 
-  .bg-title {
+  .grw-subnav {
     position: relative;
     background: transparent;
     border: none;

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

@@ -84,7 +84,7 @@ body.on-edit {
     padding-bottom: 0;
   }
 
-  .row.bg-title {
+  .row.grw-subnav {
     $left-margin: $grw-nav-main-left-tab-width * 2 + 25px; // width of .grw-nav-main-left-tab x 2 + some margin
     $right-margin: 128px + 94px + 46px; //                    width of all of grw-nav-main-right-tab
 
@@ -97,7 +97,7 @@ body.on-edit {
 
     background: none;
 
-    > .header-container {
+    > .grw-title-bar {
       width: 100%; //   for crowi layout
       padding: 0; //    for crowi layout
       pointer-events: initial; // enable pointer-events

+ 1 - 1
src/client/styles/scss/theme/_override-agileadmin.scss

@@ -1,7 +1,7 @@
 @import 'layout_variable';
 
 /*
-.bg-title {
+.grw-subnav {
   padding: 6px 0;
   margin-right: -15px;
   margin-left: -15px;

+ 3 - 3
src/server/views/layout-crowi/base/layout.html

@@ -29,12 +29,12 @@
     {% include '../../widget/system-version.html' %}
   </aside>
 
-  <div class="row hidden-print bg-title d-none d-md-block">
-    <div class="col-md-9 header-container">
+  <div class="row grw-subnav">
+    <div class="col-md-9 grw-title-bar">
       {% block content_header %}
       {% endblock %}
     </div>
-  </div><!-- /.bg-title -->
+  </div><!-- /.grw-subnav -->
 
   <div class="row">
     <div id="main" class="main mt-4 col-md-9 {% if page %}{{ css.grant(page) }}{% endif %} {% block main_css_class %}{% endblock %}">

+ 4 - 6
src/server/views/layout-growi/base/layout.html

@@ -8,12 +8,10 @@
 {% block layout_main %}
 <div class="container-fluid">
 
-  <div class="row bg-title">
-    <div class="col-12 header-container grw-title-bar">
-      <div class="d-none d-md-block d-print-none py-2">
-        {% block content_header %}
-        {% endblock %}
-      </div>
+  <div class="row grw-subnav">
+    <div class="col-12 grw-title-bar">
+      {% block content_header %}
+      {% endblock %}
     </div><!-- /.grw-title-bar -->
   </div><!-- /.row -->
 

+ 3 - 3
src/server/views/layout-kibela/base/layout.html

@@ -11,12 +11,12 @@
   <div class="row body m-0 p-0">
 
     <div id="main" class="main mt-5 col-md-7 col-xs-12 kibela-block bg-white round-corner {% if page %}{{ css.grant(page) }}{% endif %}{% block main_css_class %}{% endblock %}">
-      <div class="row bg-title d-none d-md-block">
-        <div class="col-xs-12 header-container">
+      <div class="row grw-subnav">
+        <div class="col-xs-12 grw-title-bar">
           {% block content_header %} {% endblock %}
         </div>
       </div>
-      <!-- /.bg-title -->
+      <!-- /.grw-subnav -->
 
       {% block content_main_before %}
       {% endblock %}

+ 2 - 2
src/server/views/tags.html

@@ -2,8 +2,8 @@
 
 {% block layout_main %}
 <div class="container-fluid">
-  <div class="row bg-title hidden-print">
-    <div class="col-xs-12 header-container">
+  <div class="row grw-subnav">
+    <div class="col-xs-12 grw-title-bar">
       {% block content_header %}
       <div class="header-wrap">
         <header id="page-header">