225. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2024-03-04 14:39: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.

225.1 Files compared

#LocationFileLast Modified
1/Users/coca/Documents/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme v4.0.7/app/design/frontend/Smartwave/porto_rtl/Magento_Theme/web/css/source/module_testimonial.less2021-03-25 08:24:24 +0000
2/Users/coca/Documents/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme v4.0.8/app/design/frontend/Smartwave/porto_rtl/Magento_Theme/web/css/source/module_testimonial.less2021-03-25 08:24:24 +0000

225.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged1614
Changed00
Inserted00
Removed00

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

225.4 Active regular expressions

No regular expressions were active.

225.5 Comparison detail

1 & when (@media-common = true) { 1 & when (@media-common = true) {
2   .testimonial { 2   .testimonial {
3     margin-bottom: 20px; 3     margin-bottom: 20px;
4     .slick-slider & {margin-bottom: 0;} 4     .slick-slider & {margin-bottom: 0;}
5     blockquote { 5     blockquote {
6       border: 0; 6       border: 0;
7       color: #fff; 7       color: #fff;
8       margin: 0; 8       margin: 0;
9       padding: 2.5rem 4.5rem 2.5rem 4rem; 9       padding: 2.5rem 4.5rem 2.5rem 4rem;
10       position: relative; 10       position: relative;
11       font-size: 1em; 11       font-size: 1em;
12       font-family: inherit; 12       font-family: inherit;
13       font-style: inherit; 13       font-style: inherit;
14       line-height: inherit; 14       line-height: inherit;
15       p { 15       p {
16         font-size: 1.2em; 16         font-size: 1.2em;
17         line-height: 1.5; 17         line-height: 1.5;
18         margin-bottom: 0; 18         margin-bottom: 0;
19         color: inherit; 19         color: inherit;
20       } 20       }
21       &:before { 21       &:before {
22         left: 20px; 22         left: 20px;
23         top: 20px; 23         top: 20px;
24         content: "\201C"; 24         content: "\201C";
25         font-size: 80px; 25         font-size: 80px;
26         font-style: normal; 26         font-style: normal;
27         line-height: 1; 27         line-height: 1;
28         position: absolute; 28         position: absolute;
29         font-family: 'Playfair Display'; 29         font-family: 'Playfair Display';
30       } 30       }
31     } 31     }
32     .testimonial-arrow-down { 32     .testimonial-arrow-down {
33       border-left: 11px solid transparent; 33       border-left: 11px solid transparent;
34       border-right: 11px solid transparent; 34       border-right: 11px solid transparent;
35       border-top: 8px solid #ccc; 35       border-top: 8px solid #ccc;
36       height: 0; 36       height: 0;
37       margin: 0 40px 0 0; 37       margin: 0 40px 0 0;
38       width: 0; 38       width: 0;
39     } 39     }
40     .testimonial-author { 40     .testimonial-author {
41       display: -webkit-flex; 41       display: -webkit-flex;
42       display: -ms-flexbox; 42       display: -ms-flexbox;
43       display: flex; 43       display: flex;
44       margin: 12px 0 0 0; 44       margin: 12px 0 0 0;
45       .testimonial-author-thumbnail { 45       .testimonial-author-thumbnail {
46         width: auto; 46         width: auto;
47       } 47       }
48       img { 48       img {
49         max-width: 25px; 49         max-width: 25px;
50       } 50       }
51       strong { 51       strong {
52         display: block; 52         display: block;
53         margin-bottom: 2px; 53         margin-bottom: 2px;
54         font-size: 1rem; 54         font-size: 1rem;
55         font-weight: 700; 55         font-weight: 700;
56       } 56       }
57       span { 57       span {
58         color: #666; 58         color: #666;
59         display: block; 59         display: block;
60         font-size: .8rem; 60         font-size: .8rem;
61         font-weight: 600; 61         font-weight: 600;
62       } 62       }
63       p { 63       p {
64         color: #999; 64         color: #999;
65         margin-right: .75rem; 65         margin-right: .75rem;
66         text-align: right; 66         text-align: right;
67         line-height: 1.2; 67         line-height: 1.2;
68       } 68       }
69     } 69     }
70     &.testimonial-style-2 { 70     &.testimonial-style-2 {
71       text-align: center; 71       text-align: center;
72       blockquote { 72       blockquote {
73         background: transparent!important; 73         background: transparent!important;
74         padding: 20px; 74         padding: 20px;
75         &:before { 75         &:before {
76           display: none; 76           display: none;
77         } 77         }
78       } 78       }
79       .testimonial-arrow-down { 79       .testimonial-arrow-down {
80         display: none; 80         display: none;
81       } 81       }
82       .testimonial-author { 82       .testimonial-author {
83         -ms-flex-direction: column; 83         -ms-flex-direction: column;
84         flex-direction: column; 84         flex-direction: column;
85         padding: 0; 85         padding: 0;
86         margin: 6px 0 0; 86         margin: 6px 0 0;
87         img { 87         img {
88           margin: 0 auto 10px; 88           margin: 0 auto 10px;
89           max-width: 60px; 89           max-width: 60px;
90         } 90         }
91         p { 91         p {
92           text-align: center; 92           text-align: center;
93           padding: 0; 93           padding: 0;
94           margin: 0; 94           margin: 0;
95         } 95         }
96       } 96       }
97     } 97     }
98     &.testimonial-style-3 { 98     &.testimonial-style-3 {
99       blockquote { 99       blockquote {
100         padding: 12px 30px; 100         padding: 12px 30px;
101         p { 101         p {
102           font-size: 1em; 102           font-size: 1em;
103           font-style: normal; 103           font-style: normal;
104         } 104         }
105         &:before { 105         &:before {
106           top: 5px; 106           top: 5px;
107           left: 9px; 107           left: 9px;
108           font-size: 35px; 108           font-size: 35px;
109         } 109         }
110         &:after { 110         &:after {
111           font-size: 35px; 111           font-size: 35px;
112           bottom: -5px; 112           bottom: -5px;
113         } 113         }
114       } 114       }
115       .testimonial-author { 115       .testimonial-author {
116         margin-right: 8px; 116         margin-right: 8px;
117         img { 117         img {
118           max-width: 55px; 118           max-width: 55px;
119         } 119         }
120       } 120       }
121       .testimonial-arrow-down { 121       .testimonial-arrow-down {
122         margin-right: 20px; 122         margin-right: 20px;
123       } 123       }
124     } 124     }
125     &.testimonial-style-4 { 125     &.testimonial-style-4 {
126       padding: 7px; 126       padding: 7px;
127       border: 1px solid; 127       border: 1px solid;
128       box-shadow: 0 1px 1px 0 rgba(0,0,0,.04); 128       box-shadow: 0 1px 1px 0 rgba(0,0,0,.04);
129       blockquote { 129       blockquote {
130         background: transparent!important; 130         background: transparent!important;
131         padding: 12px 30px; 131         padding: 12px 30px;
132         color: #777; 132         color: #777;
133         p { 133         p {
134           font-size: 1em; 134           font-size: 1em;
135           font-style: normal; 135           font-style: normal;
136         } 136         }
137         &:before { 137         &:before {
138           top: 5px; 138           top: 5px;
139           right: 9px; 139           right: 9px;
140           font-size: 35px; 140           font-size: 35px;
141         } 141         }
142         &:after { 142         &:after {
143           font-size: 35px; 143           font-size: 35px;
144           bottom: -5px; 144           bottom: -5px;
145         } 145         }
146       } 146       }
147       .testimonial-arrow-down { 147       .testimonial-arrow-down {
148         display: none; 148         display: none;
149       } 149       }
150       .testimonial-author { 150       .testimonial-author {
151         margin-right: 30px; 151         margin-right: 30px;
152         margin-bottom: 15px; 152         margin-bottom: 15px;
153         -ms-flex-align: center; 153         -ms-flex-align: center;
154         align-items: center; 154         align-items: center;
155         img { 155         img {
156           max-width: 55px; 156           max-width: 55px;
157         } 157         }
158         p { 158         p {
159           margin-bottom: 0; 159           margin-bottom: 0;
160         } 160         }
161       } 161       }
162     } 162     }
163     &.testimonial-style-5 { 163     &.testimonial-style-5 {
164       text-align: center; 164       text-align: center;
165       blockquote { 165       blockquote {
166         background: transparent!important; 166         background: transparent!important;
167         padding: 6px 20px; 167         padding: 6px 20px;
168         p { 168         p {
169           font-size: 1.2em; 169           font-size: 1.2em;
170           font-style: normal; 170           font-style: normal;
171         } 171         }
172         &:before { 172         &:before {
173           display: none; 173           display: none;
174         } 174         }
175       } 175       }
176       .testimonial-arrow-down { 176       .testimonial-arrow-down {
177         display: none; 177         display: none;
178       } 178       }
179       .testimonial-author { 179       .testimonial-author {
180         display: block; 180         display: block;
181         padding: 15px 0 0; 181         padding: 15px 0 0;
182         margin: 12px 0 0; 182         margin: 12px 0 0;
183         img { 183         img {
184           margin: 0 auto 10px; 184           margin: 0 auto 10px;
185         } 185         }
186         p { 186         p {
187           text-align: center; 187           text-align: center;
188           padding: 0; 188           padding: 0;
189           margin: 0; 189           margin: 0;
190         } 190         }
191       } 191       }
192     } 192     }
193     &.testimonial-style-6 { 193     &.testimonial-style-6 {
194       text-align: center; 194       text-align: center;
195       blockquote { 195       blockquote {
196         background: transparent!important; 196         background: transparent!important;
197         border: 0; 197         border: 0;
198         padding: 0 10%; 198         padding: 0 10%;
199         i.fa-quote-left { 199         i.fa-quote-left {
200           font-size: 34px; 200           font-size: 34px;
201           position: relative; 201           position: relative;
202           right: -5px; 202           right: -5px;
203         } 203         }
204         p { 204         p {
205           font-size: 24px; 205           font-size: 24px;
206           line-height: 30px; 206           line-height: 30px;
207         } 207         }
208         span { 208         span {
209           font-size: 16px; 209           font-size: 16px;
210           line-height: 20px; 210           line-height: 20px;
211           color: #999; 211           color: #999;
212           position: relative; 212           position: relative;
213           right: -5px; 213           right: -5px;
214         } 214         }
215         &:before { 215         &:before {
216           display: none; 216           display: none;
217         } 217         }
218       } 218       }
219       .testimonial-arrow-down { 219       .testimonial-arrow-down {
220         display: none; 220         display: none;
221       } 221       }
222       .testimonial-author { 222       .testimonial-author {
223         -ms-flex-direction: column; 223         -ms-flex-direction: column;
224         flex-direction: column; 224         flex-direction: column;
225         padding: 0; 225         padding: 0;
226         margin: 6px 0 0; 226         margin: 6px 0 0;
227         img { 227         img {
228           margin: 15px auto 10px; 228           margin: 15px auto 10px;
229         } 229         }
230         p { 230         p {
231           text-align: center; 231           text-align: center;
232           padding: 0; 232           padding: 0;
233           margin: 0; 233           margin: 0;
234         } 234         }
235       } 235       }
236     } 236     }
237     &.testimonial-with-quotes { 237     &.testimonial-with-quotes {
238       text-align: center; 238       text-align: center;
239       blockquote { 239       blockquote {
240         background: transparent!important; 240         background: transparent!important;
241         p { 241         p {
242           padding: 0 40px; 242           padding: 0 40px;
243         } 243         }
244         &:before,&:after { 244         &:before,&:after {
245           display: block!important; 245           display: block!important;
246           right: 10px; 246           right: 10px;
247           top: 0; 247           top: 0;
248           content: "\201C"; 248           content: "\201C";
249           font-size: 80px; 249           font-size: 80px;
250           font-style: normal; 250           font-style: normal;
251           line-height: 1; 251           line-height: 1;
252           position: absolute; 252           position: absolute;
253         } 253         }
254         &:after {content: "\201D";right: auto;left: 10px;top: auto;bottom: -.5em;} 254         &:after {content: "\201D";right: auto;left: 10px;top: auto;bottom: -.5em;}
255       } 255       }
256       img {margin: 15px auto 10px;width: 60px;} 256       img {margin: 15px auto 10px;width: 60px;}
257       .testimonial-author p {margin: 0 auto;text-align: center;} 257       .testimonial-author p {margin: 0 auto;text-align: center;}
258       &.testimonial-light { 258       &.testimonial-light {
259         blockquote {color: #fff;} 259         blockquote {color: #fff;}
260         .testimonial-author { 260         .testimonial-author {
261           span,strong {opacity: .6;color: #fff;} 261           span,strong {opacity: .6;color: #fff;}
262         } 262         }
263       } 263       }
264       &.testimonial-remove-right-quote { 264       &.testimonial-remove-right-quote {
265         blockquote { 265         blockquote {
266           background: transparent!important; 266           background: transparent!important;
267           p {font-family: Georgia,serif!important;font-style: italic;font-size: 1.2em;} 267           p {font-family: Georgia,serif!important;font-style: italic;font-size: 1.2em;}
268           &:after { 268           &:after {
269             content: none; 269             content: none;
270           } 270           }
271         } 271         }
272       } 272       }
273     } 273     }
274     &.testimonial-no-borders { 274     &.testimonial-no-borders {
275       border-width: 0; 275       border-width: 0;
276       box-shadow: none; 276       box-shadow: none;
277     } 277     }
278     .testimonial-author strong {color: #111;} 278     .testimonial-author strong {color: #111;}
279     &.testimonial-style-3 { 279     &.testimonial-style-3 {
280       blockquote { 280       blockquote {
281         background: #f2f2f2; 281         background: #f2f2f2;
282       } 282       }
283       .testimonial-arrow-down { 283       .testimonial-arrow-down {
284         border-top: 10px solid #f2f2f2!important; 284         border-top: 10px solid #f2f2f2!important;
285       } 285       }
286     } 286     }
287     &.testimonial-style-4 { 287     &.testimonial-style-4 {
288       border-top-color: #dfdfdf; 288       border-top-color: #dfdfdf;
289       border-bottom-color: #dfdfdf; 289       border-bottom-color: #dfdfdf;
290       border-left-color: #ececec; 290       border-left-color: #ececec;
291       border-right-color: #ececec; 291       border-right-color: #ececec;
292     } 292     }
293     &.testimonial-style-5 .testimonial-author { 293     &.testimonial-style-5 .testimonial-author {
294       border-top: 1px solid #f2f2f2; 294       border-top: 1px solid #f2f2f2;
295     } 295     }
296   } 296   }
297 } 297 }
298 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) { 298 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
299   .testimonial{ 299   .testimonial{
300     .testimonial-with-quotes { 300     .testimonial-with-quotes {
301       blockquote { 301       blockquote {
302         p {padding:0;} 302         p {padding:0;}
303         &:before,&:after {display:none!important;} 303         &:before,&:after {display:none!important;}
304       } 304       }
305     } 305     }
306   } 306   }
307 } 307 }