Skip to content

Commit 52d929d

Browse files
ioweb-grioweb-gr
committed
Merge remote-tracking branch 'upstream/master'
2 parents 421f256 + 1a6d47c commit 52d929d

File tree

70 files changed

+1352
-244
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1352
-244
lines changed

‎_data/partners/agency.json

+47-14
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,79 @@
11
[
22
{
3-
"name": "Webkul Software",
4-
"url": "https://webkul.com",
5-
"contributions": [
6-
"Bug Reports",
7-
"Modules Creator",
8-
"Documentation"
9-
]
3+
"name": "Webkul Software",
4+
"url": "https://webkul.com",
5+
"img_src": "/assets/images/agencies/webkul-software-logo.png",
6+
"classes": "webkul-software",
7+
"contributions": [
8+
"Bug Reports",
9+
"Modules Creator",
10+
"Documentation"
11+
]
12+
},
13+
{
14+
"name": "MageBinary",
15+
"url": "https://www.magebinary.com",
16+
"img_src": "/assets/images/agencies/magebinary-logo.jpg",
17+
"classes": "magebinary"
1018
},
1119
{
1220
"name": "Edmonds Commerce",
1321
"url": "https://www.edmondscommerce.co.uk",
14-
"contributions": []
22+
"img_src": "/assets/images/agencies/edmonds-commerce-logo.png",
23+
"classes": "edmonds-commerce"
1524
},
1625
{
1726
"name": "Splendid Internet GmbH",
1827
"url": "https://www.splendid-internet.de/",
19-
"contributions": []
28+
"img_src": "/assets/images/agencies/splendid-logo.jpg",
29+
"classes": "splendid"
2030
},
2131
{
2232
"name": "The Ecommerce Workroom",
2333
"url": "https://ecommerceworkroom.co.uk",
24-
"contributions": []
34+
"img_src": "/assets/images/agencies/the-ecommerce-workroom-logo.jpg",
35+
"classes": "ecommerce-workroom"
2536
},
2637
{
2738
"name": "CopeX GmbH",
2839
"url": "https://copex.io",
29-
"contributions": []
40+
"img_src": "/assets/images/agencies/copex-logo.png",
41+
"classes": "copex"
3042
},
3143
{
3244
"name": "Burgess Commerce",
3345
"url": "https://BurgessCommerce.com",
34-
"contributions": []
46+
"img_src": "/assets/images/agencies/burgesscommerce-logo.png",
47+
"classes": "burgesscommerce"
3548
},
3649
{
3750
"name": "BroSolutions",
3851
"url": "https://www.brosolutions.net/",
39-
"contributions": []
52+
"img_src": "/assets/images/agencies/brosolutions-logo.png",
53+
"classes": "brosolutions"
4054
},
4155
{
4256
"name": "Sansec BV",
4357
"url": "https://sansec.io/?openmage",
44-
"contributions": []
58+
"img_src": "/assets/images/agencies/sansec-logo.png",
59+
"classes": "sansec"
60+
},
61+
{
62+
"name": "AlterWeb",
63+
"url": "https://www.alterweb.nl/openmage",
64+
"img_src": "/assets/images/agencies/alterweb-logo.png",
65+
"classes": "alterweb"
66+
},
67+
{
68+
"name": "Smartebusiness",
69+
"url": "https://www.smartebusiness.co.uk",
70+
"img_src": "/assets/images/agencies/smartebusiness-logo.png",
71+
"classes": "smartebusiness"
72+
},
73+
{
74+
"name": "ITPDX",
75+
"url": "https://www.itpdx.com",
76+
"img_src": "/assets/images/agencies/itpdx-logo.png",
77+
"classes": "itpdx"
4578
}
4679
]

‎_data/partners/module_vendor.json

