Merge remote-tracking branch 'upstream/master'

OpenMage · Jul 27, 2020 · 52d929d · 52d929d
2 parents 421f256 + 1a6d47c
commit 52d929d
Show file tree

Hide file tree

Showing 70 changed files with 1,352 additions and 244 deletions.
diff --git a/_data/partners/agency.json b/_data/partners/agency.json
@@ -1,46 +1,79 @@
 [
   {
-      "name": "Webkul Software",
-      "url": "https://webkul.com",
-      "contributions": [
-          "Bug Reports",
-          "Modules Creator",
-          "Documentation"
-      ]
+    "name": "Webkul Software",
+    "url": "https://webkul.com",
+    "img_src": "/assets/images/agencies/webkul-software-logo.png",
+    "classes": "webkul-software",
+    "contributions": [
+        "Bug Reports",
+        "Modules Creator",
+        "Documentation"
+    ]
+  },
+  {
+    "name": "MageBinary",
+    "url": "https://www.magebinary.com",
+    "img_src": "/assets/images/agencies/magebinary-logo.jpg",
+    "classes": "magebinary"
   },
   {
     "name": "Edmonds Commerce",
     "url": "https://www.edmondscommerce.co.uk",
-    "contributions": []
+    "img_src": "/assets/images/agencies/edmonds-commerce-logo.png",
+    "classes": "edmonds-commerce"
   },
   {
     "name": "Splendid Internet GmbH",
     "url": "https://www.splendid-internet.de/",
-    "contributions": []
+    "img_src": "/assets/images/agencies/splendid-logo.jpg",
+    "classes": "splendid"
   },
   {
     "name": "The Ecommerce Workroom",
     "url": "https://ecommerceworkroom.co.uk",
-    "contributions": []
+    "img_src": "/assets/images/agencies/the-ecommerce-workroom-logo.jpg",
+    "classes": "ecommerce-workroom"
   },
   {
     "name": "CopeX GmbH",
     "url": "https://copex.io",
-    "contributions": []
+    "img_src": "/assets/images/agencies/copex-logo.png",
+    "classes": "copex"
   },
   {
     "name": "Burgess Commerce",
     "url": "https://BurgessCommerce.com",
-    "contributions": []
+    "img_src": "/assets/images/agencies/burgesscommerce-logo.png",
+    "classes": "burgesscommerce"
   },
   {
     "name": "BroSolutions",
     "url": "https://www.brosolutions.net/",
-    "contributions": []
+    "img_src": "/assets/images/agencies/brosolutions-logo.png",
+    "classes": "brosolutions"
   },
   {
     "name": "Sansec BV",
     "url": "https://sansec.io/?openmage",
-    "contributions": []
+    "img_src": "/assets/images/agencies/sansec-logo.png",
+    "classes": "sansec"
+  },
+  {
+    "name": "AlterWeb",
+    "url": "https://www.alterweb.nl/openmage",
+    "img_src": "/assets/images/agencies/alterweb-logo.png",
+    "classes": "alterweb"
+  },
+  {
+    "name": "Smartebusiness",
+    "url": "https://www.smartebusiness.co.uk",
+    "img_src": "/assets/images/agencies/smartebusiness-logo.png",
+    "classes": "smartebusiness"
+  },
+  {
+    "name": "ITPDX",
+    "url": "https://www.itpdx.com",
+    "img_src": "/assets/images/agencies/itpdx-logo.png",
+    "classes": "itpdx"
   }
 ]
