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

Merge pull request #589 from weseek/imprv/adjust-scss-for-print

add class hidden-print
Yuki Takei 7 лет назад
Родитель
Сommit
9fd63b6b83

+ 1 - 1
src/client/js/components/HeaderSearchBox/SearchForm.js

@@ -82,7 +82,7 @@ export default class SearchForm extends React.Component {
       <form
         ref='form'
         action='/_search'
-        className='search-form form-group input-group search-input-group'
+        className='search-form form-group input-group search-input-group hidden-print'
       >
         <FormGroup>
           <InputGroup>

+ 6 - 0
src/client/js/legacy/crowi.js

@@ -846,4 +846,10 @@ window.addEventListener('keydown', (event) => {
       }
       break;
   }
+
 });
+
+// adjust min-height of page for print temporarily
+window.onbeforeprint = function () {
+  $("#page-wrapper").css("min-height", "0px");
+};

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

@@ -24,7 +24,7 @@
     {% include '../../widget/system-version.html' %}
   </aside>
 
-  <div class="row bg-title">
+  <div class="row hidden-print bg-title">
     <div class="col-md-9">
       {% block content_header %}
       {% endblock %}

+ 1 - 1
src/server/views/layout-crowi/page_list.html

@@ -63,7 +63,7 @@
     {% include '../widget/page_content.html' %}
   </div>
 
-  <div class="row page-list {% if isPortal %}m-t-30{% endif %}">
+  <div class="row page-list hidden-print {% if isPortal %}m-t-30{% endif %}">
     <div class="col-md-12">
       {% include '../widget/page_list_and_timeline.html' %}
     </div>

+ 1 - 1
src/server/views/layout-crowi/user_page.html

@@ -13,7 +13,7 @@
 
 
 {% block content_main_before %}
-  <div class="m-b-30 user-page-content-container">
+  <div class="m-b-30 user-page-content-container hidden-print">
     {% include '../widget/user_page_content.html' %}
   </div>
 {% endblock %}

+ 1 - 1
src/server/views/layout-growi/base/layout.html

@@ -3,7 +3,7 @@
 {% block layout_main %}
 <div class="container-fluid">
 
-  <div class="row bg-title">
+  <div class="row bg-title hidden-print">
     <div class="col-xs-12">
       {% block content_header %}
       {% endblock %}

+ 1 - 1
src/server/views/layout-growi/page.html

@@ -34,7 +34,7 @@
   </div>
 
   {% if 'growi' === behaviorType() || 'crowi-plus' === behaviorType() %}
-  <div class="row page-list m-t-30">
+  <div class="row page-list hidden-print m-t-30">
     <div class="col-md-10">
       {% include '../widget/page_list_and_timeline.html' %}
     </div>

+ 1 - 1
src/server/views/layout-growi/page_list.html

@@ -33,7 +33,7 @@
 
   </div>
 
-  <div class="row page-list {% if isPortal %}m-t-30{% endif %}">
+  <div class="row page-list hidden-print {% if isPortal %}m-t-30{% endif %}">
     <div class="col-md-10">
       {% include '../widget/page_list_and_timeline.html' %}
     </div>

+ 2 - 2
src/server/views/layout-growi/user_page.html

@@ -25,7 +25,7 @@
         #   Because this block has content like 'Bookmarks' or 'Recent Created' whose height changes dynamically,
         #   setting of 'revision-toc' (affix) is hindered.
         #}
-      <div class="m-b-30 user-page-content-container">
+      <div class="m-b-30 user-page-content-container hidden-print">
         {% include '../widget/user_page_content.html' %}
       </div>
 
@@ -52,7 +52,7 @@
   </div>
 
   {% if 'growi' === behaviorType() || 'crowi-plus' === behaviorType() %}
-  <div class="row page-list m-t-30">
+  <div class="row page-list hidden-print m-t-30">
     <div class="col-md-10">
       {% include '../widget/page_list_and_timeline.html' %}
     </div>

+ 1 - 1
src/server/views/layout-growi/widget/comments.html

@@ -1,4 +1,4 @@
-<div class="page-comments-row row">
+<div class="page-comments-row row hidden-print">
 
   <div class="page-comments col-lg-7 col-md-9">
 

+ 1 - 1
src/server/views/layout/layout.html

@@ -210,7 +210,7 @@ gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js
 
   {% block sidebar %}
   <!-- Left navbar-header -->
-  <div class="navbar-default sidebar" role="navigation">
+  <div class="navbar-default sidebar hidden-print" role="navigation">
     <div class="sidebar-nav navbar-collapse slimscrollsidebar">
       <ul class="nav" id="side-menu">
         <li class="sidebar-search hidden-sm hidden-md hidden-lg">

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

@@ -1,4 +1,4 @@
-<div class="row page-attachments-row">
+<div class="row page-attachments-row hidden-print">
   <div class="col-xs-12">
     <div class="m-t-15 m-b-15">
       <div class="page-attachments" id="page-attachment"></div>

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

@@ -23,7 +23,7 @@
 
       {# formatted text #}
       <div class="tab-pane active" id="revision-body">
-        <div class="revision-toc" id="revision-toc">
+        <div class="revision-toc hidden-print" id="revision-toc">
           <a data-toggle="collapse" data-parent="#revision-toc" href="#revision-toc-content" class="revision-toc-head">{{ t('Table of Contents') }}</a>
           <div id="revision-toc-content" class="revision-toc-content collapse in"></div>
         </div>