ENGCOM-5358: Fixed issue #21974 #23393

- Merge Pull Request #23393 from geeta07/magento2:fix-21974 - Merged commits: 1. eb28f14
magento · Jun 25, 2019 · 27cebe0 · 27cebe0
2 parents 9fc254f + eb28f14
commit 27cebe0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/app/code/Magento/Analytics/Test/Mftf/Section/AdminConfigAdvancedReportingSection.xml b/app/code/Magento/Analytics/Test/Mftf/Section/AdminConfigAdvancedReportingSection.xml
@@ -14,8 +14,8 @@
         <element name="advancedReportingIndustry" type="select" selector="#analytics_general_vertical"/>
         <element name="advancedReportingIndustryLabel" type="text" selector=".config-vertical-label>label>span"/>
         <element name="advancedReportingHour" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(2)"/>
-        <element name="advancedReportingMinute" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(3)"/>
-        <element name="advancedReportingSeconds" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(4)"/>
+        <element name="advancedReportingMinute" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(4)"/>
+        <element name="advancedReportingSeconds" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(6)"/>
         <element name="advancedReportingBlankIndustryError" type="text" selector=".message-error>div"/>
     </section>
 </sections>
diff --git a/...nhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less b/...nhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
@@ -511,6 +511,11 @@
                     right: 0;
                     top: 0;
                 }
+
+                .time-separator {
+                    font-size: 14px;
+                    padding-left: 5px;
+                } 
 
                 .tooltip-content {
                     background: @color-very-dark-gray-black2;

diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Time.php b/lib/internal/Magento/Framework/Data/Form/Element/Time.php
@@ -76,7 +76,7 @@ public function getElementHtml()
         }
         $html .= '</select>' . "\n";
 
-        $html .= ':&nbsp;<select name="' . $this->getName() . '" style="width:80px" '
+        $html .= '<span class="time-separator">:&nbsp;</span><select name="' . $this->getName() . '" style="width:80px" '
             . $this->serialize($this->getHtmlAttributes())
             . $this->_getUiId('minute') . '>' . "\n";
         for ($i = 0; $i < 60; $i++) {
@@ -86,7 +86,7 @@ public function getElementHtml()
         }
         $html .= '</select>' . "\n";
 
-        $html .= ':&nbsp;<select name="' . $this->getName() . '" style="width:80px" '
+        $html .= '<span class="time-separator">:&nbsp;</span><select name="' . $this->getName() . '" style="width:80px" '
             . $this->serialize($this->getHtmlAttributes())
             . $this->_getUiId('second') . '>' . "\n";
         for ($i = 0; $i < 60; $i++) {