diff --git a/LICENSE_AFL.txt b/LICENSE_AFL.txt index 87943b95d4..f39d641b18 100644 --- a/LICENSE_AFL.txt +++ b/LICENSE_AFL.txt @@ -45,4 +45,4 @@ Licensed under the Academic Free License version 3.0 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. - 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/BundleSampleData/LICENSE_AFL.txt b/app/code/Magento/BundleSampleData/LICENSE_AFL.txt index 87943b95d4..f39d641b18 100644 --- a/app/code/Magento/BundleSampleData/LICENSE_AFL.txt +++ b/app/code/Magento/BundleSampleData/LICENSE_AFL.txt @@ -45,4 +45,4 @@ Licensed under the Academic Free License version 3.0 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. - 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/BundleSampleData/Model/Product.php b/app/code/Magento/BundleSampleData/Model/Product.php index 98fccba762..f80d98f15d 100644 --- a/app/code/Magento/BundleSampleData/Model/Product.php +++ b/app/code/Magento/BundleSampleData/Model/Product.php @@ -1,6 +1,6 @@ diff --git a/app/code/Magento/BundleSampleData/registration.php b/app/code/Magento/BundleSampleData/registration.php index 97732702f3..3a43dc304b 100644 --- a/app/code/Magento/BundleSampleData/registration.php +++ b/app/code/Magento/BundleSampleData/registration.php @@ -1,6 +1,6 @@ " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/CatalogRuleSampleData/Model/Rule.php b/app/code/Magento/CatalogRuleSampleData/Model/Rule.php index a7ae6fb5e7..d87999ffb2 100644 --- a/app/code/Magento/CatalogRuleSampleData/Model/Rule.php +++ b/app/code/Magento/CatalogRuleSampleData/Model/Rule.php @@ -1,6 +1,6 @@ rule->install(['Magento_CatalogRuleSampleData::fixtures/catalog_rules.csv']); } -} \ No newline at end of file +} diff --git a/app/code/Magento/CatalogRuleSampleData/composer.json b/app/code/Magento/CatalogRuleSampleData/composer.json index cff7d57a28..f0c0a466b7 100644 --- a/app/code/Magento/CatalogRuleSampleData/composer.json +++ b/app/code/Magento/CatalogRuleSampleData/composer.json @@ -7,13 +7,15 @@ "magento/module-sample-data": "100.0.*" }, "type": "magento2-module", - "version": "100.0.3", + "version": "100.0.6", "license": [ "OSL-3.0", "AFL-3.0" ], "autoload": { - "files": [ "registration.php" ], + "files": [ + "registration.php" + ], "psr-4": { "Magento\\CatalogRuleSampleData\\": "" } diff --git a/app/code/Magento/CatalogRuleSampleData/etc/module.xml b/app/code/Magento/CatalogRuleSampleData/etc/module.xml index 36ff3dc02d..e38a4ff06d 100644 --- a/app/code/Magento/CatalogRuleSampleData/etc/module.xml +++ b/app/code/Magento/CatalogRuleSampleData/etc/module.xml @@ -1,7 +1,7 @@ diff --git a/app/code/Magento/CatalogRuleSampleData/registration.php b/app/code/Magento/CatalogRuleSampleData/registration.php index 88cb8cf041..f744ede693 100644 --- a/app/code/Magento/CatalogRuleSampleData/registration.php +++ b/app/code/Magento/CatalogRuleSampleData/registration.php @@ -1,6 +1,6 @@ " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/CatalogSampleData/Model/Attribute.php b/app/code/Magento/CatalogSampleData/Model/Attribute.php index 3bde6b392e..97352a4dab 100644 --- a/app/code/Magento/CatalogSampleData/Model/Attribute.php +++ b/app/code/Magento/CatalogSampleData/Model/Attribute.php @@ -1,6 +1,6 @@ diff --git a/app/code/Magento/CatalogSampleData/etc/module.xml b/app/code/Magento/CatalogSampleData/etc/module.xml index 8b8d384a79..93fefec6ae 100644 --- a/app/code/Magento/CatalogSampleData/etc/module.xml +++ b/app/code/Magento/CatalogSampleData/etc/module.xml @@ -1,7 +1,7 @@ diff --git a/app/code/Magento/CatalogSampleData/registration.php b/app/code/Magento/CatalogSampleData/registration.php index 59c475bcdb..3c1254fe5a 100644 --- a/app/code/Magento/CatalogSampleData/registration.php +++ b/app/code/Magento/CatalogSampleData/registration.php @@ -1,6 +1,6 @@ " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/CmsSampleData/Model/Block.php b/app/code/Magento/CmsSampleData/Model/Block.php index 1ac4e37bb8..fe10629e67 100644 --- a/app/code/Magento/CmsSampleData/Model/Block.php +++ b/app/code/Magento/CmsSampleData/Model/Block.php @@ -1,6 +1,6 @@ diff --git a/app/code/Magento/CmsSampleData/fixtures/styles.css b/app/code/Magento/CmsSampleData/fixtures/styles.css index 14e42762f5..c48d773f49 100644 --- a/app/code/Magento/CmsSampleData/fixtures/styles.css +++ b/app/code/Magento/CmsSampleData/fixtures/styles.css @@ -1,5 +1,5 @@ /** - * Copyright © 2015 Magento. All rights reserved. + * Copyright © 2013-2017 Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ .cms-index-index .page-title{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.widget .block-promo img{max-width:none}.block-promo{box-sizing:border-box;overflow:hidden;position:relative;display:block;width:100%;color:#333 !important}.block-promo:hover{text-decoration:none}.block-promo .content{display:block;box-sizing:border-box;position:absolute;z-index:1;overflow:hidden;padding:25px 35px 35px}.block-promo .title{display:block;font-weight:300;font-size:3.2rem;line-height:1.2;margin-bottom:15px}.block-promo .info{display:block;font-weight:300;font-size:2.2rem;margin-bottom:20px}.block-promo .more{font-size:1.6rem}.block-promo .icon.more{display:inline-block;text-decoration:none}.block-promo .icon.more:after{font-family:'luma-icons';content:'\e608';font-size:12px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:normal;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center;margin:0 0 0 5px}.block-promo .button.more{font-size:1.8rem;background-image:none;background:#1979c3;padding:7px 15px;color:#fff;border:1px solid #1979c3;cursor:pointer;display:inline-block;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;box-sizing:border-box;vertical-align:middle;border-radius:3px;text-decoration:none;padding:10px 15px}.block-promo .button.more:focus,.block-promo .button.more:active{background:#006bb4;border:1px solid #006bb4;color:#fff}.block-promo .button.more:hover{background:#006bb4;border:1px solid #006bb4;color:#fff}.block-promo .button.more.disabled,.block-promo .button.more[disabled],fieldset[disabled] .block-promo .button.more{cursor:default;pointer-events:none;opacity:.5}.block-promo .title+.button{margin-top:10px}.block-promo sup{top:-0.2em}.block-promo-2columns .content{padding:20px 25px}.womens-main .content,.womens-pants .content,.training-main .content,.training-erin .content,.sale-main .content,.sale-women .content,.mens-main .content,.mens-pants .content,.gear-main .content,.gear-equipment .content,.new-main .content,.new-eco .content,.home-main .content,.home-performance .content,.home-eco .content,.collection-eco .content,.collection-performance .content{background-color:rgba(255,255,255,0.9)}.sale-main,.mens-main,.gear-main,.womens-main{max-width:1080px}.sale-women,.sale-mens,.mens-pants,.womens-pants,.gear-fitnes,.gear-equipment,.new-performance,.new-eco{max-width:580px}.training-main,.training-erin,.collection-eco,.collection-performance,.home-main{max-width:1280px}.home-pants .content{top:0;left:0;width:80%}.home-pants .title{display:block;font-weight:600;font-family:Halvetica Neue,Helvetica,Arial,sans-serif;white-space:nowrap;margin-bottom:0}.home-t-shirts{background:#ffdd16}.home-erin{height:373px}.home-erin .content{top:0;right:0;width:60%}.home-performance{height:664px}.home-performance .content{top:25px;right:25px;left:25px}.home-eco{height:274px}.new-performance .icon.more{white-space:nowrap}.block-promo-hp .bg-white,.block-promo-hp .home-erin .content{padding:20px}.womens-erin{background:#f4f4f4}.womens-erin .content{padding:20px 35px}.training-main{height:372px}.training-main .title{margin-bottom:0;line-height:1.4}.training-main .title span{font-weight:600}.training-erin{height:214px}.training-erin .content{padding:15px;text-align:center}.training-erin .info{margin-bottom:0}.training-on-demand,.training-videos{color:#fff !important}.training-on-demand .content,.training-videos .content{position:static;text-align:center}.training-on-demand .icon.calendar,.training-videos .icon.calendar,.training-on-demand .icon.download,.training-videos .icon.download{margin-top:-10px;display:block;text-decoration:none}.training-on-demand .icon.calendar>span,.training-videos .icon.calendar>span,.training-on-demand .icon.download>span,.training-videos .icon.download>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.training-on-demand .icon.calendar:before,.training-videos .icon.calendar:before,.training-on-demand .icon.download:before,.training-videos .icon.download:before{font-family:'luma-icons';font-size:32px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:normal;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.training-on-demand .icon.calendar:before,.training-videos .icon.calendar:before{content:'\e612'}.training-on-demand .icon.download:before,.training-videos .icon.download:before{content:'\e626'}.training-on-demand .icon.more,.training-videos .icon.more{position:absolute;left:0;right:0;bottom:25px}.training-on-demand .info,.training-videos .info{font-size:16px}.training-on-demand{background:#00ade2}.training-videos{background:#5a5e62}.sale-women,.sale-mens{height:372px}.sale-mens .content{top:0;right:0;width:60%}.sale-20-off .content,.sale-free-shipping .content,.sale-womens-t-shirts .content{padding:15px 20px}.sale-20-off{background:#f4f4f4}.sale-20-off .title{font-size:4rem;font-weight:700;white-space:nowrap}.sale-20-off img{position:absolute;z-index:0;bottom:0;right:0}.sale-20-off .content{width:75%;position:relative}.sale-free-shipping{background:#71b54e;color:#fff !important}.sale-free-shipping .content{position:static}.sale-free-shipping img{display:block;margin:0 auto 10px;max-width:100% !important}.sale-womens-t-shirts{background:#fedd16}.sale-womens-t-shirts .content{position:static}.sale-womens-t-shirts img{max-width:95% !important}.mens-main .content{width:45%}.womens-main,.home-main,.mens-main,.new-main,.sale-main,.gear-main{height:450px}.womens-t-shirts,.mens-t-shirts{background:#ffdd17}.womens-t-shirts img,.mens-t-shirts img{max-width:100% !important}.womens-t-shirts .content,.mens-t-shirts .content{position:static}.womens-pants,.mens-pants,.gear-fitnes,.gear-equipment,.new-performance,.new-eco{height:372px}.womens-pants .info span,.mens-pants .info span{display:block;font-size:4.4rem;font-family:Halvetica Neue,Helvetica,Arial,sans-serif;line-height:1.2;font-weight:600;white-space:nowrap}.womens-category-pants,.womens-category-tanks,.womens-category-shorts,.mens-category-tees,.mens-category-hoodies,.mens-category-shorts,.gear-category-bags,.gear-category-equipment,.gear-category-watches{background:#f4f4f4;min-height:170px}.womens-category-pants img,.womens-category-tanks img,.womens-category-shorts img,.mens-category-tees img,.mens-category-hoodies img,.mens-category-shorts img,.gear-category-bags img,.gear-category-equipment img,.gear-category-watches img{max-width:100% !important;position:absolute;z-index:0;top:0;right:0;left:60%}.womens-category-pants .content,.womens-category-tanks .content,.womens-category-shorts .content,.mens-category-tees .content,.mens-category-hoodies .content,.mens-category-shorts .content,.gear-category-bags .content,.gear-category-equipment .content,.gear-category-watches .content{padding:20px 0 50px 20px !important;position:static;width:60%;z-index:1}.womens-category-pants .title,.womens-category-tanks .title,.womens-category-shorts .title,.mens-category-tees .title,.mens-category-hoodies .title,.mens-category-shorts .title,.gear-category-bags .title,.gear-category-equipment .title,.gear-category-watches .title,.womens-category-pants .info,.womens-category-tanks .info,.womens-category-shorts .info,.mens-category-tees .info,.mens-category-hoodies .info,.mens-category-shorts .info,.gear-category-bags .info,.gear-category-equipment .info,.gear-category-watches .info{font-size:1.8rem}.womens-category-pants .title,.womens-category-tanks .title,.womens-category-shorts .title,.mens-category-tees .title,.mens-category-hoodies .title,.mens-category-shorts .title,.gear-category-bags .title,.gear-category-equipment .title,.gear-category-watches .title{font-weight:400;margin-bottom:5px}.womens-category-pants .more,.womens-category-tanks .more,.womens-category-shorts .more,.mens-category-tees .more,.mens-category-hoodies .more,.mens-category-shorts .more,.gear-category-bags .more,.gear-category-equipment .more,.gear-category-watches .more{position:absolute;z-index:1;bottom:20px}.gear-fitnes .content,.new-performance .content{right:0;top:0;width:65%}.collection-eco,.collection-performance{height:200px}.collection-eco .content,.collection-performance .content{padding:15px;text-align:center}.collection-eco .info,.collection-performance .info{margin-bottom:0}.collection-erin{background:#f4f4f4}.collection-erin .content{padding:20px 35px}.content-heading{text-align:center;margin:10px 0 25px}.content-heading .title{margin:0 0 5px}.content-heading .info{margin-bottom:0}.categories-menu .title{text-transform:uppercase;margin-bottom:10px;display:block}.categories-menu a:link,.categories-menu a:visited,.categories-menu a:hover,.categories-menu a:active{color:#333}.categories-menu .items{margin-bottom:40px}.categories-menu .items:last-child{margin-bottom:0}.cms-content-important{display:block;background:#f5f5f5}.cms-content-important h2{margin-top:0}.cms-content table{border:none}.cms-content table>thead>tr>th,.cms-content table>tbody>tr>th,.cms-content table>tfoot>tr>th,.cms-content table>thead>tr>td,.cms-content table>tbody>tr>td,.cms-content table>tfoot>tr>td{border:none}.cms-content table>thead>tr>th,.cms-content table>thead>tr>td{border-bottom:1px solid #d1d1d1}.cms-content table>tbody>tr:nth-child(even)>td,.cms-content table>tbody>tr:nth-child(even)>th{background:#f7f7f7}.cms-content table th{font-weight:400}.cms-content table td{font-weight:600}.cms-content .block .block-title{margin-bottom:15px}.cms-content .block .block-title>strong{display:none}.cms-content .block .box-title{display:inline-block;margin:0 0 15px}.cms-content .block .box-title>span{font-size:1.8rem;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem;font-weight:300}.cms-content .block .block-content p:last-child{margin-bottom:0}@media only screen and (max-width:399px){.womens-pants img{width:250%;float:right;margin:-70px -140px 0 0}.mens-main img{margin-left:-180px}.training-main img,.gear-main img,.womens-main img{margin-left:-210px}.home-main img{margin-left:-310px}.sale-main img,.mens-pants img,.home-eco img{margin-left:-150px}.sale-mens img,.gear-fitnes img,.new-performance img{margin-left:-60px}.new-main img,.sale-women img,.training-erin img,.gear-equipment img{margin-left:-120px}.new-eco img{margin-left:-80px}.home-pants,.home-performance{height:580px}.home-pants img,.home-performance img{margin-left:-50px}}@media only screen and (max-width:767px){.blocks-promo{margin-left:-15px;margin-right:-15px}.block-promo{margin-bottom:8px}.block-promo .title{font-size:2.2rem}.block-promo .info{font-size:1.6rem;margin-bottom:10px}.block-promo .more{font-size:1.4rem}.block-promo .icon.more:after{font-size:1rem}.block-promo .button.more{font-size:1.2rem}.block-promo .content{padding:15px 20px 20px}.block-promo .button.more{padding:8px 12px}.home-pants{max-width:417px}.home-erin{max-width:426px}.home-performance{max-width:415px}.home-eco{max-width:858px}.home-pants,.home-performance{height:580px}.womens-main .content,.mens-main .content,.gear-main .content,.new-main .content,.home-main .content,.training-main .content,.sale-main .content{top:20px;right:0;width:65%}.training-main .title{font-size:2rem}.womens-erin .content,.collection-erin .content{position:static}.womens-erin img,.collection-erin img{display:block;margin:0 auto;max-width:75% !important}.sale-women .content{width:60%;bottom:20px;left:0}.sale-main .content{top:auto;bottom:20px}.sale-20-off{min-height:185px}.sale-20-off .title{font-size:4rem}.womens-category-pants .title,.womens-category-tanks .title,.womens-category-shorts .title,.mens-category-tees .title,.mens-category-hoodies .title,.mens-category-shorts .title,.gear-category-bags .title,.gear-category-equipment .title,.gear-category-watches .title{font-size:1.6rem}.womens-category-pants .info,.womens-category-tanks .info,.womens-category-shorts .info,.mens-category-tees .info,.mens-category-hoodies .info,.mens-category-shorts .info,.gear-category-bags .info,.gear-category-equipment .info,.gear-category-watches .info{font-size:1.4rem}.womens-pants .info span,.mens-pants .info span{font-size:4rem}.womens-pants .content,.mens-pants .content{max-width:220px;bottom:20px}.home-eco .content{width:65%;top:20px;right:0}.gear-fitnes .content,.new-performance .content,.home-erin .content{padding-top:30px}.gear-equipment .content,.new-eco .content{left:0;bottom:20px;max-width:220px}.training-erin .content{right:10px;bottom:10px;left:10px}.training-erin .title{margin-bottom:10px;font-size:1.8rem}.training-erin .info{font-size:1.2rem;margin-bottom:0}.training-on-demand .content,.training-videos .content{padding-top:25px;padding-bottom:45px}.home-pants img{position:absolute;z-index:0;bottom:-10px}.home-pants .title{font-size:4rem}.home-performance img{position:absolute;z-index:0;top:-20px}.womens-main .content,.training-main .content,.gear-main .content{top:auto;bottom:20px}.home-t-shirts .image{display:block;padding:20px 20px 0}.home-t-shirts img{max-width:100% !important}.home-t-shirts .content{position:static}.collection-eco .content,.collection-performance .content{right:10px;bottom:10px;left:10px}.collection-eco .title,.collection-performance .title{margin-bottom:10px;font-size:1.8rem}.collection-eco .info,.collection-performance .info{font-size:1.2rem}.collection-erin .title{font-size:1.8rem}.collection-erin .info{font-size:1.2rem}.content-heading .title{font-size:3rem}.content-heading .info{font-size:1.4rem}.cms-content-important{padding:15px;margin:0 -15px 15px}.cms-content table{margin:10px 0 0}.cms-content table thead th{font-size:1.1rem}.cms-content ul li{margin-bottom:5px}.cms-content .block .box{margin-bottom:30px}}@media all and (min-width:640px),print{.block-promo{margin-bottom:16px}.block-promo-wrapper:before,.block-promo-wrapper:after{content:"";display:table}.block-promo-wrapper:after{clear:both}.block-promo-wrapper .block-promo{float:left;border-right:16px solid #fff}.block-promo-2columns .block-promo{width:50%}.block-promo-3columns .block-promo{width:33.3%}.block-promo-2columns .block-promo:nth-child(2n),.block-promo-3columns .block-promo:nth-child(3n){border-right:0}}@media all and (min-width:768px),print{.block-promo-hp{margin:0 -8px}.block-promo-hp .block-promo{border-left:8px solid #fff;border-right:8px solid #fff}.block-promo-wrapper .home-performance{float:right}.home-pants,.home-erin,.home-performance{width:33.3%}.home-t-shirts,.home-eco{width:66.7%}.womens-main .content,.mens-main .content,.gear-main .content,.new-main .content,.home-main .content,.training-main .content,.sale-main .content{top:40px;right:40px;width:40%}.womens-t-shirts,.mens-t-shirts{height:372px}.womens-pants .content,.mens-pants .content{width:47%;left:20px;top:20px}.womens-erin,.home-t-shirts,.collection-erin{display:table}.womens-erin .content,.home-t-shirts .content,.collection-erin .content,.womens-erin .image,.home-t-shirts .image,.collection-erin .image{display:table-cell}.womens-erin .content,.home-t-shirts .content,.collection-erin .content{position:static}.womens-erin .image,.home-t-shirts .image,.collection-erin .image{vertical-align:bottom}.womens-erin img,.home-t-shirts img,.collection-erin img{float:right}.home-t-shirts{height:276px}.home-t-shirts .content{width:40%}.home-t-shirts .image{width:60%;vertical-align:middle;text-align:center;padding-left:10px}.home-t-shirts img{max-width:100% !important}.womens-category-pants,.womens-category-tanks,.womens-category-shorts,.mens-category-tees,.mens-category-hoodies,.mens-category-shorts,.gear-category-bags,.gear-category-equipment,.gear-category-watches{height:210px}.sale-women .content{width:50%;left:20px;bottom:20px}.sale-20-off .title{font-size:4.4rem}.sale-20-off .info{font-size:1.8rem}.sale-20-off,.sale-free-shipping,.sale-womens-t-shirts{height:205px}.sale-free-shipping .title{font-size:2.5rem}.sale-free-shipping .info{font-size:1.6rem}.sale-womens-t-shirts .title{font-size:2rem;margin-bottom:5px}.sale-womens-t-shirts .info{font-size:1.6rem;margin-bottom:5px}.home-eco .content{width:70%;top:45px;right:45px}.gear-equipment .content,.new-eco .content{left:20px;bottom:20px;width:60%}.new-eco .content{width:70%}.training-erin .content{width:73%;top:16px;bottom:16px;right:16px}.training-erin .info{font-size:1.6rem;display:block;padding:0 10%}.training-on-demand,.training-videos{height:208px}.home-pants{height:664px}.home-pants .title{font-size:44px !important;font-size:4.4rem !important;line-height:1.2}.collection-eco .content,.collection-performance .content{width:60%;top:16px;bottom:16px;left:50%;margin-left:-30%}.collection-eco .title,.collection-performance .title{font-size:4rem}.collection-eco .info,.collection-performance .info{font-size:2.2rem;display:block;padding:0 10%}.collection-erin{height:164px}.collection-erin .content{width:70%}.collection-erin .image{width:30%}.collection-erin .title{font-size:4rem}.collection-erin .info{font-size:2.2rem}.content-heading{position:relative}.content-heading:before{content:'';display:block;height:1px;width:100%;background:-moz-radial-gradient(center, ellipse cover, #fff 25%, #cecece 100%);background:-webkit-gradient(radial, center center, 0, center center, 100%, color-stop(25%, #fff), color-stop(100%, #cecece));background:-webkit-radial-gradient(center, ellipse cover, #fff 25%, #cecece 100%);background:-ms-radial-gradient(center, ellipse cover, #fff 25%, #cecece 100%);background:radial-gradient(ellipse at center, #fff 25%, #cecece 100%);position:absolute;top:50%;z-index:0}.content-heading .title,.content-heading .info{position:relative;z-index:1}.content-heading .title{font-size:3.8rem}.content-heading .info{font-size:1.8rem}.cms-content-important{font-size:2.2rem;font-weight:300;padding:20px;margin:0 0 35px -20px}.cms-content table{margin:40px 0 0}.cms-content ul li{margin-bottom:15px}.cms-content .block .block-content:before,.cms-content .block .block-content:after{content:"";display:table}.cms-content .block .block-content:after{clear:both}.cms-content .block .box{width:48%;margin-bottom:40px}.cms-content .block .box:nth-child(1){float:left;clear:left}.cms-content .block .box:nth-child(2){float:right}.cms-content .block .box:nth-child(2)+*{clear:both}.cms-content .block .box:nth-last-child(1),.cms-content .block .box:nth-last-child(2){margin-bottom:0}.privacy-policy-content{box-sizing:border-box;width:77.7%;float:right;padding-left:2%}.privacy-policy .block-collapsible-nav{box-sizing:border-box;width:22.3%;float:left}} diff --git a/app/code/Magento/CmsSampleData/registration.php b/app/code/Magento/CmsSampleData/registration.php index d8213f4abb..4f04370f83 100644 --- a/app/code/Magento/CmsSampleData/registration.php +++ b/app/code/Magento/CmsSampleData/registration.php @@ -1,6 +1,6 @@ " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/ConfigurableSampleData/Model/Product.php b/app/code/Magento/ConfigurableSampleData/Model/Product.php index 7cb08d716f..e0e0777779 100644 --- a/app/code/Magento/ConfigurableSampleData/Model/Product.php +++ b/app/code/Magento/ConfigurableSampleData/Model/Product.php @@ -1,6 +1,6 @@ diff --git a/app/code/Magento/ConfigurableSampleData/registration.php b/app/code/Magento/ConfigurableSampleData/registration.php index d0da0742ec..bd520559fa 100644 --- a/app/code/Magento/ConfigurableSampleData/registration.php +++ b/app/code/Magento/ConfigurableSampleData/registration.php @@ -1,6 +1,6 @@ " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/CustomerSampleData/Magento/Framework/Mail/Transport/MailPlugin.php b/app/code/Magento/CustomerSampleData/Magento/Framework/Mail/Transport/MailPlugin.php index c0b3b5b100..ee941d7e43 100644 --- a/app/code/Magento/CustomerSampleData/Magento/Framework/Mail/Transport/MailPlugin.php +++ b/app/code/Magento/CustomerSampleData/Magento/Framework/Mail/Transport/MailPlugin.php @@ -1,6 +1,6 @@ customerSetup->install(['Magento_CustomerSampleData::fixtures/customer_profile.csv']); } -} \ No newline at end of file +} diff --git a/app/code/Magento/CustomerSampleData/composer.json b/app/code/Magento/CustomerSampleData/composer.json index 2552fccd74..9a2577f60d 100644 --- a/app/code/Magento/CustomerSampleData/composer.json +++ b/app/code/Magento/CustomerSampleData/composer.json @@ -6,13 +6,15 @@ "magento/module-sample-data": "100.0.*" }, "type": "magento2-module", - "version": "100.0.3", + "version": "100.0.6", "license": [ "OSL-3.0", "AFL-3.0" ], "autoload": { - "files": [ "registration.php" ], + "files": [ + "registration.php" + ], "psr-4": { "Magento\\CustomerSampleData\\": "" } diff --git a/app/code/Magento/CustomerSampleData/etc/di.xml b/app/code/Magento/CustomerSampleData/etc/di.xml index 01704c3c08..b08ec96668 100644 --- a/app/code/Magento/CustomerSampleData/etc/di.xml +++ b/app/code/Magento/CustomerSampleData/etc/di.xml @@ -1,7 +1,7 @@ diff --git a/app/code/Magento/CustomerSampleData/etc/module.xml b/app/code/Magento/CustomerSampleData/etc/module.xml index 406d4e355c..64bbf41292 100644 --- a/app/code/Magento/CustomerSampleData/etc/module.xml +++ b/app/code/Magento/CustomerSampleData/etc/module.xml @@ -1,7 +1,7 @@ diff --git a/app/code/Magento/CustomerSampleData/registration.php b/app/code/Magento/CustomerSampleData/registration.php index 83cfd1e0d9..5aa9de9f8e 100644 --- a/app/code/Magento/CustomerSampleData/registration.php +++ b/app/code/Magento/CustomerSampleData/registration.php @@ -1,6 +1,6 @@ " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/DownloadableSampleData/Model/Product.php b/app/code/Magento/DownloadableSampleData/Model/Product.php index 9a5524a6e4..74ad305b74 100644 --- a/app/code/Magento/DownloadableSampleData/Model/Product.php +++ b/app/code/Magento/DownloadableSampleData/Model/Product.php @@ -1,6 +1,6 @@ diff --git a/app/code/Magento/DownloadableSampleData/registration.php b/app/code/Magento/DownloadableSampleData/registration.php index fc970ce0b5..7ec94e851c 100644 --- a/app/code/Magento/DownloadableSampleData/registration.php +++ b/app/code/Magento/DownloadableSampleData/registration.php @@ -1,6 +1,6 @@ " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/GroupedProductSampleData/Model/Product.php b/app/code/Magento/GroupedProductSampleData/Model/Product.php index ead55af267..8be712e128 100644 --- a/app/code/Magento/GroupedProductSampleData/Model/Product.php +++ b/app/code/Magento/GroupedProductSampleData/Model/Product.php @@ -1,6 +1,6 @@ diff --git a/app/code/Magento/GroupedProductSampleData/registration.php b/app/code/Magento/GroupedProductSampleData/registration.php index d989cba5b7..9676e1d0b9 100644 --- a/app/code/Magento/GroupedProductSampleData/registration.php +++ b/app/code/Magento/GroupedProductSampleData/registration.php @@ -1,6 +1,6 @@ " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/MsrpSampleData/Model/Msrp.php b/app/code/Magento/MsrpSampleData/Model/Msrp.php index d1b9b8228c..d084129c71 100644 --- a/app/code/Magento/MsrpSampleData/Model/Msrp.php +++ b/app/code/Magento/MsrpSampleData/Model/Msrp.php @@ -1,6 +1,6 @@ msrp->install(['Magento_MsrpSampleData::fixtures/products_msrp.csv']); } -} \ No newline at end of file +} diff --git a/app/code/Magento/MsrpSampleData/composer.json b/app/code/Magento/MsrpSampleData/composer.json index d01d32220e..9ae8717724 100644 --- a/app/code/Magento/MsrpSampleData/composer.json +++ b/app/code/Magento/MsrpSampleData/composer.json @@ -7,13 +7,15 @@ "magento/module-msrp": "100.0.*" }, "type": "magento2-module", - "version": "100.0.3", + "version": "100.0.6", "license": [ "OSL-3.0", "AFL-3.0" ], "autoload": { - "files": [ "registration.php" ], + "files": [ + "registration.php" + ], "psr-4": { "Magento\\MsrpSampleData\\": "" } diff --git a/app/code/Magento/MsrpSampleData/etc/module.xml b/app/code/Magento/MsrpSampleData/etc/module.xml index 215980f9ad..fe9aab617e 100644 --- a/app/code/Magento/MsrpSampleData/etc/module.xml +++ b/app/code/Magento/MsrpSampleData/etc/module.xml @@ -1,7 +1,7 @@ diff --git a/app/code/Magento/MsrpSampleData/registration.php b/app/code/Magento/MsrpSampleData/registration.php index 33245b2ef8..99e2aee911 100644 --- a/app/code/Magento/MsrpSampleData/registration.php +++ b/app/code/Magento/MsrpSampleData/registration.php @@ -1,6 +1,6 @@ " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/OfflineShippingSampleData/Model/Tablerate.php b/app/code/Magento/OfflineShippingSampleData/Model/Tablerate.php index 3b26e5303f..0e409f00e7 100644 --- a/app/code/Magento/OfflineShippingSampleData/Model/Tablerate.php +++ b/app/code/Magento/OfflineShippingSampleData/Model/Tablerate.php @@ -1,6 +1,6 @@ tablerate->install(['Magento_OfflineShippingSampleData::fixtures/tablerate.csv']); } -} \ No newline at end of file +} diff --git a/app/code/Magento/OfflineShippingSampleData/composer.json b/app/code/Magento/OfflineShippingSampleData/composer.json index cfc6950d3a..ff8d64380a 100644 --- a/app/code/Magento/OfflineShippingSampleData/composer.json +++ b/app/code/Magento/OfflineShippingSampleData/composer.json @@ -8,13 +8,15 @@ "magento/module-directory": "100.0.*" }, "type": "magento2-module", - "version": "100.0.3", + "version": "100.0.6", "license": [ "OSL-3.0", "AFL-3.0" ], "autoload": { - "files": [ "registration.php" ], + "files": [ + "registration.php" + ], "psr-4": { "Magento\\OfflineShippingSampleData\\": "" } diff --git a/app/code/Magento/OfflineShippingSampleData/etc/module.xml b/app/code/Magento/OfflineShippingSampleData/etc/module.xml index 713bdde8d8..76f4b68207 100644 --- a/app/code/Magento/OfflineShippingSampleData/etc/module.xml +++ b/app/code/Magento/OfflineShippingSampleData/etc/module.xml @@ -1,7 +1,7 @@ diff --git a/app/code/Magento/OfflineShippingSampleData/registration.php b/app/code/Magento/OfflineShippingSampleData/registration.php index ba61e08c44..a542fb6356 100644 --- a/app/code/Magento/OfflineShippingSampleData/registration.php +++ b/app/code/Magento/OfflineShippingSampleData/registration.php @@ -1,6 +1,6 @@ " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/ProductLinksSampleData/Model/ProductLink.php b/app/code/Magento/ProductLinksSampleData/Model/ProductLink.php index 6584e8f4cc..d217b491ef 100644 --- a/app/code/Magento/ProductLinksSampleData/Model/ProductLink.php +++ b/app/code/Magento/ProductLinksSampleData/Model/ProductLink.php @@ -1,6 +1,6 @@ diff --git a/app/code/Magento/ProductLinksSampleData/registration.php b/app/code/Magento/ProductLinksSampleData/registration.php index 0d5f299898..4261ef3cd4 100644 --- a/app/code/Magento/ProductLinksSampleData/registration.php +++ b/app/code/Magento/ProductLinksSampleData/registration.php @@ -1,6 +1,6 @@ " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/ReviewSampleData/Model/Review.php b/app/code/Magento/ReviewSampleData/Model/Review.php index 72629a5631..1840eb1752 100644 --- a/app/code/Magento/ReviewSampleData/Model/Review.php +++ b/app/code/Magento/ReviewSampleData/Model/Review.php @@ -1,6 +1,6 @@ review->install(['Magento_ReviewSampleData::fixtures/products_reviews.csv']); } -} \ No newline at end of file +} diff --git a/app/code/Magento/ReviewSampleData/composer.json b/app/code/Magento/ReviewSampleData/composer.json index e91c3c3df3..0b2eaf8c88 100644 --- a/app/code/Magento/ReviewSampleData/composer.json +++ b/app/code/Magento/ReviewSampleData/composer.json @@ -7,13 +7,15 @@ "magento/module-review": "100.0.*" }, "type": "magento2-module", - "version": "100.0.3", + "version": "100.0.6", "license": [ "OSL-3.0", "AFL-3.0" ], "autoload": { - "files": [ "registration.php" ], + "files": [ + "registration.php" + ], "psr-4": { "Magento\\ReviewSampleData\\": "" } diff --git a/app/code/Magento/ReviewSampleData/etc/module.xml b/app/code/Magento/ReviewSampleData/etc/module.xml index 160fb5726d..c1d725da8e 100644 --- a/app/code/Magento/ReviewSampleData/etc/module.xml +++ b/app/code/Magento/ReviewSampleData/etc/module.xml @@ -1,7 +1,7 @@ diff --git a/app/code/Magento/ReviewSampleData/registration.php b/app/code/Magento/ReviewSampleData/registration.php index 0bba42cd33..28b4e49b3d 100644 --- a/app/code/Magento/ReviewSampleData/registration.php +++ b/app/code/Magento/ReviewSampleData/registration.php @@ -1,6 +1,6 @@ " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/SalesRuleSampleData/Model/Rule.php b/app/code/Magento/SalesRuleSampleData/Model/Rule.php index 8876e62a99..54299ae26c 100644 --- a/app/code/Magento/SalesRuleSampleData/Model/Rule.php +++ b/app/code/Magento/SalesRuleSampleData/Model/Rule.php @@ -1,6 +1,6 @@ rule->install(['Magento_SalesRuleSampleData::fixtures/sales_rules.csv']); } -} \ No newline at end of file +} diff --git a/app/code/Magento/SalesRuleSampleData/composer.json b/app/code/Magento/SalesRuleSampleData/composer.json index b5c3106079..4b8a331976 100644 --- a/app/code/Magento/SalesRuleSampleData/composer.json +++ b/app/code/Magento/SalesRuleSampleData/composer.json @@ -9,13 +9,15 @@ "magento/module-eav": "100.0.*" }, "type": "magento2-module", - "version": "100.0.3", + "version": "100.0.6", "license": [ "OSL-3.0", "AFL-3.0" ], "autoload": { - "files": [ "registration.php" ], + "files": [ + "registration.php" + ], "psr-4": { "Magento\\SalesRuleSampleData\\": "" } diff --git a/app/code/Magento/SalesRuleSampleData/etc/module.xml b/app/code/Magento/SalesRuleSampleData/etc/module.xml index ff903677b9..d7bb2c634a 100644 --- a/app/code/Magento/SalesRuleSampleData/etc/module.xml +++ b/app/code/Magento/SalesRuleSampleData/etc/module.xml @@ -1,7 +1,7 @@ diff --git a/app/code/Magento/SalesRuleSampleData/registration.php b/app/code/Magento/SalesRuleSampleData/registration.php index 255e3cf324..a40af8ad27 100644 --- a/app/code/Magento/SalesRuleSampleData/registration.php +++ b/app/code/Magento/SalesRuleSampleData/registration.php @@ -1,6 +1,6 @@ " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/SalesSampleData/Model/Order.php b/app/code/Magento/SalesSampleData/Model/Order.php index 79dee61dad..187033bfdd 100644 --- a/app/code/Magento/SalesSampleData/Model/Order.php +++ b/app/code/Magento/SalesSampleData/Model/Order.php @@ -1,6 +1,6 @@ diff --git a/app/code/Magento/SalesSampleData/registration.php b/app/code/Magento/SalesSampleData/registration.php index b6d880de09..e66b448b60 100644 --- a/app/code/Magento/SalesSampleData/registration.php +++ b/app/code/Magento/SalesSampleData/registration.php @@ -1,6 +1,6 @@ " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/SwatchesSampleData/Model/Swatches.php b/app/code/Magento/SwatchesSampleData/Model/Swatches.php index 79626219b1..304e827209 100644 --- a/app/code/Magento/SwatchesSampleData/Model/Swatches.php +++ b/app/code/Magento/SwatchesSampleData/Model/Swatches.php @@ -1,6 +1,6 @@ swatches->install(); } -} \ No newline at end of file +} diff --git a/app/code/Magento/SwatchesSampleData/composer.json b/app/code/Magento/SwatchesSampleData/composer.json index 82b5df2804..93a8f73b42 100644 --- a/app/code/Magento/SwatchesSampleData/composer.json +++ b/app/code/Magento/SwatchesSampleData/composer.json @@ -8,13 +8,15 @@ "magento/module-eav": "100.0.*" }, "type": "magento2-module", - "version": "100.0.3", + "version": "100.0.6", "license": [ "OSL-3.0", "AFL-3.0" ], "autoload": { - "files": [ "registration.php" ], + "files": [ + "registration.php" + ], "psr-4": { "Magento\\SwatchesSampleData\\": "" } diff --git a/app/code/Magento/SwatchesSampleData/etc/module.xml b/app/code/Magento/SwatchesSampleData/etc/module.xml index 87c46f8fcf..59cf16d5cb 100644 --- a/app/code/Magento/SwatchesSampleData/etc/module.xml +++ b/app/code/Magento/SwatchesSampleData/etc/module.xml @@ -1,7 +1,7 @@ diff --git a/app/code/Magento/SwatchesSampleData/registration.php b/app/code/Magento/SwatchesSampleData/registration.php index 24a6d8a40d..523f473848 100644 --- a/app/code/Magento/SwatchesSampleData/registration.php +++ b/app/code/Magento/SwatchesSampleData/registration.php @@ -1,6 +1,6 @@ " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/TaxSampleData/Model/Tax.php b/app/code/Magento/TaxSampleData/Model/Tax.php index e3c28f74f3..78343f12cd 100644 --- a/app/code/Magento/TaxSampleData/Model/Tax.php +++ b/app/code/Magento/TaxSampleData/Model/Tax.php @@ -1,6 +1,6 @@ tax->install(['Magento_TaxSampleData::fixtures/tax_rate.csv']); } -} \ No newline at end of file +} diff --git a/app/code/Magento/TaxSampleData/composer.json b/app/code/Magento/TaxSampleData/composer.json index c1ebc8b09d..22dd32bdef 100644 --- a/app/code/Magento/TaxSampleData/composer.json +++ b/app/code/Magento/TaxSampleData/composer.json @@ -7,13 +7,15 @@ "magento/module-sample-data": "100.0.*" }, "type": "magento2-module", - "version": "100.0.3", + "version": "100.0.6", "license": [ "OSL-3.0", "AFL-3.0" ], "autoload": { - "files": [ "registration.php" ], + "files": [ + "registration.php" + ], "psr-4": { "Magento\\TaxSampleData\\": "" } diff --git a/app/code/Magento/TaxSampleData/etc/module.xml b/app/code/Magento/TaxSampleData/etc/module.xml index 2b933bb933..b9fdea64e0 100644 --- a/app/code/Magento/TaxSampleData/etc/module.xml +++ b/app/code/Magento/TaxSampleData/etc/module.xml @@ -1,7 +1,7 @@ diff --git a/app/code/Magento/TaxSampleData/registration.php b/app/code/Magento/TaxSampleData/registration.php index bdbdb44e6f..d218826be8 100644 --- a/app/code/Magento/TaxSampleData/registration.php +++ b/app/code/Magento/TaxSampleData/registration.php @@ -1,6 +1,6 @@ " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/ThemeSampleData/Model/Css.php b/app/code/Magento/ThemeSampleData/Model/Css.php index d4b8c8ae45..e7518570d4 100644 --- a/app/code/Magento/ThemeSampleData/Model/Css.php +++ b/app/code/Magento/ThemeSampleData/Model/Css.php @@ -1,6 +1,6 @@ configCacheType->clean(); } } -} \ No newline at end of file +} diff --git a/app/code/Magento/ThemeSampleData/Plugin/View/Page/Config.php b/app/code/Magento/ThemeSampleData/Plugin/View/Page/Config.php index dc65a92d33..b0415bc65d 100644 --- a/app/code/Magento/ThemeSampleData/Plugin/View/Page/Config.php +++ b/app/code/Magento/ThemeSampleData/Plugin/View/Page/Config.php @@ -1,6 +1,6 @@ diff --git a/app/code/Magento/ThemeSampleData/etc/module.xml b/app/code/Magento/ThemeSampleData/etc/module.xml index 2994b43dad..0edc26fa21 100644 --- a/app/code/Magento/ThemeSampleData/etc/module.xml +++ b/app/code/Magento/ThemeSampleData/etc/module.xml @@ -1,7 +1,7 @@ diff --git a/app/code/Magento/ThemeSampleData/fixtures/styles.css b/app/code/Magento/ThemeSampleData/fixtures/styles.css index 3f1aad5a31..5ab50e9228 100644 --- a/app/code/Magento/ThemeSampleData/fixtures/styles.css +++ b/app/code/Magento/ThemeSampleData/fixtures/styles.css @@ -1,5 +1,5 @@ /** - * Copyright © 2015 Magento. All rights reserved. + * Copyright © 2013-2017 Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ -.contact-index-index .fieldset{margin-bottom:20px}.contact-index-index .fieldset .legend{padding-bottom:0}.contact-info-number{display:block;font-size:36px;font-size:3.6rem;line-height:36px;font-weight:300}@media only screen and (max-width:767px){.contact-info-number{font-weight:300;margin-bottom:10px}}@media all and (min-width:768px),print{._rwd_width{min-width:0 !important;max-width:auto !important}._rwd_width_float{width:100% !important;float:none !important}.contact-index-index .fieldset .legend{border:none}.contact-index-index .column.main .widget.static.block{float:left;width:70%}.contact-info-number{margin-bottom:15px}.column:not(.sidebar-main) .form.contact,.column:not(.sidebar-additional) .form.contact{width:27%;float:right}} \ No newline at end of file +.contact-index-index .fieldset{margin-bottom:20px}.contact-index-index .fieldset .legend{padding-bottom:0}.contact-info-number{display:block;font-size:36px;font-size:3.6rem;line-height:36px;font-weight:300}@media only screen and (max-width:767px){.contact-info-number{font-weight:300;margin-bottom:10px}}@media all and (min-width:768px),print{._rwd_width{min-width:0 !important;max-width:auto !important}._rwd_width_float{width:100% !important;float:none !important}.contact-index-index .fieldset .legend{border:none}.contact-index-index .column.main .widget.static.block{float:left;width:70%}.contact-info-number{margin-bottom:15px}.column:not(.sidebar-main) .form.contact,.column:not(.sidebar-additional) .form.contact{width:27%;float:right}} diff --git a/app/code/Magento/ThemeSampleData/registration.php b/app/code/Magento/ThemeSampleData/registration.php index bc1bbd62ca..14f9032b4e 100644 --- a/app/code/Magento/ThemeSampleData/registration.php +++ b/app/code/Magento/ThemeSampleData/registration.php @@ -1,6 +1,6 @@ " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/WidgetSampleData/Model/CmsBlock.php b/app/code/Magento/WidgetSampleData/Model/CmsBlock.php index 3a01ad285b..21c73e5d6b 100644 --- a/app/code/Magento/WidgetSampleData/Model/CmsBlock.php +++ b/app/code/Magento/WidgetSampleData/Model/CmsBlock.php @@ -1,6 +1,6 @@ diff --git a/app/code/Magento/WidgetSampleData/registration.php b/app/code/Magento/WidgetSampleData/registration.php index ab78e53183..ac85cd5b96 100644 --- a/app/code/Magento/WidgetSampleData/registration.php +++ b/app/code/Magento/WidgetSampleData/registration.php @@ -1,6 +1,6 @@ " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/WishlistSampleData/Model/Helper.php b/app/code/Magento/WishlistSampleData/Model/Helper.php index 2eff40763a..73d02ffab4 100644 --- a/app/code/Magento/WishlistSampleData/Model/Helper.php +++ b/app/code/Magento/WishlistSampleData/Model/Helper.php @@ -1,6 +1,6 @@ wishlist->install(['Magento_WishlistSampleData::fixtures\wishlist.csv']); } -} \ No newline at end of file +} diff --git a/app/code/Magento/WishlistSampleData/composer.json b/app/code/Magento/WishlistSampleData/composer.json index 8cf497c988..919590753f 100644 --- a/app/code/Magento/WishlistSampleData/composer.json +++ b/app/code/Magento/WishlistSampleData/composer.json @@ -7,13 +7,15 @@ "magento/module-sample-data": "100.0.*" }, "type": "magento2-module", - "version": "100.0.3", + "version": "100.0.6", "license": [ "OSL-3.0", "AFL-3.0" ], "autoload": { - "files": [ "registration.php" ], + "files": [ + "registration.php" + ], "psr-4": { "Magento\\WishlistSampleData\\": "" } diff --git a/app/code/Magento/WishlistSampleData/etc/module.xml b/app/code/Magento/WishlistSampleData/etc/module.xml index 9c5e2ca76d..f70fb5b284 100644 --- a/app/code/Magento/WishlistSampleData/etc/module.xml +++ b/app/code/Magento/WishlistSampleData/etc/module.xml @@ -1,7 +1,7 @@ diff --git a/app/code/Magento/WishlistSampleData/registration.php b/app/code/Magento/WishlistSampleData/registration.php index 17de1fcaac..e39c394040 100644 --- a/app/code/Magento/WishlistSampleData/registration.php +++ b/app/code/Magento/WishlistSampleData/registration.php @@ -1,6 +1,6 @@