330. Araxis Merge File Comparison Report

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

330.1 Files compared

#LocationFileLast Modified
1Porto v4.0.4/Porto Theme/app/design/frontend/Smartwave/porto_rtl/web/css/source_sections.less2022-11-03 09:13:09 +0000
2Porto v4.0.5/Porto Theme/app/design/frontend/Smartwave/porto_rtl/web/css/source_sections.less2022-11-20 08:23:25 +0000

330.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged6562
Changed14
Inserted00
Removed46

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

330.4 Active regular expressions

No regular expressions were active.

330.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   .product.data.items { 11   .product.data.items {
12       .lib-data-accordion(); 12       .lib-data-accordion();
13       .item.title { 13       .item.title {
14           color: #818692; 14           color: #818692;
15           padding: 15px 0; 15           padding: 15px 0;
16           font-weight: 700; 16           font-weight: 700;
17           text-transform: uppercase; 17           text-transform: uppercase;
18           background: none; 18           background: none;
19           border-bottom: 2px solid #e7e7e7; 19           border-bottom: 2px solid #e7e7e7;
20           >.switch { 20           >.switch {
21             font-size: 13px; 21             font-size: 13px;
22             display: inline-block; 22             display: inline-block;
23             border: none; 23             border: none;
24             height: auto; 24             height: auto;
25             padding: 0 !important; 25             padding: 0 !important;
26             color: inherit; 26             color: inherit;
27             font-weight: inherit; 27             font-weight: inherit;
28             line-height: inherit; 28             line-height: inherit;
29             background: none !important; 29             background: none !important;
30             display: block; 30             display: block;
31             &:hover { 31             &:hover {
32               color: inherit; 32               color: inherit;
33               background: none; 33               background: none;
34             } 34             }
35           } 35           }
36           &.active { 36           &.active {
37             color: #222529; 37             color: #222529;
38             border-color: #222529; 38             border-color: #222529;
39             >.switch { 39             >.switch {
40               color: inherit; 40               color: inherit;
41               background: none; 41               background: none;
42               padding: 0; 42               padding: 0;
43               &:hover,&:focus { 43               &:hover,&:focus {
44                 padding: 0; 44                 padding: 0;
45                 color: inherit; 45                 color: inherit;
46                 background: none; 46                 background: none;
47               } 47               }
48             } 48             }
49           } 49           }
50           &:hover { 50           &:hover {
51             border-color: #222529; 51             border-color: #222529;
52             color: #222529; 52             color: #222529;
53             >.switch { 53             >.switch {
54               color: inherit; 54               color: inherit;
55               padding: 0; 55               padding: 0;
56             } 56             }
57           } 57           }
58           a { 58           a {
59               position: relative; 59               position: relative;
60               &:after { 60               &:after {
61                   font-family: 'porto-icons'; 61                   font-family: 'porto-icons';
62                   content: @icon-down; 62                   content: @icon-down;
63                   position: absolute; 63                   position: absolute;
64                   left: @accordion-control__padding-right; 64                   left: @accordion-control__padding-right;
65                   top: @accordion-control__padding-top; 65                   top: @accordion-control__padding-top;
66               } 66               }
67           } 67           }
68           &.active a:after { 68           &.active a:after {
69               content: @icon-up; 69               content: @icon-up;
70               font-family: 'porto-icons'; 70               font-family: 'porto-icons';
71           } 71           }
72       } 72       }
73       > .item { 73       > .item {
74           &.content { 74           &.content {
75             border: none; 75             border: none;
76             box-shadow: none; 76             box-shadow: none;
77             padding: 30px 0 15px; 77             padding: 30px 0 15px;
78             background: none;    
79             p { 78             p {
80               font-size: 14px; 79               font-size: 14px;
81               font-weight: 400; 80               font-weight: 400;
82               letter-spacing: .005em; 81               letter-spacing: .005em;
83               line-height: 1.9; 82               line-height: 1.9;
84             } 83             }
85           } 84           }
86       } 85       }
87       .value p:last-child { 86       .value p:last-child {
88           margin-bottom: 0; 87           margin-bottom: 0;
89       } 88       }
90       .table-wrapper { 89       .table-wrapper {
91           margin: 0; 90           margin: 0;
92       } 91       }
93   } 92   }
94   .porto-info-list,.product.description ul { 93   .porto-info-list,.product.description ul {
95     padding-right: 38.5px; 94     padding-right: 38.5px;
96     margin-bottom: 20px; 95     margin-bottom: 20px;
97     li { 96     li {
98         list-style: none; 97         list-style: none;
99         line-height: 1.5; 98         line-height: 1.5;
100         padding-top: .5em; 99         padding-top: .5em;
101         padding-bottom: .5em; 100         padding-bottom: .5em;
102         margin: 0; 101         margin: 0;
103         display: -ms-flexbox; 102         display: -ms-flexbox;
104         display: flex; 103         display: flex;
105         -ms-flex-align: center; 104         -ms-flex-align: center;
106         align-items: center; 105         align-items: center;
107     } 106     }
108     .porto-info-icon, [class^=porto-icon-] { 107     .porto-info-icon, [class^=porto-icon-] {
109         margin-left: 16.5px; 108         margin-left: 16.5px;
110         line-height: 1.3; 109         line-height: 1.3;
111         position: relative;    
112         top: 2px; 110         top: 2px;
113         color: #21293c; 111         color: #21293c;
114         font-size: 16px; 112         font-size: 16px;
115     } 113     }
116     .porto-icon-ok:before { 114     .porto-icon-ok:before {
117       content: '\e8c1'; 115       content: '\e8c1';
118     } 116     }
119     .porto-info-list-item .porto-info-icon { 117     .porto-info-list-item .porto-info-icon {
120         width: auto; 118         width: auto;
121         display: inline-block; 119         display: inline-block;
122     } 120     }
123   } 121   }
124 } 122 }
125  123 
126 // 124 //
127 //  Desktop 125 //  Desktop
128 //  _____________________________________________ 126 //  _____________________________________________
129  127 
130 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { 128 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
131     .product.data.items { 129     .product.data.items {
132         .lib-data-tabs(); 130         .lib-data-tabs();
133         border-bottom: 0; 131         border-bottom: 0;
134         margin-left: 0; 132         margin-left: 0;
135         margin-right: 0; 133         margin-right: 0;
136         .item.title a:after { 134         .item.title a:after {
137             display: none; 135             display: none;
138         } 136         }
139         > .item { 137         > .item {
140             &.title { 138             &.title {
141                 margin: 0 0 0 35px; 139                 margin: 0 0 0 35px;
142                 color: #818692; 140                 color: #818692;
143                 padding: 7px 0; 141                 padding: 7px 0;
144                 font-weight: 700; 142                 font-weight: 700;
145                 text-transform: uppercase; 143                 text-transform: uppercase;
146                 background: none; 144                 background: none;
147                 border-bottom: 2px solid transparent; 145                 border-bottom: 2px solid transparent;
148                 display: inline-block; 146                 display: inline-block;
149                 float: none; 147                 float: none;
150                 >.switch { 148                 >.switch {
151                   font-size: 13px; 149                   font-size: 13px;
152                   display: inline-block; 150                   display: inline-block;
153                   border: none; 151                   border: none;
154                   height: auto; 152                   height: auto;
155                   padding: 0 !important; 153                   padding: 0 !important;
156                   color: inherit; 154                   color: inherit;
157                   font-weight: inherit; 155                   font-weight: inherit;
158                   line-height: inherit; 156                   line-height: inherit;
159                   background: none !important; 157                   background: none !important;
160                   display: block; 158                   display: block;
161                   &:hover,&:active,&:focus { 159                   &:hover,&:active,&:focus {
162                     color: inherit !important; 160                     color: inherit !important;
163                     border-color: inherit  !important; 161                     border-color: inherit  !important;
164                     background: none; 162                     background: none;
165                   } 163                   }
166                 } 164                 }
167                 &.active { 165                 &.active {
168                   color: #222529; 166                   color: #222529;
169                   border-color: #222529; 167                   border-color: #222529;
170                   >.switch { 168                   >.switch {
171                     color: inherit; 169                     color: inherit;
172                     background: none; 170                     background: none;
173                     padding: 0; 171                     padding: 0;
174                     &:hover,&:focus { 172                     &:hover,&:focus {
175                       padding: 0; 173                       padding: 0;
176                       color: inherit; 174                       color: inherit;
177                       background: none; 175                       background: none;
178                     } 176                     }
179                   } 177                   }
180                 } 178                 }
181                 &:hover { 179                 &:hover {
182                   border-color: #222529; 180                   border-color: #222529;
183                   >.switch { 181                   >.switch {
184                     color: inherit; 182                     color: inherit;
185                     padding: 0; 183                     padding: 0;
186                   } 184                   }
187                 } 185                 }
188             } 186             }
189             &.content { 187             &.content {
190               border: none; 188               border: none;
191               border-top: solid 1px #e7e7e7; 189               border-top: solid 1px #e7e7e7;
192               box-shadow: none; 190               box-shadow: none;
193               padding: 30px 0 15px; 191               padding: 30px 0 15px;
194               margin-top: 40px;
 192               margin-top: 40px; 
195               background: none; 193               display: none;
196             } 194             }
197         } 195         }
198         .vertical & { 196         .vertical & {
199           > .item { 197           > .item {
200             &:first-child + div.item.content {    
201               display: block;    
202             }    
203             &.title { 198             &.title {
204               max-width: 20%; 199               max-width: 20%;
205               text-align: right; 200               text-align: right;
206               float: none; 201               float: none;
207               border: none; 202               border: none;
208               padding: 0; 203               padding: 0;
209               margin: 0; 204               margin: 0;
210               margin-bottom: 13px; 205               margin-bottom: 13px;
211               overflow: hidden; 206               overflow: hidden;
212               position: relative; 207               position: relative;
213               display: block; 208               display: block;
214               >.switch { 209               >.switch {
215                 padding: 3px 0 10px !important; 210                 padding: 3px 0 10px !important;
216                 display: inline-block; 211                 display: inline-block;
217                 &::before { 212                 &::before {
218                   content: ''; 213                   content: '';
219                   position: absolute; 214                   position: absolute;
220                   width: 100%; 215                   width: 100%;
221                   bottom: 0; 216                   bottom: 0;
222                   border-bottom: 1px solid #dae2e6; 217                   border-bottom: 1px solid #dae2e6;
223                   z-index: 1; 218                   z-index: 1;
224                 } 219                 }
225                 &::after { 220                 &::after {
226                   content: ''; 221                   content: '';
227                   display: block; 222                   display: block;
228                   position: absolute; 223                   position: absolute;
229                   width: 30vw; 224                   width: 30vw;
230                   bottom: 0; 225                   bottom: 0;
231                   border-bottom: 1px solid #dae2e6; 226                   border-bottom: 1px solid #dae2e6;
232                   z-index: 0; 227                   z-index: 0;
233                   right: 0; 228                   right: 0;
234                 } 229                 }
235               } 230               }
236               &.active,&:hover { 231               &.active,&:hover {
237                 >.switch { 232                 >.switch {
238                   &::before { 233                   &::before {
239                     border-width: 2px; 234                     border-width: 2px;
240                     border-bottom-color: inherit; 235                     border-bottom-color: inherit;
241                   } 236                   }
242                 } 237                 }
243               } 238               }
244             } 239             }
245             &.content { 240             &.content {
246               position: absolute; 241               position: absolute;
247               float: none; 242               float: none;
248               margin: 0; 243               margin: 0;
249               width: 80%; 244               width: 80%;
250               left: 0; 245               left: 0;
251               top: 0; 246               top: 0;
252               padding-top: 0; 247               padding-top: 0;
253               border-top: none; 248               border-top: none;
254               padding-right: 30px; 249               padding-right: 30px;
255               min-height: 180px; 250               min-height: 180px;
256               display: none;    
257             } 251             }
258           } 252           }
259         } 253         }
260         .accordion & { 254         .accordion & {
261           & > .item.title { 255           & > .item.title {
262             border-color: #e7e7e7; 256             border-color: #e7e7e7;
263             &.active { 257             &.active {
264               border-color: inherit; 258               border-color: inherit;
265             } 259             }
266           } 260           }
267           & > .item.title, & > .item.content { 261           & > .item.title, & > .item.content {
268               float: none; 262               float: none;
269               margin: 0; 263               margin: 0;
270               display: block; 264               display: block;
271           } 265           }
272           & > .item.content { 266           & > .item.content {
273             border: none; 267             border: none;
274           } 268           }
275         } 269         }
276         .sticky & { 270         .sticky & {
277           & > .item.title { 271           & > .item.title {
278             &.active { 272             &.active {
279               color: inherit; 273               color: inherit;
280               border-color: transparent; 274               border-color: transparent;
281             } 275             }
282             &:hover { 276             &:hover {
283               color: inherit; 277               color: inherit;
284               border-color: inherit; 278               border-color: inherit;
285             } 279             }
286           } 280           }
287         } 281         }
288     } 282     }
289 } 283 }