diff --git a/_data/partners/module_vendor.json b/_data/partners/module_vendor.json
@@ -1,17 +1,58 @@
 [
+  {
+    "name": "XTENTO",
+    "url": "https://www.xtento.com",
+    "description": "Flexible. Stable. Trusted by thousands of merchants. XTENTO provides Magento 1 and Magento 2 extensions mainly in the import/export space and is known for its great customer support.",
+    "img_src": "/assets/images/module-vendors/xtento-logo.png",
+    "classes": "xtento"
+  },
   {
     "name": "RedChamps",
     "url": "https://redchamps.com",
-    "description": "We develop unique & must have Magento 1 and Magento 2 extensions."
+    "description": "We develop unique & must have Magento 1 and Magento 2 extensions.",
+    "img_src": "/assets/images/module-vendors/redchamps-logo.png",
+    "classes": "redchamps"
   },
   {
     "name": "Meetanshi",
     "url": "https://meetanshi.com",
-    "description": "With 140+ top quality Magento extensions, 5000+ customers and 9+ years of experience in the niche, Meetanshi keeps expanding Magento horizons and exceeding Ecommerce Excellence since 2017!"
+    "description": "With 140+ top quality Magento extensions, 5000+ customers and 9+ years of experience in the niche, Meetanshi keeps expanding Magento horizons and exceeding Ecommerce Excellence since 2017!",
+    "img_src": "/assets/images/module-vendors/meetanshi-logo.jpg",
+    "classes": "meetanshi"
+  },
+  {
+    "name": "Firebear Studio",
+    "url": "https://firebearstudio.com",
+    "description": "We help people import and export data, teach people how they can do it, follow ecommerce agenda, and review the extensions developed by the Magento community.",
+    "img_src": "/assets/images/module-vendors/firebear-studio-logo.png",
+    "classes": "firebear-studio"
   },
   {
     "name": "ModuleBazaar",
     "url": "https://www.modulebazaar.com/",
-    "description": "Module Bazaar (MB) is an online marketplace for buying & selling extensions, themes and more for Magento and other eCommerce platforms."
+    "description": "Module Bazaar (MB) is an online marketplace for buying & selling extensions, themes and more for Magento and other eCommerce platforms.",
+    "img_src": "/assets/images/module-vendors/module-bazaar-logo.jpg",
+    "classes": "module-bazaar"
+  },
+  {
+    "name": "OneStepCheckout",
+    "url": "https://www.onestepcheckout.com/magento-1/",
+    "description": "OneStepCheckout developed an unmatched expertise with over 20,000 Magento 1 merchants trusting them since 2010. They will be supporting the Magento 1 platform for as long as their customers need it.",
+    "img_src": "/assets/images/module-vendors/onestepcheckout-logo.png",
+    "classes": "onestepcheckout"
+  },
+  {
+    "name": "ParadoxLabs",
+    "url": "https://www.paradoxlabs.com/",
+    "description": "ParadoxLabs is all about building you the eCommerce experience you need and your customers want and their certified developers and quality extensions deliver the results you need.",
+    "img_src": "/assets/images/module-vendors/paradoxlabs-logo.jpg",
+    "classes": "paradoxlabs"
+  },
+  {
+    "name": "Blackfire.io",
+    "url": "https://blackfire.io/",
+    "description": "Blackfire.io is a PHP code profiler which supports Magento 1 and 2. Offering advanced metrics capturing and visualizations, Blackfire enables Magento developers to understand how their code is executed, how it consumes server resources, and how to optimize its performance, quality and security.",
+    "img_src": "/assets/images/module-vendors/blackfire-logo.png",
+    "classes": "blackfire"
   }
 ]
diff --git a/_data/partners/payment_processors.json b/_data/partners/payment_processors.json
@@ -0,0 +1,15 @@
+[
+  {
+    "name": "Heartland Payment Systems",
+    "url": "https://www.heartlandpaymentsystems.com/",
+    "url_text": "heartlandpaymentsystems.com",
+    "compatibilities": [
+      "SAQ A",
+      "SAQ A-EP"
+    ],
+    "extension_url": "https://github.com/hps/heartland-magento-extension",
+    "extension_text": "heartland-magento-extension",
+    "img_src": "/assets/images/payment-processors/heartland-logo.svg",
+    "classes": "heartland"
+  }
+]
diff --git a/_data/versions.json b/_data/versions.json
@@ -1,5 +1,5 @@
 {
   "composer": {
-    "latestStableBranch": "19.4.3"
+    "latestStableBranch": "19.4.5"
   }
 }
diff --git a/_layouts/page-redesign.html b/_layouts/page-redesign.html
@@ -0,0 +1,24 @@
+---
+layout: default
+---
+<div class="page-intro bg-dark-gradient">
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-10 offset-lg-1">
+                <div class="page-intro__title-wrapper">
+                    <h1 class="page-intro__title">
+                        {% if page.title %}<b>{{ page.title }}</b>{% endif %}{% if page.title_thin %} {{ page.title_thin }}{% endif %}
+                    </h1>
+                    {% if page.author %}
+                        <div class="page-intro__author">
+                            {{ page.date | date_to_string }} - {{ page.author }}
+                        </div>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+{{content}}
diff --git a/_layouts/partner-redesign.html b/_layouts/partner-redesign.html
@@ -0,0 +1,19 @@
+---
+layout: default
+---
+
+<div class="page-intro bg-dark-gradient">
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-10 offset-lg-1">
+                <div class="page-intro__title-wrapper">
+                    <h1 class="page-intro__title">
+                        {% if page.title %}<b>{{ page.title }}</b>{% endif %}{% if page.title_thin %} {{ page.title_thin }}{% endif %}
+                    </h1>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+{{content}}
diff --git a/_posts/2019-01-20-after-m1-eol.md b/_posts/2019-01-20-after-m1-eol.md
@@ -4,6 +4,7 @@ title: Plan for the time after Magento 1 eol
 category: Community
 thumbnail: /assets/images/blog/plan.png
 author: flyingmana
+permalink: /:year/:month/:day/:title:output_ext
 ---
 
 <img src="/images/OMlogo_2_1.png" style="float:left;max-width:30%;background-color: white;border-radius: 10%; margin-right: 20px;"/>

diff --git a/_posts/2019-08-18-new-home-magento-connect-modules.md b/_posts/2019-08-18-new-home-magento-connect-modules.md
@@ -4,6 +4,7 @@ title: A new Home for Magento Connect Modules
 category: Patches & addons
 thumbnail: /assets/images/blog/modules.png
 author: flyingmana
