Merge pull request #4706 from MattGill98/CUSTCOM-291-c

CUSTCOM-291 Update Woodstock and Fix Masthead Image Dimensions
payara · Jun 17, 2020 · 170fc8a · 170fc8a
2 parents 35af5d0 + 5e7b5a6
commit 170fc8a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/appserver/admingui/payara-theme/src/main/resources/branding/masthead.inc b/appserver/admingui/payara-theme/src/main/resources/branding/masthead.inc
@@ -45,7 +45,6 @@
               style="border-width: 0px"
               productImageDescription="$resource{theme.productName}"
               productImageWidth="191"
-              productImageHeight="116"
               userInfo="#{userName}"  userInfoLabel="$resource{i18n.masthead.userInfoLabel}"
               roleInfo="#{domainName}" roleInfoLabel="$resource{i18n.masthead.domainInfoLabel}"
               serverInfo="#{hostName}" serverInfoLabel="$resource{i18n.masthead.serverInfoLabel}"

diff --git a/appserver/admingui/pom.xml b/appserver/admingui/pom.xml
@@ -172,7 +172,7 @@
         <commons-fileupload.version>1.3.3</commons-fileupload.version>
         <woodstock-dojo-ajax-nodemo.version>0.4.4</woodstock-dojo-ajax-nodemo.version>
         <woodstock-jsf.version>4.0.2.10.payara-p16</woodstock-jsf.version>
-        <woodstock-jsf-suntheme.version>4.0.2.10.payara-p18</woodstock-jsf-suntheme.version>
+        <woodstock-jsf-suntheme.version>4.0.2.10.payara-p19</woodstock-jsf-suntheme.version>
         <woodstock-json.version>1.0</woodstock-json.version>
         <woodstock-prototype.version>1.7.3</woodstock-prototype.version>
     </properties>