540. Araxis Merge File Comparison Report

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

540.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/headertype12.rtl.css2018-03-09 01:50:28 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/pub/media/porto/web/css/headertype12.rtl.css2021-03-25 02:55:16 +0000

540.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged410
Changed4238
Inserted00
Removed00

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

540.4 Active regular expressions

No regular expressions were active.

540.5 Comparison detail

1 .page-header.type12{border:0;background-color:#fff} 1 .font-size-lg {font-size: 1.1em!important;}
2 .page-header.type12 .logo{display:block;margin:25px 0 25px 25px;float:right} 2 .main-panel-top {border-bottom: 1px solid #e7e7e7;}
3 .page-wrapper .page-header.type12.sticky-header { 3 .page-header.type12 .panel.wrapper .header-left > *,.page-header.type12 .panel.wrapper .header-right > * {margin-right: .875rem;}
4     position: fixed; 4 .page-header.type12 .panel.wrapper .header-left > *:first-child,.page-header.type12 .panel.wrapper .header-right > *:first-child {margin-right: 0;}
5     background-color: #000; 5 .page-header.type12 .panel.wrapper .header-right {color: #222529;}
6     z-index: 6; 6 .page-header.type12 .panel.wrapper .header-left > .separator,.page-header.type12 .panel.wrapper .header-right > .separator {height: 2em;border-right: 1px solid rgba(0,0,0,.04);}
7     width: 100%; 7 .page-header.type12 .panel.wrapper {padding-top: 5px;padding-bottom: 5px;min-height: 50px;}
8 } 8 
.page-header.type12 .panel.header .switcher:last-child {margin-left: 0;
}
9 .page-header.type12.sticky-header .header.panel .custom-block > a { 9 .page-header.type12 .switcher:first-child .options .action.toggle {padding-right: 0;}
10     color: #fff; 10 .page-header.type12 .panel.wrapper .custom-block {line-height: 30px;letter-spacing: .28333px;font-weight: 700;}
11 } 11 .page-header.type12 .panel.wrapper .custom-block i::before {font-weight: 600;}
12 .page-header.type12.sticky-header .header.panel .search-area > a { 12 .page-header.type12 .panel.wrapper .search-area {width: auto;color: inherit;}
13     color: #fff; 13 .page-header.type12 .panel.wrapper .search-area a.search-toggle-icon {font-size: 15px;color: inherit;}
14 } 14 .page-header.type12 .panel.wrapper .search-area a.search-toggle-icon i::before {font-weight: 600;}
15 .page-header.type12.sticky-header .header.panel .top-panel .top-links-area > a { 15 
.page-header.type12 .
panel.header .top-links-icon::after {display: none;}
16     color: #fff; 16 
.page-header.type12 .
panel.header .top-
links-icon {padding: 0;
}
17 } 17 .page-header.type12 .panel.header .top-links-icon a {font-size: 19px;line-height: 1;width: 30px;text-align: center;display: block;color: inherit;}
18 .page-header.type12:not(.sticky-header) .header.panel .block-search input { 18 .page-header.type12 .panel.header.show-icon .header.links {margin-top: 10px;left: -11px;}
19     background: transparent; 19 .page-header.type12 .header-contact .wishlist {font-size: 19px;line-height: 1;width: 30px;text-align: center;display: block;color: inherit;}
20 } 20 
.page-header.type12 .header-contact .wishlist i {margin: 0;
}
21 .page-header.type12.sticky-header .header.panel .top-panel .links > li > a, .page-header.type12.sticky-header .header.panel .top-panel .links > li > span { 21 .page-header.type12 .minicart-wrapper .action.showcart {justify-content: center;min-width: 32px;}
22     color: #fff; 22 .page-header.type12 .minicart-wrapper .action.showcart .minicart-icon {font-size: 19px;position: relative;}
23 } 23 
.page-header.type12 .
minicart-wrapper .action.showcart::after {display: none;
}
24 .page-header.type12 .logo { 24 
.page-header.type12 .
minicart-wrapper .action.showcart .counter.qty {left: -1px;top: -2px;box-shadow: -1px 1px 2px 0 rgb(0 0 0 / 30%);
}
25     max-width: 90px; 25 .page-header.type12 .search-area .block.block-search {box-shadow: 0 5px 8px rgb(0 0 0 / 10%);}
26 } 26 .page-header.type12 .search-area .minisearch .actions button {width: 46px;}
27  27 .page-header.type12 .search-category {right: 46px !important;}
28 @media only screen and (max-width:767px){ 28 
.page-header.type12 .header-row .header-center {flex: inherit;}
29     .page-header.type12 .nav-toggle{margin-left:40px;float:left} 29 @media (max-width:991px)
{
30     .page-header.type12 .logo{height:40px;float:right;margin:10px 0} 30   .page-header.type12 .separator, .page-header.type12 .custom-top-html {
31     .page-header.type12 .logo img{max-width:100%;max-height:100%;width:auto}    
32     .page-header.type12 .minicart-wrapper{position:relative;top:auto;left:auto;right:auto;margin:0;float:left}    
33     .page-header.type12 .search-toggle-icon{display:none}    
34     .page-header.type12 .block-search .label{float:left;margin-left:20px;margin-top:15px}    
35     .page-header.type12 .bottom-panel{position:absolute;left:10px;top:10px}    
36     .page-header.type12 .nav-toggle:before,.page-header.type12 .nav-toggle:hover:before,.page-header.type12 .block-search .label:before,.page-header.type12 .minicart-wrapper .action.showcart:before,.page-header.type12 .minicart-wrapper .action.showcart.active:before{color:#000}    
37     .page-header.type12 .minicart-wrapper .action.showcart .counter.qty{color:#fff}    
38 }    
39 @media all and (min-width:768px),print{    
40     header.page-header.sticky-header.type12 .header.content{padding:0 50px 0 200px}    
41     header.page-header.sticky-header.type12 .nav-sections{background-color:#5c616e}    
42     header.page-header.sticky-header.type12 .minicart-wrapper .action.showcart:before{color:#fff}    
43     header.page-header.sticky-header.type12 .minicart-wrapper .action.showcart .counter.qty{color:#000}    
44     .page-header.type12 .nav-sections{display:none;margin:38px 0 0;z-index:6;position:relative}    
45     .page-header.type12 .header.panel{text-align:left;position:absolute;left:50px;top:50%;padding:0 15px;margin-top:-20px;z-index:5}    
46     .page-header.type12 .header.panel .top-panel{display:inline-block}    
47     .page-header.type12 .header.panel .top-links-area{display:inline-block;vertical-align:middle}    
48     .page-header.type12 .header.panel
 .top-links-area>a{display:
none
}		    
49     .page-header.type12 .header.panel
 .top-panel .links
{padding:
0;list-style:none}		    
50     .page-header.type12 .header.panel .top-panel .links>li{display:block;float:right;color:#000;margin:0}    
51     .page-header.type12 .header.panel .top-panel .links>li>a{color:#000}    
52     .page-header.type12 .header.panel .top-panel .links>li>a:hover{color:#000}    
53     .page-header.type12 .header.panel .top-panel .links>li>a,.page-header.type12 .header.panel .top-panel .links>li>span{padding:0 15px;text-transform:uppercase;font-size:11px;font-weight:700}    
54     .page-header.type12 .header.panel .top-panel .links>li:first-child>a,.page-header.type12 .header.panel .top-panel .links>li:first-child>span{padding-right:0;border-right:0}    
55     .page-header.type12 .header.panel .bottom-panel{display:inline-block;vertical-align:middle;margin-right:15px}    
56     .page-header.type12 .header.panel .search-area{display:inline-block;vertical-align:middle;margin:0 15px;position:relative}    
57     .page-header.type12 .header.panel .search-area>a{color:#000;display:none}    
58     .page-header.type12 .header.panel .search-area>a:hover{color:#000}    
59     .page-header.type12 .header.panel .custom-block{display:inline-block;vertical-align:middle;margin:0 15px}    
60     .page-header.type12 .header.panel .custom-block>a{font-size:17px;padding:0;margin:0 3px}    
61     .page-header.type12 .header.panel .block-search{margin:
0;width:200px}		    
62     .page-header.type12 .header.panel .block-search:before{content:"";display:none;position:absolute;top:-20px;left:20px;border:10px solid transparent;border-bottom-color:#ccc}    
63     .page-header.type12 .header.panel .block-search input{height:40px;border-radius:25px;border:1px solid #000;background-color:#fff;color:#000}    
64     .page-header.type12 .header.panel .block-search input::-webkit-input-placeholder{color:#000}    
65     .page-header.type12 .header.panel .block-search input::-moz-placeholder{color:#000}    
66     .page-header.type12 .header.panel .block-search input:-moz-placeholder{color:#000}    
67     .page-header.type12 .header.panel .block-search input:-ms-input-placeholder{color:#000}    
68     .page-header.type12 .header.panel .block-search .action.search{left:5px;height:40px;width:40px}    
69     .page-header.type12 .header.panel .block-search .action.search:before{color:#000}    
70     .page-header.type12 .header.panel .switcher{float:none;padding:5px 10px;background-color:#fff;height:26px;border-radius:3px;color:#101010;text-transform:uppercase;text-align:right;box-shadow:1px 2px 1px rgba(0,0,0,0.3);margin-left:3px}    
71     .page-header.type12 .header.panel .switcher strong{font-weight:700}    
72     .page-header.type12 .header.panel .minicart-wrapper{display:inline-block;position:relative;padding:5px 10px;background-color:#fff;vertical-align:middle;border-radius:3px;box-shadow:1px 2px 1px rgba(0,0,0,0.3);top:0;left:0;margin:0}    
73     .page-header.type12 .header.panel .minicart-wrapper .action.showcart
{display:block;margin-top:-2px}		    
74     .page-header.type12 .header.panel .minicart-wrapper .action.showcart:before,.page-header.type12 .header.panel .minicart-wrapper .action.showcart.active:before{color:#101010;line-height:14px;font-size:14px;overflow:visible;vertical-align:middle}    
75     .page-header.type12 .header.panel .minicart-wrapper .action.showcart .counter.qty{position:static;vertical-align:middle;margin:0;padding:0;font-size:11px;height:auto;line-height:14px;width:auto;min-width:0;margin-right:5px;color:#101010;text-transform:uppercase;font-weight:700}    
76     .page-header.type12 .header.panel .minicart-wrapper .action.showcart .counter-label{display:inline-block;position:static;overflow:visible;width:auto}    
77     .page-header.type12 .navigation .level0>.level-top{color:#fff;line-height:32px;display:inline-block}    
78     .page-header.type12 .navigation .level0.active>.level-top,.page-header.type12 .navigation .level0.has-active>.level-top{color:#fff;background-color:transparent;border-radius:5px}    
79     .page-header.type12 .navigation .level0.parent>a:after{line-height:32px}    
80     .page-header.type12 .navigation .level0.parent:hover>.level-top{border-radius:5px 5px 0 0}    
81     .page-header.type12 .navigation .level0:hover>.level-top{color:#fff;background-color:transparent;border-radius:5px}    
82     .cms-index-index .page-header.type12{position:absolute;width:100%;right:0;top:0;background:transparent}    
83     .cms-index-index .page-header.type12 .header.content{max-width:none;padding-right:10.5%}    
84     .cms-index-index .page-header.type12 .navigation{max-width:none}    
85     .page-header.type12 .header.panel .top-panel .customer-menu .links > li:first-child > a {    
86         padding-right: 15px;    
87     }    
88     .page-wrapper .page-header.type12 .header
.content {
    
89         padding-right: 200px;    
90     }    
91 }    
92 @media
(max-width:1439px) {		    
93     .page-header.type12 .header.panel .top-panel .top-links-area {    
94         position: relative;    
95     }    
96     .page-header.type12.sticky-header .header.panel .top-panel .links > li > a, .page-header.type12.sticky-header .header.panel .top-panel .links > li > span {    
97         color: #000;    
98     }    
99     .page-header.type12 .header.panel .top-panel .top-links-area > a {    
100         display: inline-block;    
101         text-transform: uppercase;    
102         font-size: 11px;    
103         font-weight: 700;    
104     }    
105         
106     .page-header.type12 .header.panel .top-panel .top-links-area .links {    
107         position: absolute;    
108         right: -10px;    
109         top: 100%;    
110         text-align: right;    
111         background-color: #fff;    
112         padding: 10px;    
113         border-radius: 5px;    
114         box-shadow: 0 0 3px rgba(0,0,0,0.25);    
115         margin-top: 10px;    
116         display: none; 31       display: none;
117     } 32   }
118      33   .page-header.type12 .header-main .header-left {min-width: auto;flex: inherit;}
119     .page-header.type12 .header.panel .top-panel .top-links-area .links:before { 34   .page-header.type12 .header-row .header-center {justify-content: flex-start;}
120         content: "";    
121         border: 6px solid;    
122         border-color: transparent transparent #fff transparent;    
123         z-index: 99;    
124         position: absolute;    
125         right: 10px;    
126         top: -12px;    
127     }    
128         
129     .page-header.type12 .header.panel .top-panel .top-links-area .links:after {    
130         border: 7px solid;    
131         border-color: transparent transparent #bbb transparent;    
132         z-index: 98;    
133         content: "";    
134         position: absolute;    
135         right: 9px;    
136         top: -14px;    
137     }    
138         
139     .page-header.type12 .header.panel .top-panel .top-links-area .links > li {    
140         float: none;    
141         white-space: nowrap;    
142     }    
143         
144     .page-header.type12 .header.panel .top-panel .top-links-area .links > li > a, .page-header.type12 .header.panel .top-panel .top-links-area .links > li > span {    
145         padding: 0;    
146     }    
147 } 35 }
148 @media
(max-width:1199px) {		 36 @media (max-width: 1219px) {
149     .page-header.type12 .header.content .header.panel { 37   page-header.type12 .navigation:not(.side-megamenu) .level0 .level-top {padding: 15px 14.5px 15px 14.5px;}
150         margin-top: -13px;    
151     }    
152     .page-header.type12 .header.panel .top-panel .search-area {    
153         margin: 0;    
154     }    
155     .page-header.type12 .header.panel .top-panel .search-area > a {    
156         display: inline-block;    
157     }    
158     .page-header.type12 .header.panel .top-panel .search-area > .block-search {    
159         display: none;    
160         position: absolute;    
161         left: -15px;    
162         top: 100%;    
163         margin-top: 10px;    
164     }    
165     .page-header.type12 .header.panel .top-panel .block-search input {    
166         background-color: #fff;    
167     }    
168 } 38 }
169 @media
(max-width:767px) {		 39 @media (min-width:992px) {
170     .cms-index-index .page-header.type12 { 40 .page-header.type12 .header-row .header-center { padding-top: 35.2px;padding-bottom: 35px;}
171         position: absolute; 41 .page-header.type12 .sections.nav-sections {position: absolute;width: 100%;}
172         width: 100%; 42 .page-header.type12 .navigation {padding: 0;position: static;}
173         right: 0; 43 .page-header.type12 .navigation:not(.side-megamenu) > ul {display: block;align-items: center;flex-wrap: wrap;position: static;}
174         top: 0; 44 .page-header.type12 .navigation:not(.side-megamenu) .level0 {margin: 0 0 0 1px;}
175         background: transparent; 45 .page-header.type12 .navigation:not(.side-megamenu) .level0 .level-top {
176     } 46   font-family: Poppins,sans-serif;
177     .page-header.type12 .header.panel .top-panel .top-links-area, .page-header.type12 .header.panel .top-panel .custom-block, .page-header.type12 .header.panel .top-panel .search-area > a { 47   font-size: 14px;
178         display: none; 48   font-weight: 600;
179     } 49   line-height: 20px;
180     .page-header.type12 .header.panel .top-panel .search-area > .block-search { 50   letter-spacing: 0;
181         display: inline-block; 51   padding: 20px 14.5px 20px 14.5px;
182         position: static; 52   text-transform: capitalize;
183         float: left; 53 
}
184         margin: 0; 54 .page-header.type12 .navigation:not(.side-megamenu) .level0:first-child .level-top {padding-right: 0;}
185     } 55 .page-header .sw-megamenu.navigation li.level0.staticwidth > .submenu .level1 > a,
    56 .page-header .sw-megamenu.navigation li.level0.fullwidth > .submenu .level1 > a {color: #333;}
    57 .page-header.type12.sticky-header .header-main {position: fixed;top:0;width: 100%;box-shadow: 0 1px 0 0 rgb(0 0 0 / 6%);z-index: 12;}
    58 header.page-header.type12.sticky-header .nav-sections {position: absolute !important;top:auto !important;z-index: 1 !important;box-shadow: none;}
    59 .page-header.type12.sticky-header .header-row .header-center { padding-top: 18px;padding-bottom: 18px;}
    60 .page-header.type12.sticky-header .logo {max-width: 100px;}
    61 .page-header.type12.sticky-header .logo img {transform: scale(.8);transform-origin: center center;}
186 } 62 }

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