+permalink: /:year/:month/:day/:title:output_ext
 ---
 
 One essential part of the Magento Ecosystem are the Marketplace and the big number of Modules

diff --git a/_posts/2019-12-09-release-19-4-0.md b/_posts/2019-12-09-release-19-4-0.md
@@ -4,6 +4,7 @@ title: New Release 19.4.0
 category: Updates
 thumbnail: /assets/images/blog/release.png
 author: flyingmana
+permalink: /:year/:month/:day/:title:output_ext
 ---
 
 <img src="/images//posts/openmage_contributions_logo_2019_11.png" style="max-width:90%;"/>

diff --git a/_sass/card-icon/_card-icon.scss b/_sass/card-icon/_card-icon.scss
@@ -0,0 +1,32 @@
+.card-icon {
+    display: inline-block;
+    width: 68px;
+    height: 68px;
+    position: relative;
+    border: 1px solid $border-base;
+    border-radius: 0px 22px 0px 0px;
+    box-shadow: $icon-shadow;
+
+    &--link {
+        width: 45px;
+        height: 45px;
+        border-radius: 0px 12px 0px 0px;
+        box-shadow: none;
+        background-color: $border-light-1;
+        border-color: $border-light-1;
+    }
+
+    &--small {
+        width: 63px;
+        height: 63px;
+    }
+
+    &--big {
+        width: 88px;
+        height: 88px;
+    }
+
+    &__img {
+        @include center-item;
+    }
+}
diff --git a/_sass/card/_card.scss b/_sass/card/_card.scss
@@ -3,9 +3,8 @@
 }
 
 .card-title {
+    @include title('alternative');
     color: $black;
-    font-size: 1.25rem;
-    line-height: 1.5;
 }
 
 .card-text {
@@ -16,6 +15,21 @@
     background: none;
 }
 
+.card-intro {
+    display: flex;
+    align-items: center;
+    margin-bottom: 1rem;
+}
+
+.card-intro-title {
+    @include title('alternative');
+    color: $text-dark;
+    text-align: left;
+    margin-bottom: 0;
+    margin-left: 1.5rem;
+    margin-top: 1px;
+}
+
 .card-footer {
     padding: 0 $card-spacer-x;
     background: none;

diff --git a/_sass/contributor/_involvement.scss b/_sass/contributor/_involvement.scss
@@ -27,19 +27,6 @@
         margin-bottom: 2rem;
     }
 
-    &__item-wrapper {
-        width: 63px;
-        height: 63px;
-        position: relative;
-        border: 1px solid $border-base;
-        border-radius: 0px 22px 0px 0px;
-        box-shadow: $icon-shadow;
-    }
-
-    &__item-icon {
-        @include center-item;
-    }
-
     &__item-text {
         width: calc(100% - 80px);
     }

diff --git a/_sass/core/_core.scss b/_sass/core/_core.scss
@@ -22,7 +22,7 @@ html {
         top: 50%;
         left: 50%;
         transform: translate(-50%, -50%);
-        height: 85%;
+        height: 105%;
         position: absolute;
         background: $bg-gradient-1;
         background: -moz-radial-gradient(center, ellipse cover, $bg-gradient-2 0%, $bg-gradient-1 59%, $bg-gradient-1 100%);

diff --git a/_sass/core/typography/_mixins.scss b/_sass/core/typography/_mixins.scss
@@ -34,5 +34,10 @@
             line-height: $title-small-l-line-height;
             font-weight: $title-small-l-font-weight;
         }
+    } @else if $type == 'alternative' {
+        font-size: $title-alternative-font-size;
+        line-height: $title-alternative-line-height;
+        font-weight: $title-alternative-font-weight;
+        letter-spacing: $title-alternative-letter-spacing;
     }
 }
diff --git a/_sass/core/typography/_typography.scss b/_sass/core/typography/_typography.scss
@@ -7,8 +7,16 @@ body {
 .title {
     @include title();
 
+    &-small {
+        @include title('small');
+    }
+
     &-big {
-        @include title(big);
+        @include title('big');
+    }
+
+    &-alternative {
+        @include title('alternative');
     }
 }
 

diff --git a/_sass/core/typography/_vars.scss b/_sass/core/typography/_vars.scss
@@ -23,4 +23,10 @@ $title-small-l-font-weight:                         600; // semi-bold
 $title-small-s-font-size:                           $title-small-l-font-size;
 $title-small-s-line-height:                         $title-small-l-line-height;
 $title-small-s-font-weight:                         $title-small-l-font-weight;
-$title-small-letter-spacing:                        -0.44px;
+$title-small-letter-spacing:                        -0.44px;
+
+// alternative title
+$title-alternative-font-size:                       1.25rem;
+$title-alternative-line-height:                     1.27;
+$title-alternative-font-weight:                     700;    // bold
+$title-alternative-letter-spacing:                  1px;