579. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:09:38 +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.

579.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/pub/media/porto/web/css/headertype6.css2018-06-17 21:10:42 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/pub/media/porto/web/css/headertype6.css2021-04-23 07:48:20 +0000

579.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged36
Changed3317
Inserted00
Removed00

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

579.4 Active regular expressions

No regular expressions were active.

579.5 Comparison detail

1 .page-header.type6 .panel.wrapper{background-color:#08c;color:#fff} 1 .main-panel-top {border-bottom: 1px solid #e7e7e7;}
2 .page-header.type6 .panel.header .header.links>li>a{color:#fff} 2 .page-header.type6 .panel.wrapper {letter-spacing: .025em;min-height: 36px;}
3 .page-header.type6 .panel.header .header.links>li>a:hover{color:#fff} 3 .page-header .gap {display: none;}
4  4 
.page-header.type6  .header-right > * {margin-left: .875rem;margin-right:
 0;}
5 @media only screen and (max-width:767px){ 5 .page-header .switcher .options .action.toggle {padding: 0;}
6     .page-header.type6 .nav-toggle{float:right} 6 .page-header.type6 .main-panel-top .panel.header+.gap {height: 1.6em;}
7     .page-header.type6 .logo{height:40px;float:left
;margin
:10px 0
}		 7 
.page-header.type6 .panel.header .switcher {
margin-right: 0;margin-left: .875rem;}
8     .page-header.type6 .logo img{max-width:100%;max-height:100%;width:auto} 8 .page-header.type6 .panel.header .switcher:first-child {margin-left: 0;}
9     .page-header.type6 .minicart-wrapper{position:relative;top:auto;right:auto;left:auto;margin:10px 0;float:right} 9 .page-header.type6 .main-panel-top .share-links a {width: 30px;height: 30px;margin: 0 1px;display: inline-block;font-size: .8rem;}
10     .page-header.type6 .search-toggle-icon{display:none} 10 .page-header.type6 .main-panel-top .separator {height: 1.6em;border-left: 1px solid #e7e7e7;display: inline-block;vertical-align: middle;}
11     .page-header.type6 .block-search .label{float:right;margin-right:15px;margin-top:15px} 11 
.page-header.type6 .header-row .header-center {padding: 30px 15px;flex: inherit;}
12 } 12 .page-header.type6 .header-row >*:not(.header-center){flex: 1;}
13 @media all and (min-width:768px),print{ 13 .page-header.type6 .header-row .header-left,.page-header.type6 .header-row .header-right {padding: 30px 0;}
14     header.page-header.sticky-header.type6 .nav-sections{background-color:#fff} 14 .page-header.type6 .porto-sicon-box {margin: 0 !important;}
15     header.page-header.sticky-header.type6 .minicart-wrapper{margin-top:-25px} 15 .page-header.type6 .header-contact i {margin: 0;}
16     .page-header.type6:not(.header-newskin) .panel.header .switcher{padding:0 15px;border-left:1px solid #ccc} 16 .page-header.type6 .header-contact > * {margin-left: .875rem;}
17     .page-header.type6 .header
.content{display:block;vertical-align:middle;padding:28px 15px
}		 17 .page-header.type6 .header-contact {display: inline-flex;align-items: center;line-height: 22px;font-size: .9em;}
18     .page-header.type6 .logo{float:left;display:block;margin:0 25px 0 0} 18 .page-header.type6 .header-contact .my-account {display: inline-block;padding: 0 .125rem;font-size: 24px;vertical-align: middle;}
19     .page-header.type6 .custom-block{float:right;line-height:50px;margin-right:10px} 19 .page-header.type6 .header-contact .my-account i,.page-header.type6 .header-contact .wishlist i {font-size: 27px;display: block;margin: 0;}
20     .page-header.type6 .search-area{position:relative;margin:0;display:block;float:left;top:0;left:0;height:50px;z-index:2} 20 .page-header.type6 .header-contact p {margin: 0;}
21     .page-header.type6 .search-area>a{color:#08c;line-height:50px;display:block;margin-right:10px;width:25px;text-align:center} 21 
.minicart-wrapper .action.showcart .minicart-icon {font-size: 27px;}
22     .page-header.type6 .search-area>a:hover{color:#08c} 22 .minicart-wrapper .action.showcart .minicart-icon::before {margin: 0;-webkit-font-smoothing: auto;}
23     .page-header.type6 .block-search{display:none;position:absolute;left:-20px;top:100%;margin:0} 23 .minicart-wrapper .block-minicart {border: 1px solid #f0f0f0;}
24     .page-header.type6 .block-search:before{content:"";display:block;position:absolute;top:-20px;left:20px;border:10px solid transparent;border-bottom-color:#ccc} 24 .page-header.type6 .search-area {width: auto;}
25     .page-header.type6 .block-search input{height:45px;border-radius:25px;border:5px solid #ccc} 25 .page-header.type6 .search-area a.search-toggle-icon {width: 40px;height: 40px;line-height: 40px;font-size: 20.6px;}
26     .page-header.type6 .block-search .action.search{right:5px;height:45px;border-left:1px solid #ccc;width:40px} 26 .page-header.type6 .search-area a.search-toggle-icon i::before {font-weight: 600;}
27     .page-header.type6 .block-search .action.search:before{color:#08c} 27 .page-header.type6 .custom-block {margin-left: 0;}
28     .page-header.type6 .minicart-wrapper{position:relative;top:0;margin:0;float:right;height:50px;right:0;padding:5px 0} 28 .page-header.type6 .search-area .minisearch .actions button {width: 38px;height: 35px;line-height: 35px;}
29     .page-header.type6 .minicart-wrapper .action.showcart
{display:block}		 29 .page-header.type6 .search-category {right: 41px !important;height: 37px;line-height: 37px;padding-right: 12px;padding-left: 16px;border-color: #fff;}
30     .page-header.type6 .minicart-wrapper .action.showcart:before,.page-header.type6 .minicart-wrapper .action.showcart.active:before{color:#08c} 30 .page-header.type6 .search-category:after {margin-left: 7px;}
31     .page-header.type6 .minicart-wrapper .action.showcart .counter-label{display:none} 31 .page-header.type6 .block-search input {height: 37px;}
32     .page-header.type6 .nav-sections{pointer-events:none} 32 @media (max-width:991px)
{
33     .page-header.type6 .navigation{padding:10px 0} 33   .page-header.type6 .header-row .header-left {display: none;}
34     .page-header.type6 .navigation>ul{text-align:left} 34   .page-header.type6 .header-row .header-center {padding-left: 0;padding-right: 0;}
35     .page-header.type6 .navigation>ul>li{pointer-events:all;text-align:left} 35   .page-header.type6
 .minicart-wrapper {margin-left: .875rem;}
36     .page-header.type6 .navigation .level0>.level-top{color:#08c;line-height:30px;display:inline-block;transition-delay:0.3s} 36   .page-header.type6 .custom-block {display: none;}
37     .page-header.type6 .navigation .level0.active>.level-top,.page-header.type6 .navigation .level0.has-active>.level-top{color:#fff;background-color:#08c;border-radius:5px}    
38     .page-header.type6 .navigation .level0.parent>a:after{line-height:30px}    
39     .page-header.type6 .navigation .level0.parent:hover>.level-top{border-radius:5px 5px 0 0}    
40     .page-header.type6 .navigation .level0:hover>.level-top{color:#fff;background-color:#08c;border-radius:5px}    
41 }    
42 @media (max-width:767px) {    
43     .page-header.type6 .custom-block {    
44         display: none;    
45     }    
46 }    
47 header.page-header.type6 .search-category select {    
48     border-top-color: transparent;    
49     border-bottom-color: transparent;    
50     border-right: 0;    
51 }    
52     
53 
.page-header.type6.header-newskin .panel.wrapper {
    
54     background-color: #65829D;    
55     color: #fff;    
56 }    
57 
.page-header.type6
.header-newskin {border: none;}		    
58 .page-header.type6.header-newskin .panel.header .header.links {    
59     color: #c4d0dc;    
60     float: none;    
61     text-align: right;    
62     display: block;    
63 }    
64 .page-header.type6 .header.panel > .header.links > li.compare {    
65     float: left;    
66 }    
67 .page-header.type6 .header.panel > .header.links > li.compare > a {    
68     padding-left: 0;    
69 }    
70 .page-header.type6.header-newskin .panel.header .header.links > li > a {    
71     color: #c4d0dc;    
72     border: none;    
73 }    
74 .page-header.type6.header-newskin .minicart-wrapper .action.showcart {    
75     position: relative;    
76     padding: 0 25px 0 0;    
77     line-height: 37px;    
78     color: #606669;    
79 } 37 }
80 .page-header.type6.header-newskin .minicart-wrapper .action.showcart:before, 38 @media only screen and (max-width:767px)
{
81 .page-header.type6.header-newskin .minicart-wrapper .action.showcart.active:before { 39   .page-header.type6 .main-panel-top .separator {display: none;}
82     font-size: 33px;    
83     line-height: 40px;    
84 }    
85 .page-header.type6.header-newskin.sticky-header .minicart-wrapper .action.showcart:before, .page-header.type6.header-newskin.sticky-header .minicart-wrapper .action.showcart.active:before {    
86     font-size: 25px;    
87 }    
88 .page-header.type6.header-newskin .minicart-wrapper .action.showcart:after {    
89     right: 0;    
90     top: 1px;    
91 }    
92 .page-header.type6.header-newskin .minicart-wrapper .block-minicart {    
93     right: -15px;    
94 }    
95 .page-header.type6.header-newskin .minicart-wrapper .action.showcart .counter.qty {    
96     right: 19px;    
97     margin-top: -21px;    
98 }    
99 .page-header.type6.header-newskin .minicart-wrapper .action.showcart .counter.qty {    
100     line-height: 17px;    
101 }    
102 .page-header.type6.header-newskin.sticky-header .minicart-wrapper .action.showcart {    
103     padding-right: 0;    
104 }    
105 .page-header.type6.header-newskin .nav-toggle {    
106     float: right;    
107 }    
108 @media (min-width: 768px) {    
109     .page-header.type6 .sw-megamenu.navigation li.level0.fl-right {    
110         float: none;    
111     }    
112     .page-header.type6.header-newskin .panel.header .switcher {    
113         padding: 0 30px 0 0;    
114         color: #c4d0dc;    
115         text-transform: uppercase;    
116     }    
117     .page-header.type6.header-newskin .header.content {    
118         display: block;    
119         vertical-align: middle;    
120         padding: 28px 15px;    
121     }    
122     .page-header.sticky-header.type19 .nav-sections {    
123         background-color: #fff;    
124     }    
125     .page-header.type6.header-newskin .logo {    
126         float: left;    
127         display: block;    
128         margin: 0 50px 0 0;    
129     }    
130     .page-header.type6.header-newskin .minicart-wrapper {    
131         margin: 0;    
132         float: right;    
133         height: 50px;    
134         right: 0;    
135         padding: 5px 0;    
136     }    
137     .page-header.type6.header-newskin.sticky-header .minicart-wrapper {    
138         width: auto;    
139     }    
140     .page-header.type6.header-newskin.sticky-header .minicart-wrapper .action.showcart:after {    
141         display: none;    
142     }    
143     .page-header.type6.header-newskin.sticky-header .minicart-wrapper .action.showcart .counter.qty {    
144         right: -6px;    
145     }    
146     .page-header.type6.header-newskin:not(.sticky-header) .minicart-wrapper .block-minicart:before {    
147         right: 48px;    
148     }    
149     .page-header.type6.header-newskin:not(.sticky-header) .minicart-wrapper .block-minicart:after {    
150         right: 47px;    
151     }    
152     .page-header.type6.header-newskin .search-area {    
153         position: relative;    
154         margin: 0;    
155         display: block;    
156         float: left;    
157         top: 0;    
158         left: 0;    
159         height: 50px;    
160         z-index: 2;    
161     }    
162     .page-header.type6.header-newskin .search-area > a {    
163         color: #141a1f;    
164         line-height: 50px;    
165         display: block;    
166         margin-right: 10px;    
167         width: 25px;    
168         text-align: center;    
169     }    
170     .page-header.type6.header-newskin .block-search {    
171         display: none;    
172         position: absolute;    
173         left: -20px;    
174         top: 100%;    
175         margin: 0;    
176     }    
177     .page-header.type6.header-newskin .block-search input {    
178         height: 45px;    
179         border: 5px solid #ccc;    
180     }    
181     .page-header.type6.header-newskin .block-search .action.search {    
182         right: 5px;    
183         height: 45px;    
184         border-left: 1px solid #ccc;    
185         width: 40px;    
186     }    
187     .page-header.type6.header-newskin .custom-block {    
188         float: right;    
189         height: 40px;    
190         line-height: 1;    
191         font-size: 11px;    
192         color: #777;    
193         border-right: solid 1px #dde0e2;    
194         padding-right: 35px;    
195         margin-right: 25px;    
196         margin-top:3px;    
197     }    
198     .page-header.type6.header-newskin .custom-block > * {    
199         display: inline-block;    
200         vertical-align: middle;    
201     }    
202     .page-header.type6.header-newskin .custom-block > a {    
203         font-size: 12px;    
204     }    
205     .page-header.type6.header-newskin:not(.sticky-header) .navigation {    
206         padding: 10px 0;    
207     }    
208     .page-header.type6.header-newskin .navigation li.level0 {margin-right: 4px;}    
209     .page-header.type6.header-newskin .navigation li.level0 > .level-top {    
210         font-size: 12px;    
211         font-weight: 700;    
212         letter-spacing: inherit;    
213         line-height: 30px;    
214         display: inline-block;    
215         transition-delay: 0.3s;    
216     }    
217     .page-header.type6.header-newskin .navigation .level0.parent > a:after {    
218         line-height: 30px;    
219     }    
220 }    
221 @media 
(max-width: 991px) {		    
222     .page-header.type6.header-newskin .custom-block {    
223         display: none;    
224     }    
225     header.page-header.type6.header-newskin.sticky-header .navigation li.level0 > .level-top {    
226         padding: 0 10px;    
227     }    
228 } 40 }
229 @media (max-width: 767px) { 41 @media (min-width:992px)
{
230     .page-header.type6.header-newskin .logo { 42   header.page-header.sticky-header .nav-sections {padding-top: 4px;padding-bottom: 4px;}
231         height: 40px; 43   .page-header.type6 {margin: 0 0 8px 0;}
232         float: left; 44   .page-header.type6 .header.panel > .header.links {display: flex;align-items: center;}
233         margin: 10px 0; 45   .page-header.type6 .header.panel > .header.links > li > a {padding-top: 5px;padding-bottom: 5px;padding-left: 12px;padding-right: 12px;line-height: 26px;text-transform: none;}
234     } 46   .page-header.type6 .nav-sections {display: flex;align-items: center;}
235     .page-header.type6.header-newskin .logo img { 47   .page-header.type6 .nav-sections .nav-sections-items {flex: 0 0 100%;}
236         max-width: 100%; 48   .page-header.type6.sticky-header .navigation {display: flex;align-items: center;}
237         max-height: 100%; 49   .page-header.type6 .sticky-logo {margin-top: 0;}
238         width: auto; 50   .page-header.type6 .navigation:not(.side-megamenu) > ul {display: block;}
239     } 51   .page-header.type6.sticky-header .navigation:not(.side-megamenu) > ul {padding-right: 60px;}
240     .page-header.type6.header-newskin:not(.sticky-header) .minicart-wrapper .block-minicart:before { 52   header.page-header.sticky-header .navigation:not(.side-megamenu) li.level0 > a > span.cat-label {top: -4px;}
241         right: 52px; 53   .page-header.type6 .navigation:not(.side-megamenu) .level0 {margin: 0 1px 0 -3px;}
242     } 54   .page-header.type6 .navigation:not(.side-megamenu) .level0:first-child {margin-left: 0;}
243     .page-header.type6.header-newskin:not(.sticky-header) .minicart-wrapper .block-minicart:after { 55   .page-header.type6 .navigation:not(.side-megamenu) .level0:first-child .level-top {padding-left: 0;}
244         right: 51px; 56   .page-header.type6 .navigation:not(.side-megamenu) .level0 .level-top {font-size: 12px;font-weight: 700;line-height: 20px;letter-spacing:-.12px;padding: 8px 13px 8px 13px;}
245     } 57   .page-header .sw-megamenu.navigation li.level0.staticwidth > .submenu .level1 > a,
246     .page-header.type6.header-newskin .custom-block { 58   .page-header .sw-megamenu.navigation li.level0.fullwidth > .submenu .level1 > a {color: #333;}
247         display: none;    
248     }    
249     .page-header.type6.header-newskin .minicart-wrapper {    
250         margin: 10px 0;    
251     }    
252     .page-header.type6.header-newskin .search-toggle-icon {    
253         display: none;    
254     }    
255     .page-header.type6.header-newskin .block-search .label {    
256         float: right;    
257         margin: 16px 0;    
258         margin-right: 12px;    
259     }    
260     .page-header.type6.header-newskin .block-search .label:before {    
261         margin-top: 1px;    
262         margin-bottom: -1px;    
263     }    
264 } 59 }

Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.