Merge branch 'master' of github.com:diepxuan/theme-frontend-dxvn

diepxuan · Apr 2, 2019 · 8d90fcb · 8d90fcb
2 parents ae9df8f + 072f169
commit 8d90fcb
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/Magento_Catalog/layout/catalog_category_view.xml b/Magento_Catalog/layout/catalog_category_view.xml
@@ -6,7 +6,6 @@
 -->
 <page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-
     <body>
         <referenceBlock name="require-cookie" remove="true" />
         <referenceBlock name="page.main.title" remove="true" />

diff --git a/Magento_Catalog/layout/catalog_product_view.xml b/Magento_Catalog/layout/catalog_product_view.xml
@@ -30,8 +30,8 @@
             </referenceContainer>
             <referenceBlock name="view.addto.compare" remove="true" />
             <referenceContainer name="product.info.extrahint" remove="true" />
-            <referenceBlock name="product.info.addto" remove="true" />
-            <referenceBlock name="product.info" remove="true" />
+            <!-- <referenceBlock name="product.info.addto" remove="true" /> -->
+            <!-- <referenceBlock name="product.info" remove="true" /> -->
         </referenceContainer>
     </body>
 </page>
diff --git a/i18n/vi_VN.csv b/i18n/vi_VN.csv
@@ -5,4 +5,4 @@ Summary,Summary
 Menu,Menu
 Account,Account
 Settings,Settings
-"Add to Cart","Đặt Hàng"
+"Add to Cart","Đặt Hàng"
diff --git a/web/css/source/_theme.less b/web/css/source/_theme.less
@@ -8,4 +8,4 @@
 //  Theme file should contain declarations (overrides) ONLY OF EXISTING variables
 //  Otherwise this theme won't be available for parent nesting
 //  All new variables should be placed in local theme lib or local theme files
-@import url('https://fonts.googleapis.com/css?family=Open+Sans');
+@import url('https://fonts.googleapis.com/css?family=Open+Sans');
diff --git a/web/css/source/_variables.less b/web/css/source/_variables.less
@@ -6,7 +6,9 @@
 //
 //  Dxvn theme variables
 //  _____________________________________________
+
 @page__background-color: rgba(121, 255, 34, 0.4);
+
 //
 //  Typography
 //  ---------------------------------------------