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

249.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_GroupedProduct/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_GroupedProduct/web/css/source_module.less2021-01-28 13:43:02 +0000

249.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged15168
Changed859
Inserted513
Removed27

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

249.4 Active regular expressions

No regular expressions were active.

249.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-wrapper.grouped { 12 .table-wrapper.grouped {
13     width: auto; 13     width: auto;
14 } 14 }
15  15 .page-product-grouped {
    16   .box-tocart {
    17     padding: 1.25rem 0 1rem;
    18     border-top: 1px solid #e7e7e7;
    19     border-bottom: 1px solid #e7e7e7;
    20     margin-top: 1rem;
    21     margin-bottom: 0;
    22   }
    23 }
16 .table.grouped { 24 .table.grouped {
17     .row-tier-price { 25     .row-tier-price {
18         > td { 26         > td {
19             border-top: 0; 27             border-top: 0;
20         } 28         }
21     } 29     }
    30     thead {
    31       text-transform: uppercase;
    32     }
22     .col.item { 33     .col.item {
23         width: 90%; 34         width: 90%;
    35         padding: 8px 0;
    36         font-weight: 400;
    37         border-color: #e7e7e7;
24     } 38     }
25     .col.qty { 39     .col.qty {
26         width: 10%; 40         width: 10%;
27         min-width: 95px; 41         padding: 8px 0;
28          42         font-weight400;
29         .control.qty { 43         border-color: #e7e7e7;
30             display: inline-block;    
31             vertical-align: middle;    
32                 
33             .qty {    
34                 &:extend(.abs-input-qty all);    
35             }    
36         }    
37         .qty-changer {    
38             display: inline-block;    
39             vertical-align: middle;    
40                 
41             > a {    
42                 display: block;    
43                 border: 1px solid @form-element-input__border-color;    
44                 border-radius: 3px;    
45                 height: 18px;    
46                 line-height: 16px;    
47                 margin-top: 2px;    
48                 color: #ccc;    
49                 font-size11px;    
50                     
51                 &:first-child {    
52                     margin-top: 0;    
53                 }    
54                 &:hover {    
55                     color: @_link-color-hover;    
56                 }    
57             }    
58         }    
59     } 44     }
60     .product-item-name { 45     .product-item-name {
61         font-weight: @font-weight__regular; 46         font-weight: @font-weight__regular;
62         margin-bottom: @indent__s; 47         margin-bottom: 0;
63         display: inline-block; 48         display: inline-block;
64     } 49     }
65     .price-box { 50     .price-box {
66         margin: 8px 0 3px; 51         margin: 
0
;
67          52         line-height: 1;
68         p { 53         p {
69             margin: 0; 54             margin: 0;
70         } 55         }
71         .price { 56         .price {
72             font-weight: @font-weight__bold; 57             font-weight: @font-weight__bold;
73             color: @product-view-product-info-price; 58             color: @product-view-product-info-price;
74         } 59         }
75         .old-price { 60         .old-price {
76             .price { 61             .price {
77                 font-weight: normal; 62                 font-weight: normal;
78                 color: @product-view-product-info-old-price; 63                 color: @product-view-product-info-old-price;
79             } 64             }
80         } 65         }
81     } 66     }
82     .stock.unavailable { 67     .stock.unavailable {
83         margin: 0; 68         margin: 0;
84         white-space: nowrap; 69         white-space: nowrap;
85         text-transform: none; 70         text-transform: none;
86         font-weight: normal; 71         font-weight: normal;
87     } 72     }
88     .row-tier-price { 73     .row-tier-price {
89     } 74     }
90 } 75 }
91  76 
92 .page-product-grouped .product-info-price { 77 .page-product-grouped .product-info-price {
93     float: right; 78     float: right;
94     display: block; 79     display: none;
95     width: auto; 80     width: auto;
96     border: 0; 81     border: 0;
97 } 82 }
98  83 
99 } 84 }
100  85 
101 // 86 //
102 //    Mobile 87 //    Mobile
103 //-------------------------------------- 88 //--------------------------------------
104 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) { 89 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
    90     .table-wrapper.grouped {border: none;}
105     .table.grouped { 91     .table.grouped {
106         > thead > tr > th { 92         > thead > tr > th {
107             display: table-cell; 93             display: table-cell;
108             border-bottom: @table__border-width @table__border-style @table__border-color; 94             border-bottom: @table__border-width @table__border-style #e7e7e7;
109         } 95         }
110         > tbody { 96         > tbody {
111             border-bottom: @table__border-width @table__border-style @table__border-color; 97             border-bottom: @table__border-width @table__border-style #e7e7e7;
112             > tr > td { 98             > tr > td {
113                 &:extend(.abs-col-no-prefix all); 99                 &:extend(.abs-col-no-prefix all);
114                 border: 0; 100                 border: 0;
115                 display: table-cell; 101                 display: table-cell;
116                 padding: @table-cell__padding-vertical @table-cell__padding-horizontal; 102                 padding: @table-cell__padding-vertical @table-cell__padding-horizontal;
117                 &:last-child { 103                 &:last-child {
118                     border: 0
;
 104                     border: 0 !important;
119                 } 105                 }
    106                 &.col.item,&.col.qty {
    107                   padding: 8px 0 !important;
    108                   width: 100%;
120             } 109                 }
121         } 110             }
    111             &:last-child {
    112               border: none;
    113             }
122     } 114         }
123 }    
124     
125 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {    
126     .table-wrapper.grouped {    
127         margin-left: -@layout__width-xs-indent;    
128         margin-right: -@layout__width-xs-indent;    
129     } 115     }
130 } 116 }
131