286. Araxis Merge File Comparison Report

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

286.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/Smartwave_Filterproducts/web/css/source_module.less2018-05-22 21:11:00 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Filterproducts/web/css/source_module.less2021-03-27 08:08:54 +0000

286.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged2880
Changed14182
Inserted668
Removed738

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

286.4 Active regular expressions

No regular expressions were active.

286.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 & when (@media-common = true) { 5 & when (@media-common = true) {
6     .filterproducts.products { 6     .filterproducts.products {
7         margin: 0; 7         margin: 0;
8     } 8     }
9     .filterproduct-title { 9     p.fullwidth-filter-description {
10         background: url(../images/slider-bar.png) right no-repeat; 10         font-size: 14px;
11         font-size: 16px; 11         color: #666;
12         font-weight: 300; 12         line-height: 1.4;
13         line-height: 42px; 13     }
14         margin: 0; 14     .section-title, .slider-title,
    15     .widget .widget-title,
    16     .widget .widget-title a {
15         color: #313131; 17       color: #313131;
    18     }
    19     .slider-title, .section-title {
    20         font-size: 1.1429em;
    21         line-height: 1.4;
    22         letter-spacing: normal;
    23         font-weight: 700;
16         text-transform: uppercase; 24         text-transform: uppercase;
17         text-align: left; 25         margin-top: 0;
18          26         margin-bottom: 1.25rem;
19         .content { 27         position: relative;
20             background-color: #fff; 28 
21             padding-right: 20px; 29         .line {
22             display: inline; 30             display: block;
    31             height: 1px;
    32             position: relative;
    33             bottom: 0.65em;
    34             width: 0;
23         } 35         }
24     } 36     }
25     h3.fullwidth-filter-title { 37     .porto-products.title-border-bottom > .section-title,
26         font-size: 28px; 38     .related.products .slider-title {
27         color: #000; 39         letter-spacing: -0.01em;
28         line-height: 1.2; 40         line-height: 22px;
    41         padding-bottom: 10px;
    42         margin-bottom: 24px;
29     } 43     }
30     p.fullwidth-filter-description { 44     .porto-products.title-border-bottom, .related.products {
31         font-size: 14px; 45         .products-slider.show-dots-title-right {
32         color: #666; 46             .owl-dots {
33         line-height: 1.4; 47                 top: -52px;
    48                 
height: 32px;
34     } 49             }
35     .owl-top-narrow .owl-theme .owl-controls {    
36         position: absolute;    
37         right: 0;    
38         top: -37px;    
39         margin: 0;    
40             
41         .owl-nav [class*=owl-] {    
42             font-size: 18px;    
43             margin: 0;    
44             padding: 0;    
45         } 50         }
    51         .products-slider.show-nav-title .owl-nav {
    52             margin-top: -36px;
46     } 53         }
47     .owl-middle-narrow .owl-theme, .owl-middle-narrow.owl-theme {    
48         .owl-controls {    
49             margin: 0;    
50             position: absolute;    
51             top: 50%;    
52             left: 0;    
53             width: 100%;    
54             margin-top: -37px;    
55             visibility: hidden;    
56             opacity: 0;    
57             transition: all 0.2s;    
58             pointer-events: none;    
59     
60             .owl-dots .owl-dot {    
61                 pointer-events: all;    
62             } 54     }
    55     .porto-products.title-border-middle {
    56       >.section-title  {
    57         display: flex;
    58         flex-direction: row;
    59         flex-wrap: nowrap;
    60         align-items: center;
    61         margin-bottom: 24px;
    62         .line-l {
    63           height: 1px;
    64           position: relative;
    65           flex: 1 1 auto;
    66           min-width: 10%;
    67           background: rgba(0,0,0,.08);
63         } 68         }
64         &:hover .owl-controls { 69         .line-r {
65             opacity: 1; 70           height: 1px;
66             visibility: visible; 71           position: relative;
    72           flex: 1 1 auto;
    73           min-width: 10%;
    74           background: rgba(0,0,0,.08);
67         } 75         }
68         .owl-controls .owl-nav [class*=owl-] { 76         .inline-title{padding: 0 12px;}
69             position: absolute; 77         &.text-left {
70             font-size: 40px; 78           .line-l {display: none;}
71             pointer-events: all; 79           .inline-title{
    80             padding-left: 0;
72         } 81           }
73         .owl-prev {    
74             left: 0;    
75         } 82         }
76         .owl-next { 83         &.text-right {
77             
right: 0;
 84           .inline-title{
    85             padding-right: 0;
78         } 86           }
    87           .line-r {display: none;}
79     } 88         }
80     .owl-top-narrow .recent-posts .owl-item .item {    
81         padding-top: 10px;    
82     } 89       }
83     .owl-border-radius-7 .owl-stage-outer { 90       .products-slider.show-dots-title-right {
84         border-radius: 7px; 91         .owl-dots {
    92             top: -40px;
    93             height: 32px;
85     } 94         }
86     .owl-bottom-absolute-narrow.owl-theme .owl-controls {    
87         position: absolute;    
88         left: 0;    
89         width: 100%;    
90         bottom: 15px;    
91     } 95       }
92     .small-list.products-grid { 96       .products-slider.show-nav-title .owl-nav {
93         .product-item { 97         margin-top: -24px;
94             float: none; 98       }
95             padding: 0
;
 99     }
96             width: auto; 100     .porto-products.title-border-bottom>.section-title,
    101     .related.products .slider-title,
    102     .porto-products.title-border-middle>.section-title .inline-title:before {
    103       border-bottom: 1px solid rgba(0,0,0,.08);
    104     }
    105     .slider-wrapper {margin-left: -10px;margin-right: -10px;}
    106     .products-slider.owl-carousel, .slider-wrapper .products {margin: 0!important;}
    107     .porto-products.title-border-bottom .products-slider.show-dots-title-right .owl-dots, .related.products .products-slider.show-dots-title-right .owl-dots {top: -52px;height: 32px;}
    108     .products-slider.owl-carousel .product-item {padding-top: 0;padding-bottom: 0;margin-bottom: 0;}
    109     .products-slider.owl-carousel .owl-stage-outer {padding-top: 10px;margin-top: -10px;}
    110 
    111     .ajax-
products
{
    112       display:flex;flex-wrap: wrap;
    113       >.category-list{
    114         border-right: 1px solid #dcdcdc;
    115         padding: 0 15px;
    116         >span{
    117           font-size: 1.125rem;
    118           letter-spacing: -.01em;
97             margin-bottom: 15px; 119           margin-bottom: 15px;
98             
 120           color: #111;
99             &-info { 121           text-transform: uppercase;
100                 .product-item-photo { 122           font-weight: 700;
101                     float: left; 123           display: block;line-height: 1.4;
102                     width: 33.33%; 124         }
    125         >ul{
    126           list-style:none;
    127           padding:0;
    128           margin-bottom: 2rem;
    129           >li{
103                     padding: 0; 130             padding: 0;
    131             margin: 0;
    132             >a {
    133               text-transform: uppercase;
    134               font-size: 12px;
    135               font-weight: 600;
    136               padding: 12px 0 12px 24px;
    137               color: #111;
    138               display: block;
    139               position: relative;
    140                 &:before {
    141                 content: ''!important;
    142                 margin-right: 10px;
    143                 position: absolute;
    144                 left: 0;
    145                 width: 14px;
    146                 height: 14px;
    147                 border: 1px solid #d6d6d6;
    148                 background: #fff;
    149                 top: 50%;
    150                 transform: translateY(-50%);
104                 } 151               }
105                 .product-item-details { 152               &.active:after {
106                     float: left; 153                 content: '';
107                     padding: 5px 0; 154                 width: 8px;
108                     padding-left: 10px; 155                 height: 8px;
109                     width: 66.66%; 156                 position: absolute;
110                     text-align: left; 157                 background: #111;
    158                 top: 50%;
    159                 transform: translateY(-50%);
    160                 left: 3px;
111                 } 161               }
112                 &:after { 162               >span{display:inline-block}
113                     content: ""; 163               &:hover{text-decoration:none}
114                     display: table;    
115                     clear: both;    
116                 } 164             }
117             } 165           }
118             .product-item-name {    
119                 font-size: 12px;    
120             } 166         }
121             .product-reviews-summary {    
122                 background-image: none;    
123             } 167       }
124             .price-container .price { 168       >.category-detail{
125                 font-size: 14px; 169         position: relative;
    170         padding-left: 4vw;
    171         padding-right: 0;
    172         margin-bottom: 50px;
    173         letter-spacing: -.025em;
    174         min-height: 70vh;
    175         >h2{
    176           text-align:center;
    177           margin:30px 0;
    178           font-size:26px;
    179           color:#000;
    180           text-transform:uppercase;
    181           font-weight:700;
    182           letter-spacing:10px;
126             } 183         }
    184         >.ajax_products_loader{
    185           position:absolute;
    186           left:0;
    187           top:0;
    188           width:100%;
    189           height:100%;
    190           z-index:9;
    191           background-color:rgba(255,255,255,.5);
    192         }
    193       }
    194     }
    195     .load-more-area{
    196       text-align:center;
    197       margin:20px 0;
    198       >a{
    199         margin: 12px 40px;
    200         border: 1px solid #000;
    201         width: auto;
    202         display: inline-block;
    203         letter-spacing: .075em;
    204         color: #000;
    205         padding: 18px 55px;
    206         font-size: 12px;
    207         line-height: 1.3333;
    208         text-transform: uppercase;
    209         font-weight: 700;
127         } 210       }
128     } 211     }
129 } 212 }
130  213 
131 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) { 214 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
132     
 215   .slider-title, .section-title {
    216     .line {
    217         display: none !important;
    218     }
    219   }
    220   .ajax-products{
    221     display:block;
    222     >.category-list{
    223       border-right:0;padding:0;
    224       >ul>li{
    225         display:inline-block;
    226         margin-right:20px;
    227       }
    228     }
    229     >.category-detail{
    230       padding-top:0;
    231       min-height:70vh;
    232       padding: 0;
    233     }
    234   }
133 } 235 }