215. Araxis Merge File Comparison Report

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

215.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_CatalogSearch/web/css/source_module.less2016-06-18 15:23:20 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_CatalogSearch/web/css/source_module.less2021-03-12 09:54:52 +0000

215.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged5476
Changed36
Inserted11
Removed00

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

215.4 Active regular expressions

No regular expressions were active.

215.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 @autocomplete-background: @color-white; 6 @autocomplete-background: @color-white;
7 @autocomplete-border: 1px solid @form-element-input__border-color; 7 @autocomplete-border: 1px solid @form-element-input__border-color;
8 @autocomplete-item-border: 1px solid @color-gray90; 8 @autocomplete-item-border: 1px solid @color-gray90;
9 @autocomplete-item-hover: @color-gray91; 9 @autocomplete-item-hover: @color-gray91;
10 @autocomplete-item-amount-color: @color-gray60; 10 @autocomplete-item-amount-color: @color-gray60;
11  11 
12 // 12 //
13 //    Common 13 //    Common
14 //-------------------------------------- 14 //--------------------------------------
15  15 
16 & when (@media-common = true) { 16 & when (@media-common = true) {
17  17 
18 .block-search { 18 .block-search {
19     margin-bottom: 0; 19     margin-bottom: 0;
20     .block { 20     .block {
21         &-title { 21         &-title {
22             display: none; 22             display: none;
23         } 23         }
24     } 24     }
25     .block-content { 25     .block-content {
26         margin-bottom: 0; 26         margin-bottom: 0;
27     } 27     }
28     .label { 28     .label {
29         .lib-icon-font( 29         .lib-icon-font(
30             @_icon-font-content: @icon-search, 30             @_icon-font-content: @icon-search,
31             @_icon-font-size: 22px, 31             @_icon-font-size: 22px,
32             @_icon-font-line-height: 28px, 32             @_icon-font-line-height: 28px,
33             @_icon-font-margin: 0 @indent__s 0 0, 33             @_icon-font-margin: 0 @indent__s 0 0,
34             @_icon-font-color: @minicart-icons-color, 34             @_icon-font-color: @minicart-icons-color,
35             @_icon-font-color-hover: @minicart-icons-color-hover, 35             @_icon-font-color-hover: @minicart-icons-color-hover,
36             @_icon-font-color-active: @minicart-icons-color-hover, 36             @_icon-font-color-active: @minicart-icons-color-hover,
37             @_icon-font-text-hide: true 37             @_icon-font-text-hide: true
38         ); 38         );
39         display: inline-block; 39         display: inline-block;
40         float: right; 40         float: right;
41         &.active { 41         &.active {
42             + .control { 42             + .control {
43                 input { 43                 input {
44                     position: static; 44                     position: static;
45                 } 45                 }
46             } 46             }
47         } 47         }
48     } 48     }
49     .action.search { 49     .action.search {
50         display: none; 50         display: none;
51     } 51     }
52     .control { 52     .control {
53         clear: both; 53         clear: both;
54         margin: 0 -@layout__width-xs-indent -1px; 54         margin: 0 -@layout__width-xs-indent -1px;
55         padding: 0 @layout__width-xs-indent; 55         padding: 0 @layout__width-xs-indent;
56     } 56     }
57  57 
58     input { 58     input {
59         left: -300%; 59         left: -300%;
60         position: absolute; 60         position: absolute;
61         margin: 15px 0; 61         margin: 15px 0;
62     } 62     }
63     .nested { 63     .nested {
64         display: none; 64         display: none;
65     } 65     }
66 } 66 }
67  67 
68 .search-autocomplete { 68 .search-autocomplete {
69     display: none; 69     display: none;
70     position: absolute; 70     position: absolute;
71     z-index: 3; 71     z-index: 3;
72     overflow: hidden; 72     overflow: hidden;
73     margin-top: -15px; 73     margin-top: -15px;
74     &:extend(.abs-add-box-sizing all); 74     &:extend(.abs-add-box-sizing all);
75     ul { 75     ul {
76         .lib-list-reset-styles(); 76         .lib-list-reset-styles();
77         &:not(:empty) { 77         &:not(:empty) {
78             .lib-css(background, @autocomplete-background); 78             .lib-css(background, @autocomplete-background);
79             .lib-css(border, @autocomplete-border); 79             .lib-css(border, @autocomplete-border);
80             border-top: 0; 80             border-top: 0;
81         } 81         }
82         li { 82         li {
83             .lib-css(border-top, @autocomplete-item-border); 83             .lib-css(border-top, @autocomplete-item-border);
84             cursor: pointer; 84             cursor: pointer;
85             padding: @indent__xs @indent__xl @indent__xs @indent__s; 85             padding: @indent__xs @indent__xl @indent__xs @indent__s;
86             margin: 0; 86             margin: 0;
87             position: relative; 87             position: relative;
88             text-align: left; 88             text-align: left;
89             white-space: normal; 89             white-space: normal;
90             &:first-child { 90             &:first-child {
91                 border-top: none; 91                 border-top: none;
92             } 92             }
93             &:hover, 93             &:hover,
94             &.selected { 94             &.selected {
95                 .lib-css(background, @autocomplete-item-hover); 95                 .lib-css(background, @autocomplete-item-hover);
    96                 color:#777;
96             } 97             }
97             .amount { 98             .amount {
98                 .lib-css(color, @autocomplete-item-amount-color); 99                 .lib-css(color, @autocomplete-item-amount-color);
99                 position: absolute; 100                 position: absolute;
100                 right: 7px; 101                 right: 7px;
101                 top: @indent__xs; 102                 top: @indent__xs;
102             } 103             }
103         } 104         }
104     } 105     }
105 } 106 }
106  107 
107 .form.search.advanced { 108 .form.search.advanced {
108     &:extend(.abs-forms-general-desktop all); 109     &:extend(.abs-forms-general-desktop all);
109      110 
110     display: block; 111     display: block;
111     border: 1px solid #ececec; 112     border: 1px solid #ececec;
112     border-radius: 8px; 113     border-radius: 8px;
113     background: #fff; 114     background: #fff;
114     border-top: 4px solid @theme-color; 115     border-top: 4px solid @theme-color;
115     padding: 35px 25px; 116     padding: 35px 25px;
116     box-shadow: 0 2px 3px rgba(0,0,0,0.08); 117     box-shadow: 0 2px 3px rgba(0,0,0,0.08);
117      118 
118     .fields.range { 119     .fields.range {
119         .field { 120         .field {
120             &:first-child { 121             &:first-child {
121                 position: relative; 122                 position: relative;
122                 .control { 123                 .control {
123                     padding-right: 25px; 124                     padding-right: 25px;
124                     &:after { 125                     &:after {
125                         content: ' \2013 '; 126                         content: ' \2013 ';
126                         display: inline-block; 127                         display: inline-block;
127                         text-align: center; 128                         text-align: center;
128                         width: 25px; 129                         width: 25px;
129                         position: absolute; 130                         position: absolute;
130                         right: 0; 131                         right: 0;
131                         top: 6px; 132                         top: 6px;
132                     } 133                     }
133                 } 134                 }
134             } 135             }
135             &:last-child { 136             &:last-child {
136                 position: relative; 137                 position: relative;
137                 div.mage-error[generated] { 138                 div.mage-error[generated] {
138                     position: absolute; 139                     position: absolute;
139                     top: 32px; 140                     top: 32px;
140                     left: 0; 141                     left: 0;
141                 } 142                 }
142             } 143             }
143             &.with-addon { 144             &.with-addon {
144                 .control { 145                 .control {
145                     padding-right: 45px; 146                     padding-right: 45px;
146                 } 147                 }
147             } 148             }
148             &.date { 149             &.date {
149                 &:extend(.abs-field-date all); 150                 &:extend(.abs-field-date all);
150             } 151             }
151         } 152         }
152     } 153     }
153     .group.price { 154     .group.price {
154         .addon { 155         .addon {
155             .addafter { 156             .addafter {
156                 background: none; 157                 background: none;
157                 border: 0; 158                 border: 0;
158                 padding-top: 6px; 159                 padding-top: 6px;
159                 position: absolute; 160                 position: absolute;
160                 right: 0; 161                 right: 0;
161                 top: 0; 162                 top: 0;
162             } 163             }
163         } 164         }
164     } 165     }
165 } 166 }
166  167 
167 .search-terms { 168 .search-terms {
168    &:extend(.abs-reset-list all); 169    &:extend(.abs-reset-list all);
169    line-height: 2em; 170    line-height: 2em;
170    > li { 171    > li {
171         display: inline-block; 172         display: inline-block;
172         margin-right: @indent__s; 173         margin-right: @indent__s;
173    } 174    }
174 } 175 }
175  176 
176 } 177 }
177  178 
178 // 179 //
179 //    Mobile 180 //    Mobile
180 //-------------------------------------- 181 //--------------------------------------
181 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) { 182 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
182     .block-search { 183     .block-search {
183  184 
184     } 185     }
185 } 186 }
186  187 
187 // 188 //
188 //    Desktop 189 //    Desktop
189 //-------------------------------------- 190 //--------------------------------------
190 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { 191 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
191     .block-search { 192     .block-search {
192         position: relative; 193         position: relative;
193         margin-left: 40px; 194         margin-left: 40px;
194         width: 450px; 195         width: 450px;
195         z-index: 4; 196         z-index: 4;
196         display: inline-block; 197         display: inline-block;
197         vertical-align: middle; 198         vertical-align: middle;
198         .label { 199         .label {
199             &:extend(.abs-visually-hidden-desktop all); 200             &:extend(.abs-visually-hidden-desktop all);
200         } 201         }
201         .control { 202         .control {
202             border-top: 0; 203             border-top: 0;
203             margin: 0; 204             margin: 0;
204             padding: 0; 205             padding: 0;
205         } 206         }
206         .nested { 207         .nested {
207             display: none; 208             display: none;
208             padding-top: 5px; 209             padding-top: 5px;
209             position: absolute; 210             position: absolute;
210         } 211         }
211         input { 212         input {
212             position: static; 213             position: static;
213             margin: 0; 214             margin: 0;
214             border-color: transparent; 215             border-color: transparent;
215             height: 40px; 216             height: 40px;
216             border-radius: 20px; 217             border-radius: 20px;
217             padding: 10px 50px 10px 20px; 218             padding: 10px 50px 10px 20px;
218              219 
219             .lib-input-placeholder(@form-element-input-placeholder__color); 220             .lib-input-placeholder(@form-element-input-placeholder__color);
220         } 221         }
221         .action.search { 222         .action.search {
222             position: absolute; 223             position: absolute;
223             display: inline-block; 224             display: inline-block;
224             right: 2px; 225             right: 2px;
225             top: 0; 226             top: 0;
226             z-index: 1; 227             z-index: 1;
227             height: 40px; 228             height: 40px;
228             .lib-button-icon( 229             .lib-button-icon(
229                 @_icon-font-content: @icon-search, 230                 @_icon-font-content: @icon-search,
230                 @_icon-font-text-hide: true, 231                 @_icon-font-text-hide: true,
231                 @_icon-font-color: @header-icons-color, 232                 @_icon-font-color: @header-icons-color,
232                 @_icon-font-size: 14px 233                 @_icon-font-size: 14px
233             ); 234             );
234             .lib-button-reset(); 235             .lib-button-reset();
235             line-height: 40px; 236             line-height: 40px;
236         } 237         }
237     } 238     }
238     .search-autocomplete { 239     .search-autocomplete {
239         margin-top: 0; 240         margin-top: 0;
240     } 241     }
241 } 242 }