Fixes #4443 Theming CSS rewrite should now rewrite all CSS

+ Removing the help_grey.png reference, merging with help.png
+ Making form inputs/selects look nice in calendar + site selector search

11 files changed, 20 insertions, 20 deletions

diff --git a/core/Theme.php b/core/Theme.php
index 5b376f9032..16db5efb91 100644
--- a/core/Theme.php
+++ b/core/Theme.php
@@ -91,9 +91,12 @@ class Theme
             // Images as well
             '~(src|href)=[\'"]([^\'"]+)[\'"]~',
 
-            // rewrite images in CSS files, i.e. url(plugins/Morpheus/overrides/themes/default/images/help.png);
+            // rewrite images in CSS files
             '~(url\()[\'"]([^\)]?[plugins]+[^\)]+[.jpg|png|gif|svg]?)[\'"][\)]~',
 
+            // url(plugins/....)
+            '~(url\()([^\)]?[plugins]+[^\)]+[.jpg|png|gif|svg]?)[\)]~',
+
             // rewrites images in JS files
             '~(=)[\s]?[\'"]([^\'"]+[.jpg|.png|.gif|svg]?)[\'"]~',
         );
diff --git a/plugins/CoreHome/stylesheets/coreHome.less b/plugins/CoreHome/stylesheets/coreHome.less
index 71a130f999..a20e627df8 100644
--- a/plugins/CoreHome/stylesheets/coreHome.less
+++ b/plugins/CoreHome/stylesheets/coreHome.less
@@ -109,7 +109,7 @@ div.ui-datepicker {
 
 #inputCalendarFrom, #inputCalendarTo {
     margin-left: 10px;
-    width: 90px;
+    width: 95px;
 }
 
 #calendarRangeApply {
