306. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-07-12 04:43:08 +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.

306.1 Files compared

#LocationFileLast Modified
1Porto v4.0.5/Theme Files/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Multishipping/web/css/source_module.less2016-05-11 16:09:06 +0000
2Porto v4.0.6/Theme Files/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Multishipping/web/css/source_module.less2023-06-20 08:35:58 +0000

306.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged4824
Changed24
Inserted17
Removed00

306.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

306.4 Active regular expressions

No regular expressions were active.

306.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     .multicheckout { 12     .multicheckout {
13         .title { 13         .title {
14             margin-bottom: @indent__l; 14             margin-bottom: @indent__l;
15             strong { 15             strong {
16                 font-weight: @font-weight__regular; 16                 font-weight: @font-weight__regular;
17             } 17             }
18         } 18         }
19  19 
20         .table-wrapper { 20         .table-wrapper {
21             margin-bottom: 0; 21             margin-bottom: 0;
22             .table>tbody>tr>td, .table>tbody>tr>th, .table>tfoot>tr>td, .table>tfoot>tr>th, .table>thead>tr>td, .table>thead>tr>th { 22             .table>tbody>tr>td, .table>tbody>tr>th, .table>tfoot>tr>td, .table>tfoot>tr>th, .table>thead>tr>td, .table>thead>tr>th {
23                 vertical-align: middle; 23                 vertical-align: middle;
24             } 24             }
25             .action.delete { 25             .action.delete {
26                 display: inline-block; 26                 display: inline-block;
27             } 27             }
28             .col { 28             .col {
29                 .qty { 29                 .qty {
30                     display: inline-block; 30                     display: inline-block;
31                     .input-text { 31                     .input-text {
32                         &:extend(.abs-input-qty all); 32                         &:extend(.abs-input-qty all);
33                     } 33                     }
34                 } 34                 }
35                 .label { 35                 .label {
36                     &:extend(.abs-visually-hidden all); 36                     &:extend(.abs-visually-hidden all);
37                 } 37                 }
38                 &.item { 38                 &.item {
39                     .action.edit { 39                     .action.edit {
40                         font-weight: @font-weight__regular; 40                         font-weight: @font-weight__regular;
41                         margin-left: @indent__s; 41                         margin-left: @indent__s;
42                     } 42                     }
43                 } 43                 }
44             } 44             }
45             .cart-price { 45             .cart-price {
46                 &:extend(.abs-checkout-cart-price all); 46                 &:extend(.abs-checkout-cart-price all);
47             } 47             }
48             .product-item-name { 48             .product-item-name {
49                 &:extend(.abs-checkout-product-name all); 49                 &:extend(.abs-checkout-product-name all);
50                  50 
51                 > a { 51                 > a {
52                     &, &:hover { 52                     &, &:hover {
53                         color: @link__color; 53                         color: @link__color;
54                     } 54                     }
55                 } 55                 }
56             } 56             }
57         } 57         }
58  58 
59         &:not(.address) { 59         &:not(.address) {
60             .table-wrapper { 60             .table-wrapper {
61                 .product-item-name { 61                 .product-item-name {
62                     margin: 0; 62                     margin: 0;
63                 } 63                 }
64             } 64             }
65         } 65         }
66  66 
67         > .actions-toolbar { 67         > .actions-toolbar {
68             margin-top: @indent__xl; 68             margin-top: @indent__xl;
69         } 69         }
70  70 
71         .actions-toolbar { 71         .actions-toolbar {
72             > .secondary { 72             > .secondary {
73                 display: block; 73                 display: block;
74                 .action { 74                 .action {
75                     &.back { 75                     &.back {
76                         display: block; 76                         display: block;
77                         margin-left: 0; 77                         margin-left: 0;
78                     } 78                     }
79                 } 79                 }
80             } 80             }
81             > .primary { 81             > .primary {
82                 margin-right: @indent__s; 82                 margin-right: @indent__s;
83             } 83             }
84         } 84         }
85  85 
86         .action.primary { 86         .action.primary {
87             &:extend(.abs-button-l all); 87             &:extend(.abs-button-l all);
88         } 88         }
89  89 
90         .item-options { 90         .item-options {
91             margin: @indent__s 0 0; 91             margin: @indent__s 0 0;
92             &:extend(.abs-product-options-list all); 92             &:extend(.abs-product-options-list all);
93             &:extend(.abs-add-clearfix all); 93             &:extend(.abs-add-clearfix all);
94         } 94         }
95  95 
96         &:extend(.abs-account-blocks all); 96         &:extend(.abs-account-blocks all);
97  97 
98         .block { 98         .block {
99             &:extend(.abs-add-clearfix all); 99             &:extend(.abs-add-clearfix all);
100  100 
101             .methods-shipping { 101             .methods-shipping {
102                 .item-content { 102                 .item-content {
103                     .fieldset { 103                     .fieldset {
104                         > .legend { 104                         > .legend {
105                             &:extend(.abs-visually-hidden all); 105                             &:extend(.abs-visually-hidden all);
106                         } 106                         }
107                         > .legend + br { 107                         > .legend + br {
108                             &:extend(.abs-no-display all); 108                             &:extend(.abs-no-display all);
109                         } 109                         }
110                         > .field { 110                         > .field {
111                             &:before { 111                             &:before {
112                                 display: none; 112                                 display: none;
113                             } 113                             }
114                             .control { 114                             .control {
115                                 display: inline-block; 115                                 display: inline-block;
116                             } 116                             }
117                         } 117                         }
118                     } 118                     }
119                 } 119                 }
120             } 120             }
121         } 121         }
122  122 
123         .block-title, 123         .block-title,
124         .block-content .title { 124         .block-content .title {
125             &:extend(.abs-account-title all); 125             &:extend(.abs-account-title all);
126             border-bottom: @border-width__base solid @border-color__base; 126             border-bottom: @border-width__base solid @border-color__base;
127             padding-bottom: @indent__s; 127             padding-bottom: @indent__s;
128             strong { 128             strong {
129                 font-weight: @font-weight__regular; 129                 font-weight: @font-weight__regular;
130                 span { 130                 span {
131                     .lib-css(color, @primary__color__light); 131                     .lib-css(color, @primary__color__light);
132                 } 132                 }
133             } 133             }
134         } 134         }
135  135 
136         .block-content { 136         .block-content {
137             &:extend(.abs-add-clearfix all); 137             &:extend(.abs-add-clearfix all);
138             .title { 138             .title {
139                 border-bottom: none; 139                 border-bottom: none;
140                 padding-bottom: 0; 140                 padding-bottom: 0;
141             } 141             }
142         } 142         }
143  143 
144         &.order-review { 144         &.order-review {
145             .box-items { 145             .box-items {
146                 .box-content { 146                 .box-content {
147                     border-top: 1px solid #ddd; 147                     border-top: 1px solid #ddd;
148                     border-radius: 8px; 148                     border-radius: 8px;
149                 } 149                 }
150                 .data.table { 150                 .data.table {
151                     margin-bottom: 0; 151                     margin-bottom: 0;
152                 } 152                 }
153             } 153             }
154             .block-title > strong { 154             .block-title > strong {
155                 .lib-font-size(24); 155                 .lib-font-size(24);
156             } 156             }
157             .block-shipping { 157             .block-shipping {
158                 .block-content:not(:last-child) { 158                 .block-content:not(:last-child) {
159                     margin-bottom: @indent__xl; 159                     margin-bottom: @indent__xl;
160                 } 160                 }
161             } 161             }
162         } 162         }
163  163 
164         .box-title { 164         .box-title {
165             span { 165             span {
166                 margin-right: @indent__s; 166                 margin-right: @indent__s;
167             } 167             }
168             > .action { 168             > .action {
169                 margin: 0; 169                 margin: 0;
170             } 170             }
171         } 171         }
172  172 
173         .box-shipping-method { 173         .box-shipping-method {
174             .price { 174             .price {
175                 font-weight: @font-weight__bold; 175                 font-weight: @font-weight__bold;
176             } 176             }
177         } 177         }
178  178 
179         .box-billing-method { 179         .box-billing-method {
180             .fieldset { 180             .fieldset {
181                 margin: 0; 181                 margin: 0;
182                 .legend.box-title { 182                 .legend.box-title {
183                     margin: 0; 183                     margin: 0;
184                     color: @primary__color; 184                     color: @primary__color;
185                     font-weight: 700; 185                     font-weight: 700;
186                     text-transform: none; 186                     text-transform: none;
187                     font-size: 14px; 187                     font-size: 14px;
188                     line-height: 1.4; 188                     line-height: 1.4;
189                 } 189                 }
190             } 190             }
191              191 
192             .methods-payment .item-title label { 192             .methods-payment .item-title label {
193                 font-size: 14px; 193                 font-size: 14px;
194                 vertical-align: top; 194                 vertical-align: top;
195                 font-weight: 600; 195                 font-weight: 600;
196             } 196             }
197         } 197         }
198  198 
199         .hidden { 199         .hidden {
200             &:extend(.abs-no-display all); 200             &:extend(.abs-no-display all);
201         } 201         }
202  202 
203         .checkout-review .grand.totals { 203         .checkout-review .grand.totals {
204             .lib-font-size(@font-size__xl); 204             .lib-font-size(@font-size__xl);
205             margin-bottom: @indent__xl; 205             margin-bottom: @indent__xl;
206             .mark { 206             .mark {
207                 font-weight: @font-weight__regular; 207                 font-weight: @font-weight__regular;
208                 padding: 0; 208                 padding: 0;
209                 background: none; 209                 background: none;
210             } 210             }
211         } 211         }
212     } 212     }
213  213 
214     [class^="multishipping-"] { 214     [class^="multishipping-"] {
215         .nav-sections, 215         .nav-sections,
216         .nav-toggle { 216         .nav-toggle {
217             &:extend(.abs-no-display all); 217             &:extend(.abs-no-display all);
218         } 218         }
219         .logo { 219         .logo {
220             margin-left: 0; 220             margin-left: 0;
221         } 221         }
222     } 222     }
223  223 
224     .multishipping-checkout-success { 224     .multishipping-checkout-success {
225         .nav-sections { 225         .nav-sections {
226             display: block; 226             display: block;
227         } 227         }
228     } 228     }
    229     .multishipping-checkout-login {
    230       .login-container {
    231         > .action.create {
    232           display: none;
    233         }
    234       }
    235     }