+44-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,58 @@
11
[
2+
{
3+
"name": "XTENTO",
4+
"url": "https://www.xtento.com",
5+
"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.",
6+
"img_src": "/assets/images/module-vendors/xtento-logo.png",
7+
"classes": "xtento"
8+
},
29
{
310
"name": "RedChamps",
411
"url": "https://redchamps.com",
5-
"description": "We develop unique & must have Magento 1 and Magento 2 extensions."
12+
"description": "We develop unique & must have Magento 1 and Magento 2 extensions.",
13+
"img_src": "/assets/images/module-vendors/redchamps-logo.png",
14+
"classes": "redchamps"
615
},
716
{
817
"name": "Meetanshi",
918
"url": "https://meetanshi.com",
10-
"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!"
19+
"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!",
20+
"img_src": "/assets/images/module-vendors/meetanshi-logo.jpg",
21+
"classes": "meetanshi"
22+
},
23+
{
24+
"name": "Firebear Studio",
25+
"url": "https://firebearstudio.com",
26+
"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.",
27+
"img_src": "/assets/images/module-vendors/firebear-studio-logo.png",
28+
"classes": "firebear-studio"
1129
},
1230
{
1331
"name": "ModuleBazaar",
1432
"url": "https://www.modulebazaar.com/",
15-
"description": "Module Bazaar (MB) is an online marketplace for buying & selling extensions, themes and more for Magento and other eCommerce platforms."
33+
"description": "Module Bazaar (MB) is an online marketplace for buying & selling extensions, themes and more for Magento and other eCommerce platforms.",
34+
"img_src": "/assets/images/module-vendors/module-bazaar-logo.jpg",
35+
"classes": "module-bazaar"
36+
},
37+
{
38+
"name": "OneStepCheckout",
39+
"url": "https://www.onestepcheckout.com/magento-1/",
40+
"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.",
41+
"img_src": "/assets/images/module-vendors/onestepcheckout-logo.png",
42+
"classes": "onestepcheckout"
43+
},
44+
{
45+
"name": "ParadoxLabs",
46+
"url": "https://www.paradoxlabs.com/",
47+
"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.",
48+
"img_src": "/assets/images/module-vendors/paradoxlabs-logo.jpg",
49+
"classes": "paradoxlabs"
50+
},
51+
{
52+
"name": "Blackfire.io",
53+
"url": "https://blackfire.io/",
54+
"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.",
55+
"img_src": "/assets/images/module-vendors/blackfire-logo.png",
56+
"classes": "blackfire"
1657
}
1758
]

‎_data/partners/payment_processors.json

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[
2+
{
3+
"name": "Heartland Payment Systems",
4+
"url": "https://www.heartlandpaymentsystems.com/",
5+
"url_text": "heartlandpaymentsystems.com",
6+
"compatibilities": [
7+
"SAQ A",
8+
"SAQ A-EP"
9+
],
10+
"extension_url": "https://github.com/hps/heartland-magento-extension",
11+
"extension_text": "heartland-magento-extension",
12+
"img_src": "/assets/images/payment-processors/heartland-logo.svg",
13+
"classes": "heartland"
14+
}
15+
]

‎_data/versions.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"composer": {
3-
"latestStableBranch": "19.4.3"
3+
"latestStableBranch": "19.4.5"
44
}
55
}

‎_layouts/page-redesign.html

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
layout: default
3+
---
4+
<div class="page-intro bg-dark-gradient">
5+
<div class="container">
6+
<div class="row">
7+
<div class="col-lg-10 offset-lg-1">
8+
<div class="page-intro__title-wrapper">
9+
<h1 class="page-intro__title">
10+
{% if page.title %}<b>{{ page.title }}</b>{% endif %}{% if page.title_thin %} {{ page.title_thin }}{% endif %}
11+
</h1>
12+
{% if page.author %}
13+
<div class="page-intro__author">
14+
{{ page.date | date_to_string }} - {{ page.author }}
15+
</div>
16+
{% endif %}
17+
</div>
18+
</div>
19+
</div>
20+
</div>
21+
</div>
22+
23+
24+
{{content}}

‎_layouts/partner-redesign.html

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
layout: default
3+
---
4+
5+
<div class="page-intro bg-dark-gradient">
6+
<div class="container">
7+
<div class="row">
8+
<div class="col-lg-10 offset-lg-1">
9+
<div class="page-intro__title-wrapper">
10+
<h1 class="page-intro__title">
11+
{% if page.title %}<b>{{ page.title }}</b>{% endif %}{% if page.title_thin %} {{ page.title_thin }}{% endif %}
12+
</h1>
13+
</div>
14+
</div>
15+
</div>
16+
</div>
17+
</div>
18+
19+
{{content}}

‎_posts/2019-01-20-after-m1-eol.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ title: Plan for the time after Magento 1 eol
44
category: Community
55
thumbnail: /assets/images/blog/plan.png
66
author: flyingmana
7+
permalink: /:year/:month/:day/:title:output_ext
78
---
89

910
<img src="/images/OMlogo_2_1.png" style="float:left;max-width:30%;background-color: white;border-radius: 10%; margin-right: 20px;"/>

‎_posts/2019-08-18-new-home-magento-connect-modules.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ title: A new Home for Magento Connect Modules
44
category: Patches & addons
55
thumbnail: /assets/images/blog/modules.png
66
author: flyingmana
7+
permalink: /:year/:month/:day/:title:output_ext
78
---
89

