233. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-03-13 03:01:07 +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.

233.1 Files compared

#LocationFileLast Modified
1Porto v4.0.4/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Filterproducts/web/css/source_module.less2021-03-27 08:08:54 +0000
2Porto v4.0.5/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Filterproducts/web/css/source_module.less2023-03-07 15:40:27 +0000

233.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged2468
Changed114
Inserted00
Removed00

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

233.4 Active regular expressions

No regular expressions were active.

233.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 & when (@media-common = true) { 5 & when (@media-common = true) {
6     .filterproducts.products { 6     .filterproducts.products {
7         margin: 0; 7         margin: 0;
8     } 8     }
9     p.fullwidth-filter-description { 9     p.fullwidth-filter-description {
10         font-size: 14px; 10         font-size: 14px;
11         color: #666; 11         color: #666;
12         line-height: 1.4; 12         line-height: 1.4;
13     } 13     }
14     .section-title, .slider-title, 14     .section-title, .slider-title,
15     .widget .widget-title, 15     .widget .widget-title,
16     .widget .widget-title a { 16     .widget .widget-title a {
17       color: #313131; 17       color: #313131;
18     } 18     }
19     .slider-title, .section-title { 19     .slider-title, .section-title {
20         font-size: 1.1429em; 20         font-size: 1.1429em;
21         line-height: 1.4; 21         line-height: 1.4;
22         letter-spacing: normal; 22         letter-spacing: normal;
23         font-weight: 700; 23         font-weight: 700;
24         text-transform: uppercase; 24         text-transform: uppercase;
25         margin-top: 0; 25         margin-top: 0;
26         margin-bottom: 1.25rem; 26         margin-bottom: 1.25rem;
27         position: relative; 27         position: relative;
28  28 
29         .line { 29         .line {
30             display: block; 30             display: block;
31             height: 1px; 31             height: 1px;
32             position: relative; 32             position: relative;
33             bottom: 0.65em; 33             bottom: 0.65em;
34             width: 0; 34             width: 0;
35         } 35         }
36     } 36     }
37     .porto-products.title-border-bottom > .section-title, 37     .porto-products.title-border-bottom > .section-title,
38     .related.products .slider-title { 38     .related.products .slider-title {
39         letter-spacing: -0.01em; 39         letter-spacing: -0.01em;
40         line-height: 22px; 40         line-height: 22px;
41         padding-bottom: 10px; 41         padding-bottom: 10px;
42         margin-bottom: 24px; 42         margin-bottom: 24px;
43     } 43     }
44     .porto-products.title-border-bottom, .related.products { 44     .porto-products.title-border-bottom, .related.products {
45         .products-slider.show-dots-title-right { 45         .products-slider.show-dots-title-right {
46             .owl-dots { 46             .owl-dots {
47                 top: -52px; 47                 top: -52px;
48                 height: 32px; 48                 height: 32px;
49             } 49             }
50         } 50         }
51         .products-slider.show-nav-title .owl-nav { 51         .products-slider.show-nav-title .owl-nav {
52             margin-top: -36px; 52             margin-top: -36px;
53         } 53         }
54     } 54     }
55     .porto-products.title-border-middle { 55     .porto-products.title-border-middle {
56       >.section-title  { 56       >.section-title  {
57         display: flex; 57         display: flex;
58         flex-direction: row; 58         flex-direction: row;
59         flex-wrap: nowrap; 59         flex-wrap: nowrap;
60         align-items: center; 60         align-items: center;
61         margin-bottom: 24px; 61         margin-bottom: 24px;
62         .line-l { 62         .line-l {
63           height: 1px; 63           height: 1px;
64           position: relative; 64           position: relative;
65           flex: 1 1 auto; 65           flex: 1 1 auto;
66           min-width: 10%; 66           min-width: 10%;
67           background: rgba(0,0,0,.08); 67           background: rgba(0,0,0,.08);
68         } 68         }
69         .line-r { 69         .line-r {
70           height: 1px; 70           height: 1px;
71           position: relative; 71           position: relative;
72           flex: 1 1 auto; 72           flex: 1 1 auto;
73           min-width: 10%; 73           min-width: 10%;
74           background: rgba(0,0,0,.08); 74           background: rgba(0,0,0,.08);
75         } 75         }
76         .inline-title{padding: 0 12px;} 76         .inline-title{padding: 0 12px;}
77         &.text-left { 77         &.text-left {
78           .line-l {display: none;} 78           .line-l {display: none;}
79           .inline-title{ 79           .inline-title{
80             padding-left: 0; 80             padding-left: 0;
81           } 81           }
82         } 82         }
83         &.text-right { 83         &.text-right {
84           .inline-title{ 84           .inline-title{
85             padding-right: 0; 85             padding-right: 0;
86           } 86           }
87           .line-r {display: none;} 87           .line-r {display: none;}
88         } 88         }
89       } 89       }
90       .products-slider.show-dots-title-right { 90       .products-slider.show-dots-title-right {
91         .owl-dots { 91         .owl-dots {
92             top: -40px; 92             top: -40px;
93             height: 32px; 93             height: 32px;
94         } 94         }
95       } 95       }
96       .products-slider.show-nav-title .owl-nav { 96       .products-slider.show-nav-title .owl-nav {
97         margin-top: -24px; 97         margin-top: -24px;
98       } 98       }
99     } 99     }
100     .porto-products.title-border-bottom>.section-title, 100     .porto-products.title-border-bottom>.section-title,
101     .related.products .slider-title, 101     .related.products .slider-title,
102     .porto-products.title-border-middle>.section-title .inline-title:before { 102     .porto-products.title-border-middle>.section-title .inline-title:before {
103       border-bottom: 1px solid rgba(0,0,0,.08); 103       border-bottom: 1px solid rgba(0,0,0,.08);
104     } 104     }
105     .slider-wrapper {margin-left: -10px;margin-right: -10px;} 105     .slider-wrapper {margin-left: -10px;margin-right: -10px;}
106     .products-slider.owl-carousel, .slider-wrapper .products {margin: 0!important;} 106     .products-slider.owl-carousel, .slider-wrapper .products {margin: 0!important;}
107     .porto-products.title-border-bottom .products-slider.show-dots-title-right .owl-dots, .related.products .products-slider.show-dots-title-right .owl-dots {top: -52px;height: 32px;} 107     .porto-products.title-border-bottom .products-slider.show-dots-title-right .owl-dots, .related.products .products-slider.show-dots-title-right .owl-dots {
    108       top: -52px;height: 32px;
    109     }
    110     .porto-products.title-border-bottom.move-related .products-slider.show-dots-title-right .owl-dots {
    111       top: -86px;
    112     }
    113     .move-related .product-item-details {
    114       position: static;
    115     }
    116     .block.related.move-related .field.choice {
    117       top: 3px;
    118       left: 8px;
    119     }
108     .products-slider.owl-carousel .product-item {padding-top: 0;padding-bottom: 0;margin-bottom: 0;} 120     .products-slider.owl-carousel .product-item {padding-top: 0;padding-bottom: 0;margin-bottom: 0;}
109     .products-slider.owl-carousel .owl-stage-outer {padding-top: 10px;margin-top: -10px;} 121     .products-slider.owl-carousel .owl-stage-outer {padding-top: 10px;margin-top: -10px;}
110  122 
111     .ajax-products{ 123     .ajax-products{
112       display:flex;flex-wrap: wrap; 124       display:flex;flex-wrap: wrap;
113       >.category-list{ 125       >.category-list{
114         border-right: 1px solid #dcdcdc; 126         border-right: 1px solid #dcdcdc;
115         padding: 0 15px; 127         padding: 0 15px;
116         >span{ 128         >span{
117           font-size: 1.125rem; 129           font-size: 1.125rem;
118           letter-spacing: -.01em; 130           letter-spacing: -.01em;
119           margin-bottom: 15px; 131           margin-bottom: 15px;
120           color: #111; 132           color: #111;
121           text-transform: uppercase; 133           text-transform: uppercase;
122           font-weight: 700; 134           font-weight: 700;
123           display: block;line-height: 1.4; 135           display: block;line-height: 1.4;
124         } 136         }
125         >ul{ 137         >ul{
126           list-style:none; 138           list-style:none;
127           padding:0; 139           padding:0;
128           margin-bottom: 2rem; 140           margin-bottom: 2rem;
129           >li{ 141           >li{
130             padding: 0; 142             padding: 0;
131             margin: 0; 143             margin: 0;
132             >a { 144             >a {
133               text-transform: uppercase; 145               text-transform: uppercase;
134               font-size: 12px; 146               font-size: 12px;
135               font-weight: 600; 147               font-weight: 600;
136               padding: 12px 0 12px 24px; 148               padding: 12px 0 12px 24px;
137               color: #111; 149               color: #111;
138               display: block; 150               display: block;
139               position: relative; 151               position: relative;
140                 &:before { 152                 &:before {
141                 content: ''!important; 153                 content: ''!important;
142                 margin-right: 10px; 154                 margin-right: 10px;
143                 position: absolute; 155                 position: absolute;
144                 left: 0; 156                 left: 0;
145                 width: 14px; 157                 width: 14px;
146                 height: 14px; 158                 height: 14px;
147                 border: 1px solid #d6d6d6; 159                 border: 1px solid #d6d6d6;
148                 background: #fff; 160                 background: #fff;
149                 top: 50%; 161                 top: 50%;
150                 transform: translateY(-50%); 162                 transform: translateY(-50%);
151               } 163               }
152               &.active:after { 164               &.active:after {
153                 content: ''; 165                 content: '';
154                 width: 8px; 166                 width: 8px;
155                 height: 8px; 167                 height: 8px;
156                 position: absolute; 168                 position: absolute;
157                 background: #111; 169                 background: #111;
158                 top: 50%; 170                 top: 50%;
159                 transform: translateY(-50%); 171                 transform: translateY(-50%);
160                 left: 3px; 172                 left: 3px;
161               } 173               }
162               >span{display:inline-block} 174               >span{display:inline-block}
163               &:hover{text-decoration:none} 175               &:hover{text-decoration:none}
164             } 176             }
165           } 177           }
166         } 178         }
167       } 179       }
168       >.category-detail{ 180       >.category-detail{
169         position: relative; 181         position: relative;
170         padding-left: 4vw; 182         padding-left: 4vw;
171         padding-right: 0; 183         padding-right: 0;
172         margin-bottom: 50px; 184         margin-bottom: 50px;
173         letter-spacing: -.025em; 185         letter-spacing: -.025em;
174         min-height: 70vh; 186         min-height: 70vh;
175         >h2{ 187         >h2{
176           text-align:center; 188           text-align:center;
177           margin:30px 0; 189           margin:30px 0;
178           font-size:26px; 190           font-size:26px;
179           color:#000; 191           color:#000;
180           text-transform:uppercase; 192           text-transform:uppercase;
181           font-weight:700; 193           font-weight:700;
182           letter-spacing:10px; 194           letter-spacing:10px;
183         } 195         }
184         >.ajax_products_loader{ 196         >.ajax_products_loader{
185           position:absolute; 197           position:absolute;
186           left:0; 198           left:0;
187           top:0; 199           top:0;
188           width:100%; 200           width:100%;
189           height:100%; 201           height:100%;
190           z-index:9; 202           z-index:9;
191           background-color:rgba(255,255,255,.5); 203           background-color:rgba(255,255,255,.5);
192         } 204         }
193       } 205       }
194     } 206     }
195     .load-more-area{ 207     .load-more-area{
196       text-align:center; 208       text-align:center;
197       margin:20px 0; 209       margin:20px 0;
198       >a{ 210       >a{
199         margin: 12px 40px; 211         margin: 12px 40px;
200         border: 1px solid #000; 212         border: 1px solid #000;
201         width: auto; 213         width: auto;
202         display: inline-block; 214         display: inline-block;
203         letter-spacing: .075em; 215         letter-spacing: .075em;
204         color: #000; 216         color: #000;
205         padding: 18px 55px; 217         padding: 18px 55px;
206         font-size: 12px; 218         font-size: 12px;
207         line-height: 1.3333; 219         line-height: 1.3333;
208         text-transform: uppercase; 220         text-transform: uppercase;
209         font-weight: 700; 221         font-weight: 700;
210       } 222       }
211     } 223     }
212 } 224 }
213  225 
214 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) { 226 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
215   .slider-title, .section-title { 227   .slider-title, .section-title {
216     .line { 228     .line {
217         display: none !important; 229         display: none !important;
218     } 230     }
219   } 231   }
220   .ajax-products{ 232   .ajax-products{
221     display:block; 233     display:block;
222     >.category-list{ 234     >.category-list{
223       border-right:0;padding:0; 235       border-right:0;padding:0;
224       >ul>li{ 236       >ul>li{
225         display:inline-block; 237         display:inline-block;
226         margin-right:20px; 238         margin-right:20px;
227       } 239       }
228     } 240     }
229     >.category-detail{ 241     >.category-detail{
230       padding-top:0; 242       padding-top:0;
231       min-height:70vh; 243       min-height:70vh;
232       padding: 0; 244       padding: 0;
233     } 245     }
234   } 246   }
235 } 247 }