You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2017/12/22 06:51:18 UTC
svn commit: r1819000 - in /ofbiz/ofbiz-plugins/trunk/ecommerce:
template/catalog/CategoryDetail.ftl template/includes/HeaderHead.ftl
webapp/ecommerce/css/custom.css webapp/ecommerce/images/ecommain.css
widget/CommonScreens.xml
Author: deepak
Date: Fri Dec 22 06:51:18 2017
New Revision: 1819000
URL: http://svn.apache.org/viewvc?rev=1819000&view=rev
Log:
Improved: Restructuring of ecommerce container according to responsive behaviour of bootstrap (OFBIZ-10106)
Thanks Parakh Maheshwari for your contribution
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/CategoryDetail.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/HeaderHead.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css
ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/CategoryDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/CategoryDetail.ftl?rev=1819000&r1=1818999&r2=1819000&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/CategoryDetail.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/catalog/CategoryDetail.ftl Fri Dec 22 06:51:18 2017
@@ -69,7 +69,6 @@
</div>
</#if>
</#macro>
- <br/>
<#if productCategory??>
<#assign categoryName = categoryContentWrapper.get("CATEGORY_NAME", "html")!/>
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/HeaderHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/HeaderHead.ftl?rev=1819000&r1=1818999&r2=1819000&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/HeaderHead.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/includes/HeaderHead.ftl Fri Dec 22 06:51:18 2017
@@ -23,6 +23,7 @@ under the License.
</#if>
<html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml">
<head>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title><#if title?has_content>${title}<#elseif titleProperty?has_content>${uiLabelMap.get(titleProperty)}</#if>
: ${(productStore.storeName)!}
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css?rev=1819000&r1=1818999&r2=1819000&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/css/custom.css Fri Dec 22 06:51:18 2017
@@ -22,7 +22,7 @@
padding:10px;
}
.card {
- margin-bottom:10px!important;
+ margin-bottom:20px!important;
}
.d-flex.justify-content-center a {
margin-bottom: 10px;
@@ -33,10 +33,6 @@
height: 140px;
}
-.card {
- height: 100%;
-}
-
.products-card.col-md-3 {
margin-bottom: 30px !important;
}
@@ -62,4 +58,4 @@ color: #000000;
.footer-block {
background: #f8f9fa;
-}
\ No newline at end of file
+}
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css?rev=1819000&r1=1818999&r2=1819000&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/ecommain.css Fri Dec 22 06:51:18 2017
@@ -255,9 +255,8 @@ text-decoration:underline;
#ecom-mainarea {
background:#FFF;
-margin-top:10px;
+margin-top:20px;
position:relative;
-width:100%;
text-align:left;
flex:1;
}
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml?rev=1819000&r1=1818999&r2=1819000&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CommonScreens.xml Fri Dec 22 06:51:18 2017
@@ -84,18 +84,16 @@ under the License.
<container id="parentContainer">
<container id="header"><platform-specific><html><html-template location="${headerTemplateLocation}"/></html></platform-specific></container>
- <container id="ecom-mainarea">
- <!-- by default will render left-bar only if left/rightbarScreenName value not empty -->
- <container id="div1" style="left"><include-screen name="${leftbarScreenName}" location="${leftbarScreenLocation}"/></container>
- <container id="div2" style="right"><include-screen name="${rightbarScreenName}" location="${rightbarScreenLocation}"/></container>
+ <container id="ecom-mainarea" style="row mx-2">
- <container id="div3" style="${MainColumnStyle}">
- <!-- render messages -->
- <platform-specific><html><html-template location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific>
- <decorator-section-include name="body"/>
- </container>
-
- <container id="div4" style="endcolumns"/>
+ <container style="col-lg-2 order-lg-1 order-2"><include-screen name="${leftbarScreenName}" location="${leftbarScreenLocation}"/></container>
+ <container style="col-lg-8 order-lg-2 order-1">
+ <!-- render messages -->
+ <platform-specific><html><html-template location="component://common-theme/template/includes/Messages.ftl"/></html></platform-specific>
+ <decorator-section-include name="body"/>
+ </container>
+ <container style="col-lg-2 order-lg-3 order-3"><include-screen name="${rightbarScreenName}" location="${rightbarScreenLocation}"/></container>
+ <container id="div4" style="endcolumns"/>
</container>
<!-- render footer -->