Author: pranayp
Date: Mon Jun 13 09:21:20 2016
New Revision: 1748150
URL: http://svn.apache.org/viewvc?rev=1748150&view=rev
Log:
Manually applied fix from trunk revision 1748145.
---------------------------------------------------------------------
[OFBIZ-7268] Improved the styling for the anchor links inside the 'button-bar'
to fix styling for CommonButtonBarMenu. Reverted the changes committed under
OFBIZ-7006, since these UI improvements fix that issue as well by extending
CommonButtonBarMenu.
Thanks Swapnil M Mane for the contribution.
---------------------------------------------------------------------
Modified:
ofbiz/branches/release14.12/framework/webtools/widget/Menus.xml
ofbiz/branches/release14.12/themes/bizznesstime/webapp/bizznesstime/css/style.css
ofbiz/branches/release14.12/themes/bluelight/webapp/bluelight/style.css
ofbiz/branches/release14.12/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
ofbiz/branches/release14.12/themes/flatgrey/webapp/flatgrey/maincss.css
ofbiz/branches/release14.12/themes/tomahawk/webapp/tomahawk/css/style.css
Modified: ofbiz/branches/release14.12/framework/webtools/widget/Menus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/webtools/widget/Menus.xml?rev=1748150&r1=1748149&r2=1748150&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/webtools/widget/Menus.xml (original)
+++ ofbiz/branches/release14.12/framework/webtools/widget/Menus.xml Mon Jun 13
09:21:20 2016
@@ -249,7 +249,7 @@ under the License.
</menu-item>
</menu>
- <menu name="FindCache" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
+ <menu name="FindCache" extends="CommonButtonBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="refresh" title="${uiLabelMap.CommonRefresh}"
widget-style="buttontext refresh">
<link target="FindUtilCache"/>
</menu-item>
Modified:
ofbiz/branches/release14.12/themes/bizznesstime/webapp/bizznesstime/css/style.css
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/themes/bizznesstime/webapp/bizznesstime/css/style.css?rev=1748150&r1=1748149&r2=1748150&view=diff
==============================================================================
---
ofbiz/branches/release14.12/themes/bizznesstime/webapp/bizznesstime/css/style.css
(original)
+++
ofbiz/branches/release14.12/themes/bizznesstime/webapp/bizznesstime/css/style.css
Mon Jun 13 09:21:20 2016
@@ -977,7 +977,7 @@ a.buttontext,.buttontextdisabled {
/*white-space: nowrap;*/
}
-a.buttontext {
+a.buttontext, .button-bar li.buttontext a {
background:url(../images/btn-bg.gif) center left repeat-x;
border:2px solid #ddd;
color:#444444;
Modified:
ofbiz/branches/release14.12/themes/bluelight/webapp/bluelight/style.css
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/themes/bluelight/webapp/bluelight/style.css?rev=1748150&r1=1748149&r2=1748150&view=diff
==============================================================================
--- ofbiz/branches/release14.12/themes/bluelight/webapp/bluelight/style.css
(original)
+++ ofbiz/branches/release14.12/themes/bluelight/webapp/bluelight/style.css Mon
Jun 13 09:21:20 2016
@@ -309,7 +309,7 @@ A.browsecategorybutton {
font-weight: bold;
}
-A.buttontext,.buttontextdisabled {
+A.buttontext,.buttontextdisabled, .button-bar li.buttontext a {
background-color: #ffffff;
border: #999999 solid 0.1em;
font-weight: bold;
@@ -319,11 +319,11 @@ A.buttontext,.buttontextdisabled {
/*white-space: nowrap;*/
}
-A.buttontext {
+A.buttontext, .button-bar li.buttontext a {
color: #000099;
}
-A.buttontext:hover {
+A.buttontext:hover, .button-bar li.buttontext a:hover {
color: #ff0000;
}
Modified:
ofbiz/branches/release14.12/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css?rev=1748150&r1=1748149&r2=1748150&view=diff
==============================================================================
---
ofbiz/branches/release14.12/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
(original)
+++
ofbiz/branches/release14.12/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
Mon Jun 13 09:21:20 2016
@@ -314,7 +314,7 @@ color: #333333;
font-weight: bold;
}
-A.buttontext,.buttontextdisabled {
+A.buttontext,.buttontextdisabled, .button-bar li.buttontext a {
background-color: #ffffff;
border: #999999 solid 0.1em;
font-weight: bold;
@@ -324,11 +324,11 @@ padding: 0.1em 0.4em 0.1em 0.4em;
/*white-space: nowrap;*/
}
-A.buttontext {
+A.buttontext, .button-bar li.buttontext a {
color: #000099;
}
-A.buttontext:hover {
+A.buttontext:hover, .button-bar li.buttontext a:hover {
color: #ff0000;
}
Modified:
ofbiz/branches/release14.12/themes/flatgrey/webapp/flatgrey/maincss.css
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/themes/flatgrey/webapp/flatgrey/maincss.css?rev=1748150&r1=1748149&r2=1748150&view=diff
==============================================================================
--- ofbiz/branches/release14.12/themes/flatgrey/webapp/flatgrey/maincss.css
(original)
+++ ofbiz/branches/release14.12/themes/flatgrey/webapp/flatgrey/maincss.css Mon
Jun 13 09:21:20 2016
@@ -695,6 +695,7 @@ display: inline; /* IE Fix */
.button-bar ul li ul li {
float: left;
font-weight: bold;
+margin-right: 0.5em;
}
.button-bar ul .opposed {
@@ -1450,11 +1451,12 @@ textarea {
vertical-align: middle;
}
+.button-bar li.buttontext a,
a.buttontext,
a.buttontextbig,
.smallSubmit,
.smallSubmit:hover,
-.mediumSubmit,
+.mediumSubmit,
.largeSubmit,
.loginButton,
.button-style-1 a,
Modified:
ofbiz/branches/release14.12/themes/tomahawk/webapp/tomahawk/css/style.css
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1748150&r1=1748149&r2=1748150&view=diff
==============================================================================
--- ofbiz/branches/release14.12/themes/tomahawk/webapp/tomahawk/css/style.css
(original)
+++ ofbiz/branches/release14.12/themes/tomahawk/webapp/tomahawk/css/style.css
Mon Jun 13 09:21:20 2016
@@ -1479,6 +1479,10 @@ font-weight: bold;
text-transform: uppercase;
}
+.button-bar ul li ul li {
+margin-right: 0.5em;
+}
+
.button-bar ul .opposed {
float: right;
}
