Merge pull request #5772 from MrPetovan/bug/php7-remove-pear-text_highlighter

Remove references to Pear Text_Highlighter stylesheets

diff --git a/view/global.css b/view/global.css
index cea6c51036bd11da370b2083121c55197c00da7c..e266ceb53ef895244a3e9060f16ebbc1f40b9786 100644 (file)
--- a/view/global.css
+++ b/view/global.css
@@ -248,7 +248,6 @@ span.oembed, h4 {
 }
 
 code {
-  display: block;
   background-color: #eee;
   color: #666;
   padding: 1em;

diff --git a/view/templates/head.tpl b/view/templates/head.tpl
index aadbfcd8eeb9e944e8d64ea951d514cde77617bb..7da270d3ff1ed8b6a0b59905178766ee874a7f43 100644 (file)
--- a/view/templates/head.tpl
+++ b/view/templates/head.tpl
@@ -7,7 +7,6 @@
 <link rel="stylesheet" href="view/asset/jgrowl/jquery.jgrowl.min.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="view/asset/jquery-datetimepicker/build/jquery.datetimepicker.min.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="view/asset/perfect-scrollbar/css/perfect-scrollbar.min.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="vendor/pear/text_highlighter/sample.css" type="text/css" media="screen" />
 
 <link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
 

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index b29ff37477b4897d342e8ab01096b9939c896905..e327a1ec91a92c51da08dd17208006d9d7a41e03 100644 (file)
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -41,7 +41,7 @@ img { border :0px; }
        width: 384px;
 }
 
-code {
+pre code {
        font-family: Courier, monospace;
        white-space: pre;
        display: block;

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index cd55dcadc4b6e073ede90f55f8d3829569c74a2d..9b4833611797e9c8ea8b77c06a6e134dbb547ea0 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -96,9 +96,6 @@ blockquote {
     max-height: 0px !important;
     overflow: hidden !important;
 }
-code {
-    white-space: pre-wrap;
-}
 
 /**
  * mobile aside

diff --git a/view/theme/frio/templates/head.tpl b/view/theme/frio/templates/head.tpl
index 7d6cadea94fad12936a587ec387055a5842a6bba..9d26a61b45595fa204124ebb52f8ec8fe9bb7baf 100644 (file)
--- a/view/theme/frio/templates/head.tpl
+++ b/view/theme/frio/templates/head.tpl
@@ -12,7 +12,6 @@
 <link rel="stylesheet" href="view/asset/jgrowl/jquery.jgrowl.min.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="view/asset/jquery-datetimepicker/build/jquery.datetimepicker.min.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="view/asset/perfect-scrollbar/css/perfect-scrollbar.min.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="vendor/pear/text_highlighter/sample.css" type="text/css" media="screen" />
 
 <link rel="stylesheet" href="view/theme/frio/frameworks/bootstrap/css/bootstrap.min.css" type="text/css" media="screen"/>
 <link rel="stylesheet" href="view/theme/frio/frameworks/bootstrap/css/bootstrap-theme.min.css" type="text/css" media="screen"/>

diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 87dc3720239377c481f4ac8dc6b1e941c1b53d58..bfb078e566bf514f359a19c8ed4b2e00919ce074 100644 (file)
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -469,7 +469,7 @@ blockquote {
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
 }
-code {
+pre code {
   font-family: Courier, monospace;
   white-space: pre;
   display: block;

diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index 55cb32556b44ecefbd3a108ac3be6adf98277c78..1dce844acd21dc771c6aa39ff48a810d4ae095b7 100644 (file)
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -469,7 +469,7 @@ blockquote {
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
 }
-code {
+pre code {
   font-family: Courier, monospace;
   white-space: pre;
   display: block;

diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 4e6c727b091d29987a0d6af209994ff49274401c..870fe6ce23fbaa6e83943b0b84494d3d4129fb85 100644 (file)
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -469,7 +469,7 @@ blockquote {
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
 }
-code {
+pre code {
   font-family: Courier, monospace;
   white-space: pre;
   display: block;

diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index 399f12e5567dbad3fcf7e4d8cad7eec0fa69ddb5..0907237871ffbc3ad3ce954171ebdfe415793c53 100644 (file)
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -1860,7 +1860,7 @@ blockquote.shared_content {
 
 #item-delete-selected-icon {}
 
-code {
+pre code {
        font-family: Courier, monospace;
        display: block;
        overflow: auto;
@@ -2024,7 +2024,7 @@ code {
        float: right;
 }
 
-.wall-item-body code {
+.wall-item-body pre code {
        font-family: Courier, monospace;
        display: block;
        overflow: auto;

diff --git a/view/theme/vier/breathe.css b/view/theme/vier/breathe.css
index ec6d91a5698cc8f007c17f024976c1d33c35b054..3403a24b277f6bae85a83d4966e0b47ded3d8819 100644 (file)
--- a/view/theme/vier/breathe.css
+++ b/view/theme/vier/breathe.css
@@ -14,7 +14,7 @@ header #banner #logo-text {
   border-bottom: none !important;
 }
 
-code {
+pre code {
   border: none;
   border-radius: 5px;
 }

diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 572be5e18f392f7ce97874eb6a9102cd9085ae6a..6c4f2b20f3da2ea0c550ce48a8dfe8985bdc9d5d 100644 (file)
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -323,7 +323,7 @@ a:hover {
        /* color: #005c94; */
        text-decoration: underline;
 }
-code {
+pre code {
        font-family: Courier, monospace;
        white-space: pre;
        display: block;