248. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:09:04 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

248.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Downloadable/web/css/source_module.less2016-05-11 16:08:02 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Downloadable/web/css/source_module.less2021-01-28 13:15:08 +0000

248.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged4334
Changed211
Inserted11
Removed00

248.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

248.4 Active regular expressions

No regular expressions were active.

248.5 Comparison detail

1 // /** 1 // /**
2 //  * Copyright © 2015 Magento. All rights reserved. 2 //  * Copyright © 2015 Magento. All rights reserved.
3 //  * See COPYING.txt for license details. 3 //  * See COPYING.txt for license details.
4 //  */ 4 //  */
5  5 
6 // 6 //
7 //    Common 7 //    Common
8 //-------------------------------------- 8 //--------------------------------------
9  9 
10 & when (@media-common = true) { 10 & when (@media-common = true) {
11  11 
12 .table-downloadable-products { 12 .table-downloadable-products {
13     .product-name { 13     .product-name {
14         font-weight: @font-weight__regular; 14         font-weight: @font-weight__regular;
15         margin-right: 15px; 15         margin-right: 15px;
16     } 16     }
17     .action.download { 17     .action.download {
18         .lib-icon-font( 18         .lib-icon-font(
19             @_icon-font-content: @icon-download, 19             @_icon-font-content: @icon-download,
20             @_icon-font-margin: 0 5px 0 0 20             @_icon-font-margin: 0 5px 0 0
21         ); 21         );
22     } 22     }
23 } 23 }
24 .page-product-downloadable { 24 .page-product-downloadable {
25     .product-add-form { 25     .product-add-form {
26         clear: both; 26         clear: both;
27         margin-bottom: @indent__m; 27         margin-bottom: @indent__m;
28         &:extend(.abs-add-clearfix all); 28         &:extend(.abs-add-clearfix all);
29     } 29     }
30     .product-options-bottom { 30     .product-options-bottom {
31         .field.qty { 31         .field.qty {
32             display: none; 32             display: none;
33         } 33         }
34     } 34     }
35     .product-options-wrapper { 35     .product-options-wrapper {
36         border-bottom: 0; 36         border-bottom: 0;
37          37 
38         .fieldset { 38         .fieldset {
39             .legend.links-title { 39             .legend.links-title {
40                 &:extend(.abs-visually-hidden all); 40                 &:extend(.abs-visually-hidden all);
41             } 41             }
42         } 42         }
43     } 43     }
44 } 44 }
45 .samples { 45 .samples {
46     &-item-title { 46     &-item-title {
47         font-size: 1.4rem; 47       font-size: 1em;
48         font-weight: 600; 48       font-weight: 400;
49         margin: 0 @indent__s; 49       margin: 0 10px;
    50       text-transform: uppercase;
    51       border-bottom: 1px solid #e7e7e7;
    52       padding-bottom: 5px;
50     } 53     }
51     &-item { 54     &-item {
52         margin: 0 0 @indent__s; 55         margin: 0 0 @indent__s;
53     } 56     }
54 } 57 }
55 .field.downloads { 58 .field.downloads {
56     margin-bottom: @indent__s; 59     margin-bottom: @indent__s;
57     .page-product-downloadable .product-add-form .product-options-wrapper & > .control { 60     .page-product-downloadable .product-add-form .product-options-wrapper & > .control {
58         width: 100%; 61         width: 100%;
59     } 62     }
60     .price-container { 63     .price-container {
61         display: inline; 64         display: inline;
62         white-space: nowrap; 65         white-space: nowrap;
63         &:before { 66         &:before {
64             content: " + "; 67             content: " + ";
65             display: inline; 68             display: inline;
66         } 69         }
67     } 70     }
68     .price-excluding-tax { 71     .price-excluding-tax {
69         display: inline; 72         display: inline;
70         &:before { 73         &:before {
71             content: " ("attr(data-label) ": "; 74             content: " ("attr(data-label) ": ";
72         } 75         }
73         &:after { 76         &:after {
74             content: ")"; 77             content: ")";
75         } 78         }
76     } 79     }
77     .price-including-tax { 80     .price-including-tax {
78         display: inline; 81         display: inline;
79         font-weight: @font-weight__semibold; 82         font-weight: @font-weight__semibold;
80         .lib-font-size(14); 83         .lib-font-size(14);
81     } 84     }
82     .field.choice { 85     .field.choice {
83         box-sizing: border-box; 86         box-sizing: border-box;
84         border-bottom: 1px solid @color-gray92; 87         border-bottom: 1px solid @color-gray92;
85         padding-bottom: @indent__s; 88         padding-bottom: @indent__s;
86         margin-bottom: @indent__s; 89         margin-bottom: @indent__s;
87         &:extend(.clearer all); 90         &:extend(.clearer all);
88         width: 100%; 91         width: 100%;
89         position: relative; 92         position: relative;
90         z-index: 1; 93         z-index: 1;
91         input { 94         input {
92             position: absolute; 95             position: absolute;
93             left: 0; 96             left: 0;
94             top: 2px; 97             top: 2px;
95         } 98         }
96         padding-left: 25px; 99         padding-left: 25px;
97     } 100     }
98     .field { 101     .field {
99         &.downloads-all { 102         &.downloads-all {
100             padding-left: 0; 103             padding-left: 0;
101             border-bottom: 0; 104             border-bottom: 0;
102         } 105         }
103     } 106     }
    107     .label {font-size: 1em;}
104     .sample.link { 108     .sample.link {
105         float: right; 109         float: right;
106     } 110     }
107     &-all { 111     &-all {
108         .label { 112         .label {
109             .lib-link(); 113             .lib-link();
110             cursor: pointer; 114             cursor: pointer;
111         } 115         }
112         input { 116         input {
113             opacity: 0; 117             opacity: 0;
114         } 118         }
115     } 119     }
116     &.downloads-no-separately { 120     &.downloads-no-separately {
117         .field.choice { 121         .field.choice {
118             padding-left: 0; 122             padding-left: 0;
119         } 123         }
120     } 124     }
121 } 125 }
122  126 
123 } 127 }
124  128 
125 // 129 //
126 //    Mobile 130 //    Mobile
127 //-------------------------------------- 131 //--------------------------------------
128 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) { 132 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
129     .page-product-downloadable .product-options-wrapper { 133     .page-product-downloadable .product-options-wrapper {
130         margin-bottom: @indent__m; 134         margin-bottom: @indent__m;
131     } 135     }
132     .table-downloadable-products { 136     .table-downloadable-products {
133         .product-name { 137         .product-name {
134             display: block; 138             display: block;
135             .lib-css(margin-bottom, @indent__xs); 139             .lib-css(margin-bottom, @indent__xs);
136         } 140         }
137         .col.title { 141         .col.title {
138             &:before { 142             &:before {
139                 &:extend(.abs-visually-hidden-mobile all); 143                 &:extend(.abs-visually-hidden-mobile all);
140             } 144             }
141         } 145         }
142     } 146     }
143     .page-product-downloadable .product-info-price ~ *:last-child:after { 147     .page-product-downloadable .product-info-price ~ *:last-child:after {
144         border-bottom: 1px @color-gray-light5 solid; 148         border-bottom: 1px @color-gray-light5 solid;
145         content: ''; 149         content: '';
146         display: block; 150         display: block;
147         height: 0; 151         height: 0;
148         overflow: hidden; 152         overflow: hidden;
149         width: auto; 153         width: auto;
150         margin: @indent__m -@indent__s; 154         margin: @indent__m -@indent__s;
151     } 155     }
152 } 156 }
153  157 
154 // 158 //
155 // Product view Desktop 159 // Product view Desktop
156 //-------------------------------------- 160 //--------------------------------------
157 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { 161 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
158 .page-product-downloadable { 162 .page-product-downloadable {
159         .product-add-form { 163         .product-add-form {
160             &:extend(.clearer all); 164             &:extend(.clearer all);
161         } 165         }
162         .product-options-wrapper { 166         .product-options-wrapper {
163             float: left; 167             float: left;
164             width: 55%; 168             width: 55%;
165         } 169         }
166         .product-options-bottom { 170         .product-options-bottom {
167             float: right; 171             float: right;
168             width: 40%; 172             width: 40%;
169         } 173         }
170     } 174     }
171 } 175 }