910
One essential part of the Magento Ecosystem are the Marketplace and the big number of Modules

‎_posts/2019-12-09-release-19-4-0.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ title: New Release 19.4.0
44
category: Updates
55
thumbnail: /assets/images/blog/release.png
66
author: flyingmana
7+
permalink: /:year/:month/:day/:title:output_ext
78
---
89

910
<img src="/images//posts/openmage_contributions_logo_2019_11.png" style="max-width:90%;"/>

‎_sass/card-icon/_card-icon.scss

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
.card-icon {
2+
display: inline-block;
3+
width: 68px;
4+
height: 68px;
5+
position: relative;
6+
border: 1px solid $border-base;
7+
border-radius: 0px 22px 0px 0px;
8+
box-shadow: $icon-shadow;
9+
10+
&--link {
11+
width: 45px;
12+
height: 45px;
13+
border-radius: 0px 12px 0px 0px;
14+
box-shadow: none;
15+
background-color: $border-light-1;
16+
border-color: $border-light-1;
17+
}
18+
19+
&--small {
20+
width: 63px;
21+
height: 63px;
22+
}
23+
24+
&--big {
25+
width: 88px;
26+
height: 88px;
27+
}
28+
29+
&__img {
30+
@include center-item;
31+
}
32+
}

‎_sass/card/_card.scss

+16-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
}
44

55
.card-title {
6+
@include title('alternative');
67
color: $black;
7-
font-size: 1.25rem;
8-
line-height: 1.5;
98
}
109

1110
.card-text {
@@ -16,6 +15,21 @@
1615
background: none;
1716
}
1817

18+
.card-intro {
19+
display: flex;
20+
align-items: center;
21+
margin-bottom: 1rem;
22+
}
23+
24+
.card-intro-title {
25+
@include title('alternative');
26+
color: $text-dark;
27+
text-align: left;
28+
margin-bottom: 0;
29+
margin-left: 1.5rem;
30+
margin-top: 1px;
31+
}
32+
1933
.card-footer {
2034
padding: 0 $card-spacer-x;
2135
background: none;

‎_sass/contributor/_involvement.scss

-13
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,6 @@
2727
margin-bottom: 2rem;
2828
}
2929

30-
&__item-wrapper {
31-
width: 63px;
32-
height: 63px;
33-
position: relative;
34-
border: 1px solid $border-base;
35-
border-radius: 0px 22px 0px 0px;
36-
box-shadow: $icon-shadow;
37-
}
38-
39-
&__item-icon {
40-
@include center-item;
41-
}
42-
4330
&__item-text {
4431
width: calc(100% - 80px);
4532
}

‎_sass/core/_core.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ html {
2222
top: 50%;
2323
left: 50%;
2424
transform: translate(-50%, -50%);
25-
height: 85%;
25+
height: 105%;
2626
position: absolute;
2727
background: $bg-gradient-1;
2828
background: -moz-radial-gradient(center, ellipse cover, $bg-gradient-2 0%, $bg-gradient-1 59%, $bg-gradient-1 100%);

‎_sass/core/typography/_mixins.scss

+5
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,10 @@
3434
line-height: $title-small-l-line-height;
3535
font-weight: $title-small-l-font-weight;
3636
}
37+
} @else if $type == 'alternative' {
38+
font-size: $title-alternative-font-size;
39+
line-height: $title-alternative-line-height;
40+
font-weight: $title-alternative-font-weight;
41+
letter-spacing: $title-alternative-letter-spacing;
3742
}
3843
}

‎_sass/core/typography/_typography.scss

+9-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,16 @@ body {
77
.title {
88
@include title();
99

10+
&-small {
11+
@include title('small');
12+
}
13+
1014
&-big {
11-
@include title(big);
15+
@include title('big');
16+
}
17+
18+
&-alternative {
19+
@include title('alternative');
1220
}
1321
}
1422

‎_sass/core/typography/_vars.scss

+7-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,10 @@ $title-small-l-font-weight: 600; // semi-bold
2323
$title-small-s-font-size: $title-small-l-font-size;
2424
$title-small-s-line-height: $title-small-l-line-height;
2525
$title-small-s-font-weight: $title-small-l-font-weight;
26-
$title-small-letter-spacing: -0.44px;
26+
$title-small-letter-spacing: -0.44px;
27+
28+
// alternative title
29+
$title-alternative-font-size: 1.25rem;
30+
$title-alternative-line-height: 1.27;
31+
$title-alternative-font-weight: 700; // bold
32+
$title-alternative-letter-spacing: 1px;

0 commit comments

Comments
 (0)