From: <amn...@us...> - 2017-01-18 13:56:42
|
Revision: 60926 http://sourceforge.net/p/tikiwiki/code/60926 Author: amnabilal Date: 2017-01-18 13:56:40 +0000 (Wed, 18 Jan 2017) Log Message: ----------- [MRG] Automatic merge, branches/16.x 60922 to 60925 Modified Paths: -------------- trunk/lib/pdflib.php trunk/themes/base_files/css/printpdf.css Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2017-01-18 13:42:52 UTC (rev 60925) +++ trunk 2017-01-18 13:56:40 UTC (rev 60926) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -4,7 +4,7 ## /branches/13.x:51407-53060,53145,53192,53882 /branches/14.x:54079-56796,57357,57370,57375 /branches/15.x:57416-57449,57459,57461-59163,59319,59349,59355,59358,59362,59420,59696,59710,59880,60046 -/branches/16.x:59883-60406,60408,60410,60420,60428-60922 +/branches/16.x:59883-60406,60408,60410,60420,60428-60925 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property Modified: trunk/lib/pdflib.php =================================================================== --- trunk/lib/pdflib.php 2017-01-18 13:42:52 UTC (rev 60925) +++ trunk/lib/pdflib.php 2017-01-18 13:56:40 UTC (rev 60926) @@ -332,6 +332,11 @@ $printcss = file_get_contents('themes/base_files/css/printpdf.css'); // external css } + else + {//preserving theme styles by removing media print styles to print what is shown on screen + $themecss=str_replace(array("media print","color : fff"),array("media p","color : #fff"),$themecss); + $basecss=str_replace(array("media print","color : fff"),array("media p","color : #fff"),$basecss); + } $mpdf->WriteHTML('<style>'.$basecss.$themecss.$printcss.$this->bootstrapReplace().'</style>'.$html); $this->clearTempImg($tempImgArr); return $mpdf->Output('', 'S'); // Return as a string @@ -473,7 +478,7 @@ } function bootstrapReplace(){ - return ".col-xs-12 {width: 90%;}.col-xs-11 {width: 81.66666667%;}.col-xs-10 {width: 72%;}.col-xs-9 {width: 64%;}.col-xs-8 {width: 57%;}.col-xs-7 {width: 49%;}.col-xs-6 {width: 42%;}.col-xs-5 {width: 35%;}.col-xs-4 {width: 28%;}.col-xs-3{width: 20%;}.col-xs-2 {width: 12.2%;}.col-xs-1 {width: 3.92%;} .table-striped {border:1px solid #ccc;} .table-striped td { padding: 8px; line-height: 1.42857143;vertical-align: center;border-top: 1px solid #ccc; color:#000; } .table-striped th { padding: 10px; line-height: 1.42857143;vertical-align: center; background-color:#ccc; color:#000 } .table-striped .odd { color:#000;padding:10px;} .table-striped .even { padding:10px; background-color:#eee; }.odd { padding:10px; background-color:#fff; } .table-striped a{color:#000} .trackerfilter form{display:none;}"; + return ".col-xs-12 {width: 90%;}.col-xs-11 {width: 81.66666667%;}.col-xs-10 {width: 72%;}.col-xs-9 {width: 64%;}.col-xs-8 {width: 57%;}.col-xs-7 {width: 49%;}.col-xs-6 {width: 42%;}.col-xs-5 {width: 35%;}.col-xs-4 {width: 28%;}.col-xs-3{width: 20%;}.col-xs-2 {width: 12.2%;}.col-xs-1 {width: 3.92%;} .table-striped {border:1px solid #ccc;} .table-striped td { padding: 8px; line-height: 1.42857143;vertical-align: center;border-top: 1px solid #ccc;} .table-striped th { padding: 10px; line-height: 1.42857143;vertical-align: center; } .table-striped .odd {padding:10px;} .trackerfilter form{display:none;}"; } function sortContent(&$table,&$tempValue,&$sortedContent,$tag) Modified: trunk/themes/base_files/css/printpdf.css =================================================================== --- trunk/themes/base_files/css/printpdf.css 2017-01-18 13:42:52 UTC (rev 60925) +++ trunk/themes/base_files/css/printpdf.css 2017-01-18 13:56:40 UTC (rev 60926) @@ -8,7 +8,7 @@ body h1, body h2, body h3, body h4, body h5, body h6 { page-break-after:avoid; color:#000 } body .alert { display:none; } -a { text-decoration:none; color:#000 } +a { text-decoration:none; color:#337ab7 } p{color:#000;} .editplugin{display:none;visibility:hidden} @@ -19,6 +19,11 @@ padding:0.5em; color:#000; background-color:#ccc; vertical-align:bottom; border-bottom:2px solid #696969; } +.table td .calhighlight { + color: #31708f; + background: #d9edf7; +} + .table td { padding:0.5em; background-color:#fff; vertical-align:top; border-top:1px solid #696969; border-bottom:none; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |