112. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2022-11-18 03:12:10 +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.

112.1 Files compared

#LocationFileLast Modified
1Porto Theme/app/design/frontend/Smartwave/porto/web/css/source_sections.less2021-02-02 14:32:48 +0000
2Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/web/css/source_sections.less2022-11-03 09:13:05 +0000

112.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged3564
Changed00
Inserted24
Removed00

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

112.4 Active regular expressions

No regular expressions were active.

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