229 } 236 }
230  237 
231 // 238 //
232 //  Mobile 239 //  Mobile
233 //  _____________________________________________ 240 //  _____________________________________________
234  241 
235 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) { 242 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
236     .multicheckout { 243     .multicheckout {
237         .data.table { 244         .data.table {
238             .address { 245             .address {
239                 &:before { 246                 &:before {
240                     margin-bottom: @indent__xs; 247                     margin-bottom: @indent__xs;
241                 } 248                 }
242             } 249             }
243         } 250         }
244  251 
245         .product-item-name, 252         .product-item-name,
246         .price-including-tax, 253         .price-including-tax,
247         .price-excluding-tax { 254         .price-excluding-tax {
248             display: inline-block; 255             display: inline-block;
249         } 256         }
250  257 
251         .block-content .box { 258         .block-content .box {
252             &:not(:last-child) { 259             &:not(:last-child) {
253                 margin-bottom: @indent__xl; 260                 margin-bottom: @indent__xl;
254             } 261             }
255             &:last-child { 262             &:last-child {
256                 margin-bottom: 0; 263                 margin-bottom: 0;
257             } 264             }
258         } 265         }
259  266 
260         &.order-review { 267         &.order-review {
261             .box-items { 268             .box-items {
262                 .data.table { 269                 .data.table {
263                     thead { 270                     thead {
264                         display: block; 271                         display: block;
265                         tr { 272                         tr {
266                             display: block; 273                             display: block;
267                         } 274                         }
268                         .col.item { 275                         .col.item {
269                             display: block; 276                             display: block;
270                             padding: 0; 277                             padding: 0;
271                         } 278                         }
272                     } 279                     }
273                 } 280                 }
274             } 281             }
275             .data.table { 282             .data.table {
276                 &:extend(.abs-checkout-order-review all); 283                 &:extend(.abs-checkout-order-review all);
277             } 284             }
278         } 285         }
279  286 
280         .actions-toolbar { 287         .actions-toolbar {
281             .action { 288             .action {
282                 margin-bottom: @indent__m; 289                 margin-bottom: @indent__m;
283             } 290             }
284             > .primary { 291             > .primary {
285                 margin-bottom: @indent__m; 292                 margin-bottom: @indent__m;
286                 margin-right: 0; 293                 margin-right: 0;
287             } 294             }
288         } 295         }
289     } 296     }
290 } 297 }
291  298 
292 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__s) { 299 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__s) {
293     .multicheckout { 300     .multicheckout {
294         .actions-toolbar { 301         .actions-toolbar {
295             .column:not(.sidebar-main) & { 302             .column:not(.sidebar-main) & {
296                 &:extend(.abs-reset-left-margin-desktop-s all); 303                 &:extend(.abs-reset-left-margin-desktop-s all);
297             } 304             }
298             .secondary { 305             .secondary {
299                 float: none; 306                 float: none;
300                 text-align: right; 307                 text-align: right;
301                 .action { 308                 .action {
302                     margin-left: @indent__s; 309                     margin-left: @indent__s;
303                     &.back { 310                     &.back {
304                         display: block; 311                         display: block;
305                         float: left; 312                         float: left;
306                     } 313                     }
307                 } 314                 }
308             } 315             }
309         } 316         }
310  317 
311         .item-options { 318         .item-options {
312             margin: @indent__base 0 0; 319             margin: @indent__base 0 0;
313         } 320         }
314  321 
315         .block-content .box { 322         .block-content .box {
316             margin-bottom: 0; 323             margin-bottom: 0;
317         } 324         }
318  325 
319         .block-shipping { 326         .block-shipping {
320             .box { 327             .box {
321                 &:extend(.abs-add-box-sizing-desktop-s all); 328                 &:extend(.abs-add-box-sizing-desktop-s all);
322                 float: left; 329                 float: left;
323                 width: 25%; 330                 width: 25%;
324             } 331             }
325             .box-shipping-method { 332             .box-shipping-method {
326                 padding-left: @indent__m; 333                 padding-left: @indent__m;
327                 padding-right: @indent__m; 334                 padding-right: @indent__m;
328                 width: 50%; 335                 width: 50%;
329                 .fieldset { 336                 .fieldset {
330                     .legend { 337                     .legend {
331                         &:extend(.abs-reset-left-margin-desktop-s all); 338                         &:extend(.abs-reset-left-margin-desktop-s all);
332                     } 339                     }
333                     .field { 340                     .field {
334                         &:before { 341                         &:before {
335                             display: none; 342                             display: none;
336                         } 343                         }
337                     } 344                     }
338                 } 345                 }
339             } 346             }
340         } 347         }
341  348 
342         .block-billing { 349         .block-billing {
343             &:extend(.abs-add-clearfix-desktop-s all); 350             &:extend(.abs-add-clearfix-desktop-s all);
344             .box-billing-address { 351             .box-billing-address {
345                 &:extend(.abs-add-box-sizing-desktop-s all); 352                 &:extend(.abs-add-box-sizing-desktop-s all);
346                 float: left; 353                 float: left;
347                 width: 25%; 354                 width: 25%;
348             } 355             }
349             .box-billing-method { 356             .box-billing-method {
350                 &:extend(.abs-add-box-sizing-desktop-s all); 357                 &:extend(.abs-add-box-sizing-desktop-s all);
351                 float: left; 358                 float: left;
352                 padding-left: @indent__m; 359                 padding-left: @indent__m;
353                 width: 50%; 360                 width: 50%;
354             } 361             }
355         } 362         }
356  363 
357         &.form.address { 364         &.form.address {
358             .table-wrapper { 365             .table-wrapper {
359                 .applicable { 366                 .applicable {
360                     margin: 7px 0 0; 367                     margin: 7px 0 0;
361                 } 368                 }
362             } 369             }
363         } 370         }
364  371 
365         &.order-review { 372         &.order-review {
366             .box-items { 373             .box-items {
367                 clear: left; 374                 clear: left;
368                 float: none; 375                 float: none;
369                 padding-top: @indent__xl; 376                 padding-top: @indent__xl;
370                 width: auto; 377                 width: auto;
371             } 378             }
372             .col.item { 379             .col.item {
373                 width: 75%; 380                 width: 75%;
374             } 381             }
375         } 382         }
376  383 
377         //  Payment methods 384         //  Payment methods
378         .methods-payment { 385         .methods-payment {
379             .item-content > .fieldset { 386             .item-content > .fieldset {
380                 width: auto; 387                 width: auto;
381                 .field { 388                 .field {
382                     &.cvv { 389                     &.cvv {
383                         display: inline-block; 390                         display: inline-block;
384                         width: auto; 391                         width: auto;
385                     } 392                     }
386                 } 393                 }
387             } 394             }
388             .fieldset > .field:not(.choice) { 395             .fieldset > .field:not(.choice) {
389                 > .label { 396                 > .label {
390                     float: none; 397                     float: none;
391                     margin-bottom: 8px; 398                     margin-bottom: 8px;
392                     text-align: left; 399                     text-align: left;
393                     width: auto; 400                     width: auto;
394                 } 401                 }
395                 &:not(.cvv) { 402                 &:not(.cvv) {
396                     .control { 403                     .control {
397                         width: 100%; 404                         width: 100%;
398                     } 405                     }
399                 } 406                 }
400             } 407             }
401         } 408         }
402     } 409     }
403 } 410 }
404  411 
405 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) { 412 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
406     .multishipping-checkout-success { 413     .multishipping-checkout-success {
407         .nav-toggle { 414         .nav-toggle {
408             display: block; 415             display: block;
409         } 416         }
410         .logo { 417         .logo {
411             margin-left: @indent__xl; 418             margin-left: @indent__xl;
412         } 419         }
413     } 420     }
414 } 421 }