diff --git a/plugins/CoreHome/stylesheets/dataTable/_reportDocumentation.less b/plugins/CoreHome/stylesheets/dataTable/_reportDocumentation.less
index 1661ddb5ec..a1a8ae50a4 100644
--- a/plugins/CoreHome/stylesheets/dataTable/_reportDocumentation.less
+++ b/plugins/CoreHome/stylesheets/dataTable/_reportDocumentation.less
@@ -54,7 +54,6 @@ h2 .reportDocumentationIcon {
   position: absolute;
   margin: 4px 0 0 0;
   display: none;
-  background: url(plugins/Zeitgeist/images/help_grey.png) no-repeat;
 }
 
 h2 .reportDocumentationIcon.hidden {
diff --git a/plugins/CoreHome/templates/_warningInvalidHost.twig b/plugins/CoreHome/templates/_warningInvalidHost.twig
index bed1bc3525..3a5c603d05 100644
--- a/plugins/CoreHome/templates/_warningInvalidHost.twig
+++ b/plugins/CoreHome/templates/_warningInvalidHost.twig
@@ -1,7 +1,7 @@
 {# untrusted host warning #}
 {% if (isValidHost is defined and invalidHostMessage is defined and isValidHost == false) %}
     {% set invalidHostText %}
-        <a style="float:right;" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank"><img src="plugins/Zeitgeist/images/help_grey.png"/></a>
+        <a style="float:right;" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank"><img src="plugins/Zeitgeist/images/help.png"/></a>
         <strong>{{ 'General_Warning'|translate }}:&nbsp;</strong>{{ invalidHostMessage|raw }}
 
         <br>
@@ -9,7 +9,7 @@
 
         <small>{{ invalidHostMessageHowToFix|raw }}
         <br/><br/><a style="float:right;" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank">{{ 'General_Help'|translate }}
-        <img style="vertical-align: bottom;" src="plugins/Zeitgeist/images/help_grey.png"/></a><br/>
+        <img style="vertical-align: bottom;" src="plugins/Zeitgeist/images/help.png"/></a><br/>
         </small>
     {% endset %}
 
diff --git a/plugins/Morpheus/stylesheets/components.less b/plugins/Morpheus/stylesheets/components.less
index a23e8578f7..1d64944944 100644
--- a/plugins/Morpheus/stylesheets/components.less
+++ b/plugins/Morpheus/stylesheets/components.less
@@ -176,6 +176,10 @@
         border-color: @silver-80;
     }
 
+    select {
+      min-height: 0;
+    }
+
     .calendar-icon {
         width: 17px;
         height: 17px;
@@ -356,8 +360,3 @@ table.dataTable tr:nth-child(2n) td .dataTableRowActions {
 table.dataTable th .columnDocumentation {
     color: @silver-90;
 }
-
-h2 .reportDocumentationIcon,
-table.dataTable th .columnDocumentationTitle {
-    background: no-repeat url('plugins/Morpheus/images/help.png');
-}
\ No newline at end of file
diff --git a/plugins/Morpheus/stylesheets/forms.less b/plugins/Morpheus/stylesheets/forms.less
index 83d7c935aa..95f79d2e39 100644
--- a/plugins/Morpheus/stylesheets/forms.less
+++ b/plugins/Morpheus/stylesheets/forms.less
@@ -41,6 +41,9 @@ button[type="button"],
 }
 
 .sites_autocomplete {
+    input {
+      min-height: 0;
+    }
     .custom_select {
         .border-radius(0px);
         background: #fff;
diff --git a/plugins/Morpheus/stylesheets/popups.less b/plugins/Morpheus/stylesheets/popups.less
index 25057f435f..c0eb111951 100644
--- a/plugins/Morpheus/stylesheets/popups.less
+++ b/plugins/Morpheus/stylesheets/popups.less
@@ -9,10 +9,6 @@
     font-weight: bold;
 }
 
-.ui-dialog-titlebar-help {
-    background: url('plugins/Morpheus/images/help.png');
-}
-
 #feedback-sent,
 #feedback-faq {
     p {
diff --git a/plugins/UserCountryMap/templates/realtimeMap.twig b/plugins/UserCountryMap/templates/realtimeMap.twig
index 09f8203e3a..e254bc313a 100644
--- a/plugins/UserCountryMap/templates/realtimeMap.twig
+++ b/plugins/UserCountryMap/templates/realtimeMap.twig
@@ -13,7 +13,7 @@
             {% endif %}
             <span class="no_data" style="display:none;">{{ 'CoreHome_ThereIsNoDataForThisReport'|translate }}</span>
             <span class="loading_data">{{ 'General_LoadingData'|translate }}...</span>
-            <img src="{{ piwikUrl }}plugins/UserCountryMap/images/realtimemap-loading.gif" style="vertical-align:baseline;position:relative;left:-2px;">
+            <img src="plugins/UserCountryMap/images/realtimemap-loading.gif" style="vertical-align:baseline;position:relative;left:-2px;">
         </div>
         {% if config.showDateTime|default(true) %}
         <div class="realTimeMap_overlay realTimeMap_datetime"></div>
@@ -21,7 +21,7 @@
     </div>
     <div class="RealTimeMap_meta">
         <span class="loadingPiwik">
-            <img src="{{ piwikUrl }}plugins/Zeitgeist/images/loading-blue.gif"> {{ 'General_LoadingData'|translate }}...
+            <img src="plugins/Zeitgeist/images/loading-blue.gif"> {{ 'General_LoadingData'|translate }}...
         </span>
     </div>
 
diff --git a/plugins/UserCountryMap/templates/visitorMap.twig b/plugins/UserCountryMap/templates/visitorMap.twig
index 561880fd59..a5149c0777 100644
--- a/plugins/UserCountryMap/templates/visitorMap.twig
+++ b/plugins/UserCountryMap/templates/visitorMap.twig
@@ -22,7 +22,7 @@
             <div class="pk-emptyDataTable">{{ 'CoreHome_ThereIsNoDataForThisReport'|translate }}</div>
         {% else %}
             <span class="loadingPiwik">
-                <img src="{{ piwikUrl }}plugins/Zeitgeist/images/loading-blue.gif" />
+                <img src="plugins/Zeitgeist/images/loading-blue.gif" />
                 {{ 'General_LoadingData'|translate }}...
             </span>
         {% endif %}
@@ -30,7 +30,7 @@
     <div class="dataTableFeatures" style="padding-top:0;">
         <div class="dataTableFooterIcons">
             <div class="dataTableFooterWrap" var="graphVerticalBar">
-                <img class="UserCountryMap-activeItem dataTableFooterActiveItem" src="{{ piwikUrl }}plugins/Zeitgeist/images/data_table_footer_active_item.png" style="left: 25px;" />
+                <img class="UserCountryMap-activeItem dataTableFooterActiveItem" src="plugins/Zeitgeist/images/data_table_footer_active_item.png" style="left: 25px;" />
 
                 <div class="tableIconsGroup">
                     <span class="tableAllColumnsSwitch">
@@ -43,11 +43,11 @@
                     <span class="tableAllColumnsSwitch">
                         <a var="tableAllColumns" class="UserCountryMap-btn-region tableIcon activeIcon" format="tableAllColumns"
                            data-region="{{ 'UserCountryMap_Regions'|translate }}" data-country="{{ 'UserCountryMap_Countries'|translate }}">
-                            <img src="{{ piwikUrl }}plugins/UserCountryMap/images/regions.png" title="Show visitors per region/country" />
+                            <img src="plugins/UserCountryMap/images/regions.png" title="Show visitors per region/country" />
                             <span style="margin:0;">{{ 'UserCountryMap_Countries'|translate }}</span>&nbsp;
                         </a>
                         <a var="tableGoals" class="UserCountryMap-btn-city tableIcon inactiveIco" format="tableGoals">
-                            <img src="{{ piwikUrl }}plugins/UserCountryMap/images/cities.png" title="Show visitors per city" />
+                            <img src="plugins/UserCountryMap/images/cities.png" title="Show visitors per city" />
                             <span style="margin:0;">{{ 'UserCountryMap_Cities'|translate }}</span>&nbsp;
                         </a>
                     </span>
diff --git a/plugins/Zeitgeist/images/help.png b/plugins/Zeitgeist/images/help.png
index 5c870176d4..8f3df97e9c 100644
--- a/plugins/Zeitgeist/images/help.png
+++ b/plugins/Zeitgeist/images/help.png
diff --git a/plugins/Zeitgeist/images/help_grey.png b/plugins/Zeitgeist/images/help_grey.png
deleted file mode 100644
index 8f3df97e9c..0000000000
--- a/plugins/Zeitgeist/images/help_grey.png
+++ /dev/null