178. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2020-08-14 00:01:41 +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.

178.1 Files compared

#LocationFileLast Modified
1Porto v3.2.3/Magento 2.x/Porto Theme/pub/media/porto/web/css/headertype12.css2018-03-09 01:50:14 +0000
2Porto v3.2.4/Magento 2.x/Porto Theme/pub/media/porto/web/css/headertype12.css2018-03-09 01:50:14 +0000

178.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged1372
Changed00
Inserted00
Removed00

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

178.4 Active regular expressions

No regular expressions were active.

178.5 Comparison detail

1 .page-header.type12{border:0;background-color:#fff} 1 .page-header.type12{border:0;background-color:#fff}
2 .page-header.type12 .logo{display:block;margin:25px 25px 25px 0;float:left} 2 .page-header.type12 .logo{display:block;margin:25px 25px 25px 0;float:left}
3 .page-wrapper .page-header.type12.sticky-header { 3 .page-wrapper .page-header.type12.sticky-header {
4     position: fixed; 4     position: fixed;
5     background-color: #000; 5     background-color: #000;
6     z-index: 6; 6     z-index: 6;
7     width: 100%; 7     width: 100%;
8 } 8 }
9 .page-header.type12.sticky-header .header.panel .custom-block > a { 9 .page-header.type12.sticky-header .header.panel .custom-block > a {
10     color: #fff; 10     color: #fff;
11 } 11 }
12 .page-header.type12.sticky-header .header.panel .search-area > a { 12 .page-header.type12.sticky-header .header.panel .search-area > a {
13     color: #fff; 13     color: #fff;
14 } 14 }
15 .page-header.type12.sticky-header .header.panel .top-panel .top-links-area > a { 15 .page-header.type12.sticky-header .header.panel .top-panel .top-links-area > a {
16     color: #fff; 16     color: #fff;
17 } 17 }
18 .page-header.type12:not(.sticky-header) .header.panel .block-search input { 18 .page-header.type12:not(.sticky-header) .header.panel .block-search input {
19     background: transparent; 19     background: transparent;
20 } 20 }
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.sticky-header .header.panel .top-panel .links > li > a, .page-header.type12.sticky-header .header.panel .top-panel .links > li > span {
22     color: #fff; 22     color: #fff;
23 } 23 }
24 .page-header.type12 .logo { 24 .page-header.type12 .logo {
25     max-width: 90px; 25     max-width: 90px;
26 } 26 }
27  27 
28 @media only screen and (max-width:767px){ 28 @media only screen and (max-width:767px){
29     .page-header.type12 .nav-toggle{margin-right:40px;float:right} 29     .page-header.type12 .nav-toggle{margin-right:40px;float:right}
30     .page-header.type12 .logo{height:40px;float:left;margin:10px 0} 30     .page-header.type12 .logo{height:40px;float:left;margin:10px 0}
31     .page-header.type12 .logo img{max-width:100%;max-height:100%;width:auto} 31     .page-header.type12 .logo img{max-width:100%;max-height:100%;width:auto}
32     .page-header.type12 .minicart-wrapper{position:relative;top:auto;right:auto;left:auto;margin:0;float:right} 32     .page-header.type12 .minicart-wrapper{position:relative;top:auto;right:auto;left:auto;margin:0;float:right}
33     .page-header.type12 .search-toggle-icon{display:none} 33     .page-header.type12 .search-toggle-icon{display:none}
34     .page-header.type12 .block-search .label{float:right;margin-right:20px;margin-top:15px} 34     .page-header.type12 .block-search .label{float:right;margin-right:20px;margin-top:15px}
35     .page-header.type12 .bottom-panel{position:absolute;right:10px;top:10px} 35     .page-header.type12 .bottom-panel{position:absolute;right: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} 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} 37     .page-header.type12 .minicart-wrapper .action.showcart .counter.qty{color:#fff}
38 } 38 }
39 @media all and (min-width:768px),print{ 39 @media all and (min-width:768px),print{
40     header.page-header.sticky-header.type12 .header.content{padding:0 50px 0 200px} 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} 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} 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} 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} 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:right;position:absolute;right:50px;top:50%;padding:0 15px;margin-top:-20px;z-index:5} 45     .page-header.type12 .header.panel{text-align:right;position:absolute;right:50px;top:50%;padding:0 15px;margin-top:-20px;z-index:5}
46     .page-header.type12 .header.panel .top-panel{display:inline-block} 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} 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} 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} 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:left;color:#000;margin:0} 50     .page-header.type12 .header.panel .top-panel .links>li{display:block;float:left;color:#000;margin:0}
51     .page-header.type12 .header.panel .top-panel .links>li>a{color:#000} 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} 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} 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-left:0;border-left:0} 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-left:0;border-left:0}
55     .page-header.type12 .header.panel .bottom-panel{display:inline-block;vertical-align:middle;margin-left:15px} 55     .page-header.type12 .header.panel .bottom-panel{display:inline-block;vertical-align:middle;margin-left:15px}
56     .page-header.type12 .header.panel .search-area{display:inline-block;vertical-align:middle;margin:0 15px;position:relative} 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} 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} 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} 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} 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} 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;right:20px;border:10px solid transparent;border-bottom-color:#ccc} 62     .page-header.type12 .header.panel .block-search:before{content:"";display:none;position:absolute;top:-20px;right: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} 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} 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} 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} 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} 67     .page-header.type12 .header.panel .block-search input:-ms-input-placeholder{color:#000}
68     .page-header.type12 .header.panel .block-search .action.search{right:5px;height:40px;width:40px} 68     .page-header.type12 .header.panel .block-search .action.search{right:5px;height:40px;width:40px}
69     .page-header.type12 .header.panel .block-search .action.search:before{color:#000} 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:left;box-shadow:1px 2px 1px rgba(0,0,0,0.3);margin-right:3px} 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:left;box-shadow:1px 2px 1px rgba(0,0,0,0.3);margin-right:3px}
71     .page-header.type12 .header.panel .switcher strong{font-weight:700} 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;right:0;margin:0} 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;right:0;margin:0}
73     .page-header.type12 .header.panel .minicart-wrapper .action.showcart{display:block;margin-top:-2px} 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} 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-left:5px;color:#101010;text-transform:uppercase;font-weight:700} 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-left: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} 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} 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} 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} 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} 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} 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%;left:0;top:0;background:transparent} 82     .cms-index-index .page-header.type12{position:absolute;width:100%;left:0;top:0;background:transparent}
83     .cms-index-index .page-header.type12 .header.content{max-width:none;padding-left:10.5%} 83     .cms-index-index .page-header.type12 .header.content{max-width:none;padding-left:10.5%}
84     .cms-index-index .page-header.type12 .navigation{max-width:none} 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 { 85     .page-header.type12 .header.panel .top-panel .customer-menu .links > li:first-child > a {
86         padding-left: 15px; 86         padding-left: 15px;
87     } 87     }
88     .page-wrapper .page-header.type12 .header.content { 88     .page-wrapper .page-header.type12 .header.content {
89         padding-left: 200px; 89         padding-left: 200px;
90     } 90     }
91 } 91 }
92 @media(max-width:1439px) { 92 @media(max-width:1439px) {
93     .page-header.type12 .header.panel .top-panel .top-links-area { 93     .page-header.type12 .header.panel .top-panel .top-links-area {
94         position: relative; 94         position: relative;
95     } 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 { 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; 97         color: #000;
98     } 98     }
99     .page-header.type12 .header.panel .top-panel .top-links-area > a { 99     .page-header.type12 .header.panel .top-panel .top-links-area > a {
100         display: inline-block; 100         display: inline-block;
101         text-transform: uppercase; 101         text-transform: uppercase;
102         font-size: 11px; 102         font-size: 11px;
103         font-weight: 700; 103         font-weight: 700;
104     } 104     }
105      105     
106     .page-header.type12 .header.panel .top-panel .top-links-area .links { 106     .page-header.type12 .header.panel .top-panel .top-links-area .links {
107         position: absolute; 107         position: absolute;
108         left: -10px; 108         left: -10px;
109         top: 100%; 109         top: 100%;
110         text-align: left; 110         text-align: left;
111         background-color: #fff; 111         background-color: #fff;
112         padding: 10px; 112         padding: 10px;
113         border-radius: 5px; 113         border-radius: 5px;
114         box-shadow: 0 0 3px rgba(0,0,0,0.25); 114         box-shadow: 0 0 3px rgba(0,0,0,0.25);
115         margin-top: 10px; 115         margin-top: 10px;
116         display: none; 116         display: none;
117     } 117     }
118      118     
119     .page-header.type12 .header.panel .top-panel .top-links-area .links:before { 119     .page-header.type12 .header.panel .top-panel .top-links-area .links:before {
120         content: ""; 120         content: "";
121         border: 6px solid; 121         border: 6px solid;
122         border-color: transparent transparent #fff transparent; 122         border-color: transparent transparent #fff transparent;
123         z-index: 99; 123         z-index: 99;
124         position: absolute; 124         position: absolute;
125         left: 10px; 125         left: 10px;
126         top: -12px; 126         top: -12px;
127     } 127     }
128      128     
129     .page-header.type12 .header.panel .top-panel .top-links-area .links:after { 129     .page-header.type12 .header.panel .top-panel .top-links-area .links:after {
130         border: 7px solid; 130         border: 7px solid;
131         border-color: transparent transparent #bbb transparent; 131         border-color: transparent transparent #bbb transparent;
132         z-index: 98; 132         z-index: 98;
133         content: ""; 133         content: "";
134         position: absolute; 134         position: absolute;
135         left: 9px; 135         left: 9px;
136         top: -14px; 136         top: -14px;
137     } 137     }
138      138     
139     .page-header.type12 .header.panel .top-panel .top-links-area .links > li { 139     .page-header.type12 .header.panel .top-panel .top-links-area .links > li {
140         float: none; 140         float: none;
141         white-space: nowrap; 141         white-space: nowrap;
142     } 142     }
143      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 { 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; 145         padding: 0;
146     } 146     }
147 } 147 }
148 @media(max-width:1199px) { 148 @media(max-width:1199px) {
149     .page-header.type12 .header.content .header.panel { 149     .page-header.type12 .header.content .header.panel {
150         margin-top: -13px; 150         margin-top: -13px;
151     } 151     }
152     .page-header.type12 .header.panel .top-panel .search-area { 152     .page-header.type12 .header.panel .top-panel .search-area {
153         margin: 0; 153         margin: 0;
154     } 154     }
155     .page-header.type12 .header.panel .top-panel .search-area > a { 155     .page-header.type12 .header.panel .top-panel .search-area > a {
156         display: inline-block; 156         display: inline-block;
157     } 157     }
158     .page-header.type12 .header.panel .top-panel .search-area > .block-search { 158     .page-header.type12 .header.panel .top-panel .search-area > .block-search {
159         display: none; 159         display: none;
160         position: absolute; 160         position: absolute;
161         right: -15px; 161         right: -15px;
162         top: 100%; 162         top: 100%;
163         margin-top: 10px; 163         margin-top: 10px;
164     } 164     }
165     .page-header.type12 .header.panel .top-panel .block-search input { 165     .page-header.type12 .header.panel .top-panel .block-search input {
166         background-color: #fff; 166         background-color: #fff;
167     } 167     }
168 } 168 }
169 @media(max-width:767px) { 169 @media(max-width:767px) {
170     .cms-index-index .page-header.type12 { 170     .cms-index-index .page-header.type12 {
171         position: absolute; 171         position: absolute;
172         width: 100%; 172         width: 100%;
173         left: 0; 173         left: 0;
174         top: 0; 174         top: 0;
175         background: transparent; 175         background: transparent;
176     } 176     }
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 { 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 {
178         display: none; 178         display: none;
179     } 179     }
180     .page-header.type12 .header.panel .top-panel .search-area > .block-search { 180     .page-header.type12 .header.panel .top-panel .search-area > .block-search {
181         display: inline-block; 181         display: inline-block;
182         position: static; 182         position: static;
183         float: right; 183         float: right;
184         margin: 0; 184         margin: 0;
185     } 185     }
186 } 186 }