Author: adityasharma
Date: Wed Aug 14 09:49:29 2019
New Revision: 1865104
URL: http://svn.apache.org/viewvc?rev=1865104&view=rev
Log:
Applied fix from trunk for revision: 1865103
===
Improved: Change the uggly favicon with the new one ! | Using new OFBiz logo
(OFBIZ-10522)
Fixed issues with logo size for flatgrey theme with some custom css to fix its
height and width
Replaced old logo with the new one in tomahawk theme along with some custom css
to fix its height and width
Modified:
ofbiz/ofbiz-framework/branches/release18.12/ (props changed)
ofbiz/ofbiz-framework/branches/release18.12/themes/flatgrey/webapp/flatgrey/style.css
ofbiz/ofbiz-framework/branches/release18.12/themes/tomahawk/webapp/tomahawk/css/style.css
Propchange: ofbiz/ofbiz-framework/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 14 09:49:29 2019
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972,1859981,1860082,1860141,
1860274,1860357,1860526,1860592,1860597,1860613,1860797,1861615,1861811,1861815,1861828,1861834,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271,1862278,1862466,1862648,1863560,1863838,1863965,1864216,1864716,1864721,1864881,1864891,1864930
+/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972,1859981,1860082,1860141,
1860274,1860357,1860526,1860592,1860597,1860613,1860797,1861615,1861811,1861815,1861828,1861834,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271,1862278,1862466,1862648,1863560,1863838,1863965,1864216,1864716,1864721,1864881,1864891,1864930,1865103
Modified:
ofbiz/ofbiz-framework/branches/release18.12/themes/flatgrey/webapp/flatgrey/style.css
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/themes/flatgrey/webapp/flatgrey/style.css?rev=1865104&r1=1865103&r2=1865104&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release18.12/themes/flatgrey/webapp/flatgrey/style.css
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/themes/flatgrey/webapp/flatgrey/style.css
Wed Aug 14 09:49:29 2019
@@ -286,6 +286,10 @@ th, th a {
#masthead ul .logo-area {
padding: 0.1em 0.8em;
}
+#masthead ul .logo-area img {
+ height: 60px;
+ width: 129px;
+}
#masthead ul .org-logo-area {
padding: 0.1em 0.8em;
Modified:
ofbiz/ofbiz-framework/branches/release18.12/themes/tomahawk/webapp/tomahawk/css/style.css
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1865104&r1=1865103&r2=1865104&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release18.12/themes/tomahawk/webapp/tomahawk/css/style.css
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/themes/tomahawk/webapp/tomahawk/css/style.css
Wed Aug 14 09:49:29 2019
@@ -953,9 +953,10 @@ in contained elements. */
/* ===== Masthead (Header) Styles ===== */
/* ==================================== */
#logo-area {
- background: url(../images/ofbiz_logo.png) no-repeat;
+ background: url(/images/ofbiz_logo.png) no-repeat;
width: 385px;
height: 50px;
+ background-size: 119px 50px;
}
#logo-area a {
