Produced by Araxis Merge on 2021-05-13 09:09:19 +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.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | /Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto_rtl/Magento_Catalog/web/css/source/module | _toolbar.less | 2018-01-13 21:15:54 +0000 |
| 2 | /Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto_rtl/Magento_Catalog/web/css/source/module | _toolbar.less | 2021-03-28 12:26:18 +0000 |
| Description | Between Files 1 and 2 | |
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 33 | 280 |
| Changed | 16 | 149 |
| Inserted | 9 | 31 |
| Removed | 7 | 10 |
| Whitespace | Consecutive whitespace is treated as a single space |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
| Active line-pairing rules |
No regular expressions were active.
| 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 | @toolbar-mode-icon-font-size: 16px; | 6 | @toolbar-mode-icon-font-size: 16px; | |||
| 7 | @toolbar-background: transparent; | 7 | @toolbar-background: transparent; | |||
| 8 | @pager-action__background: @toolbar-element-background; | 8 | @pager-action__background: @toolbar-element-background; | |||
| 9 | @pager__font-weight: @font-weight__bold; | 9 | @pager__font-weight: @font-weight__bold; | |||
| 10 | 10 | |||||
| 11 | // | 11 | // | |||
| 12 | // Common | 12 | // Common | |||
| 13 | // _____________________________________________ | 13 | // _____________________________________________ | |||
| 14 | 14 | |||||
| 15 | & when (@media-common = true) { | 15 | & when (@media-common = true) { | |||
| 16 | 16 | |||||
| 17 | .page-products .columns { | 17 | .page-products .columns { | |||
| 18 | position: relative; | 18 | position: relative; | |||
| 19 | z-index: 1; | 19 | z-index: 1; | |||
| 20 | padding-top: 60px; | 20 | padding-top: 60px; | |||
| 21 | } | 21 | } | |||
| 22 | 22 | |||||
| 23 | .toolbar { | 23 | .toolbar { | |||
| 24 | display: flex; | |||||
| 25 | align-items: center; | |||||
| 26 | margin-bottom: 10px; | |||||
| 27 | margin-left: -10px; | |||||
| 28 | font-size: 13px; | |||||
| 29 | > *{ | |||||
| 30 | margin: 0 0 10px 10px; | |||||
| 31 | } | |||||
| 24 | select { | 32 | select { | |||
| 25 | .lib-css(background-color, @toolbar-element-background); | |||||
| 26 | border-radius: 3px; | |||||
| 27 | padding-top: 0; | 33 | padding-top: 0; | |||
| 28 | padding-bottom: 0; | 34 | padding-bottom: 0; | |||
| 29 | height: 26px; | 35 | font-size: 1em; | |||
| 36 | padding: 0 8px 0 25px; | |||||
| 37 | box-shadow: none; | |||||
| 38 | border: 1px solid #e4e4e4; | |||||
| 39 | height: 34px; | |||||
| 40 | border-radius: 0; | |||||
| 30 | } | 41 | } | |||
| 31 | 42 | |||||
| 32 | text-align: center; | 43 | text-align: center; | |||
| 33 | &:extend(.abs-add-clearfix all); | 44 | &:extend(.abs-add-clearfix all); | |||
| 34 | &-amount { | 45 | &-amount { | |||
| 35 | position: static; | 46 | position: static; | |||
| 36 | display: block; | 47 | display: block; | |||
| 37 | float: right; | 48 | float: right; | |||
| 38 | line-height: @toolbar-mode-icon-font-size+2; | 49 | line-height: @toolbar-mode-icon-font-size+2; | |||
| 39 | padding: 6px 0; | 50 | padding: 6px 0; | |||
| 40 | margin: 0; | 51 | margin: 0; | |||
| 41 | vertical-align: middle; | 52 | vertical-align: middle; | |||
| 42 | text-align: right; | 53 | text-align: right; | |||
| 43 | .products.wrapper ~ .toolbar & { | 54 | .products.wrapper ~ .toolbar & { | |||
| 44 | display: none; | 55 | display: none; | |||
| 45 | } | 56 | } | |||
| 46 | } | 57 | } | |||
| 47 | .page-with-filter & { | 58 | .page-with-filter & { | |||
| 48 | &-amount { | 59 | &-amount { | |||
| 49 | position: static; | 60 | position: static; | |||
| 50 | } | 61 | } | |||
| 51 | } | 62 | } | |||
| 52 | &-products { | 63 | &-products { | |||
| 53 | .lib-css(background-color, @toolbar-background); | 64 | .lib-css(background-color, @toolbar-background); | |||
| 54 | .pages { | 65 | .pages { | |||
| 55 | display: none; | 66 | display: none; | |||
| 67 | } | |||||
| 68 | } | |||||
| 56 | .products.wrapper ~ & { | 69 | .products.wrapper ~ & { | |||
| 70 | text-align: center; | |||||
| 71 | border-top: 1px solid #e7e7e7; | |||||
| 72 | padding-top: 25px; | |||||
| 73 | margin: 0; | |||||
| 74 | border-bottom: none; | |||||
| 75 | .pages { | |||||
| 57 | display: block; | 76 | display: block; | |||
| 77 | margin-left: 0; | |||||
| 78 | order: 2; | |||||
| 79 | margin-right: auto; | |||||
| 80 | margin-bottom: 15px; | |||||
| 58 | } | 81 | } | |||
| 82 | .limiter { | |||||
| 83 | margin-bottom: 15px; | |||||
| 59 | } | 84 | } | |||
| 85 | .sorter,.modes {display: none;} | |||||
| 86 | a.porto-product-filters-toggle {display: none !important;} | |||||
| 60 | } | 87 | } | |||
| 61 | .pages { | 88 | a.porto-product-filters-toggle { | |||
| 62 | margin-bottom: @indent__m; | 89 | -webkit-align-items: center; | |||
| 90 | align-items: center; | |||||
| 91 | height: 36px; | |||||
| 92 | background: #fff; | |||||
| 93 | padding: 0 3px 0 10px; | |||||
| 94 | text-transform: uppercase; | |||||
| 95 | color: inherit; | |||||
| 96 | border: 1px solid #e7e7e7; | |||||
| 97 | svg { | |||||
| 98 | fill: #fff; | |||||
| 99 | stroke: #222529; | |||||
| 100 | width: 28px; | |||||
| 101 | } | |||||
| 102 | .page-layout-1column & {display: none !important;} | |||||
| 103 | } | |||||
| 104 | &.sticky { | |||||
| 105 | position: fixed!important; | |||||
| 106 | z-index: 8; | |||||
| 107 | right: 0; | |||||
| 108 | width: 100%; | |||||
| 109 | padding-top: 10px; | |||||
| 110 | padding-bottom: 0; | |||||
| 111 | padding-left: 10px; | |||||
| 112 | padding-right: 20px; | |||||
| 113 | border-bottom: 1px solid #e7e7e7; | |||||
| 114 | transition: right 0.3s; | |||||
| 115 | .sidebar-opened & { | |||||
| 116 | right: 260px; | |||||
| 117 | } | |||||
| 118 | .onepage-category & { | |||||
| 119 | right: 80px; | |||||
| 120 | width: calc(~"100% - (80px)"); | |||||
| 63 | } | 121 | } | |||
| 64 | .products.wrapper ~ & .pages { | |||||
| 65 | float: right; | |||||
| 66 | margin-bottom: 0; | |||||
| 67 | } | 122 | } | |||
| 68 | } | 123 | } | |||
| 69 | ||||||
| 70 | .sorter { | 124 | .sorter { | |||
| 71 | float: left; | 125 | margin-left: auto; | |||
| 126 | display: flex; | |||||
| 127 | align-items: center; | |||||
| 72 | .page-products & { | 128 | .page-products & { | |||
| 73 | position: static; | 129 | position: static; | |||
| 74 | } | 130 | } | |||
| 75 | &-label { | 131 | &-label { | |||
| 76 | margin-bottom: 0; | |||||
| 77 | line-height: 26px; | 132 | line-height: 26px; | |||
| 78 | font-weight: 400; | 133 | font-weight: 400; | |||
| 134 | margin: 0 0 0 7px; | |||||
| 135 | vertical-align: middle; | |||||
| 136 | &::after { | |||||
| 137 | content: ':'; | |||||
| 138 | } | |||||
| 79 | } | 139 | } | |||
| 80 | &-options { | 140 | &-options { | |||
| 81 | margin: 0 7px 0 @indent__xs; | 141 | margin: 0 0 0 7px; | |||
| 82 | width: auto; | 142 | width: auto; | |||
| 83 | } | 143 | } | |||
| 84 | &-action { | 144 | &-action { | |||
| 85 | display: inline-block; | 145 | display: inline-block; | |||
| 86 | vertical-align: top; | 146 | vertical-align: top; | |||
| 87 | 147 | |||||
| 88 | .lib-icon-font( | 148 | .lib-icon-font( | |||
| 89 | @icon-arrow-up, | 149 | @icon-arrow-up, | |||
| 90 | @_icon-font-size: 16px, | 150 | @_icon-font-size: inherit, | |||
| 91 | @_icon-font-color: @header-icons-color, | 151 | @_icon-font-color: @header-icons-color, | |||
| 92 | @_icon-font-color-hover: @header-icons-color-hover | 152 | @_icon-font-color-hover: @header-icons-color-hover | |||
| 93 | ); | 153 | ); | |||
| 94 | .lib-icon-text-hide(); | 154 | .lib-icon-text-hide(); | |||
| 95 | &:before { | 155 | &:before { | |||
| 96 | vertical-align: top; | 156 | vertical-align: top; | |||
| 97 | } | 157 | } | |||
| 98 | &.sort-desc:before { | 158 | &.sort-desc:before { | |||
| 99 | content: @icon-arrow-down; | 159 | content: @icon-arrow-down; | |||
| 100 | } | 160 | } | |||
| 101 | } | 161 | } | |||
| 102 | } | 162 | } | |||
| 103 | ||||||
| 104 | .modes { | 163 | .modes { | |||
| 105 | float: right; | 164 | display: flex; | |||
| 106 | display: inline-block; | 165 | align-items: center; | |||
| 107 | margin-left: @indent__base; | |||||
| 108 | ||||||
| 109 | & > a { | 166 | & > a { | |||
| 110 | text-decoration: none; | 167 | text-decoration: none; | |||
| 111 | } | 168 | } | |||
| 112 | 169 | |||||
| 113 | &-label { | 170 | &-label { | |||
| 114 | &:extend(.abs-visually-hidden); | 171 | &:extend(.abs-visually-hidden); | |||
| 115 | } | 172 | } | |||
| 116 | 173 | |||||
| 117 | &-mode { | 174 | &-mode { | |||
| 118 | float: right; | 175 | display: inline-block; | |||
| 119 | border: 1px solid #ccc; | 176 | font-size: 1rem; | |||
| 120 | font-weight: @font-weight__regular; | 177 | width: 1.2em; | |||
| 121 | .lib-css(color, #ccc); | 178 | height: 1.2em; | |||
| 179 | line-height: 1; | |||||
| 180 | text-decoration: none; | |||||
| 122 | text-align: center; | 181 | text-align: center; | |||
| 123 | width: 26px; | 182 | vertical-align: middle; | |||
| 124 | line-height: 26px; | 183 | transition: .25s; | |||
| 125 | .lib-css(background-color, @toolbar-element-background); | 184 | margin-left: .25rem; | |||
| 126 | display: block; | 185 | margin-top: 2px; | |||
| 127 | margin-left: 5px; | |||||
| 128 | border-radius: 3px; | |||||
| 129 | &:last-child { | 186 | &:last-child { | |||
| 130 | margin-left: 0; | 187 | margin-left: 0; | |||
| 131 | } | 188 | } | |||
| 132 | &.active, &:hover { | 189 | &.active, &:hover { | |||
| 133 | background-color: @theme-color; | 190 | | |||
| 134 | border-color: @theme-color; | 191 | } | |||
| 135 | color: #fff; | 192 | &:not(.active){ | |||
| 193 | color: #000; | |||||
| 136 | } | 194 | } | |||
| 137 | .lib-icon-font( | 195 | .lib-icon-font( | |||
| 138 | @icon-grid, | 196 | @icon-grid, | |||
| 139 | @_icon-font-size: @toolbar-mode-icon-font-size, | 197 | @_icon-font-size: inherit, | |||
| 140 | @_icon-font-text-hide: true | 198 | @_icon-font-text-hide: true | |||
| 141 | ); | 199 | ); | |||
| 142 | &:before { | 200 | &:before { | |||
| 143 | display: block; | 201 | display: block; | |||
| 202 | overflow: visible; | |||||
| 144 | } | 203 | } | |||
| 145 | } | 204 | } | |||
| 146 | } | 205 | } | |||
| 147 | ||||||
| 148 | .mode-list:before { | 206 | .mode-list:before { | |||
| 149 | content: @icon-list; | 207 | content: @icon-list; | |||
| 150 | } | 208 | } | |||
| 151 | .limiter { | 209 | .limiter { | |||
| 152 | float: left; | 210 | display: flex; | |||
| 153 | .products.wrapper ~ .toolbar & { | 211 | align-items: center; | |||
| 154 | display: block; | |||||
| 155 | } | |||||
| 156 | &-options { | 212 | &-options { | |||
| 157 | width: auto; | 213 | width: auto; | |||
| 158 | margin: 0 7px 0 5px; | 214 | margin: 0 | |||
| 159 | } | 215 | } | |||
| 160 | & .label { | 216 | & .label { | |||
| 161 | font-weight: 400; | 217 | margin: 0 0 0 7px; | |||
| 162 | margin: 0; | 218 | vertical-align: middle; | |||
| 219 | span { | |||||
| 220 | &::after { | |||||
| 221 | content: ':'; | |||||
| 222 | } | |||||
| 223 | } | |||||
| 163 | } | 224 | } | |||
| 164 | .control { | 225 | .control { | |||
| 165 | display: inline-block; | 226 | display: inline-block; | |||
| 166 | } | 227 | } | |||
| 228 | .limiter-text {display: none;} | |||||
| 167 | } | 229 | } | |||
| 168 | } | 230 | } | |||
| 169 | 231 | |||||
| 170 | // | 232 | // | |||
| 171 | // Mobile | 233 | // Mobile | |||
| 172 | //-------------------------------------- | 234 | //-------------------------------------- | |||
| 173 | 235 | |||||
| 174 | .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) { | 236 | @media(max-width: 991px) { | |||
| 175 | .toolbar-products { | 237 | .toolbar | |||
| 176 | margin-bottom: 0; | 238 | font-size: 11px; | |||
| 239 | letter-spacing: -.025em; | |||||
| 240 | font-weight: 600; | |||||
| 241 | color: #222529; | |||||
| 242 | margin-bottom: 20px; | |||||
| 243 | background: #f4f4f4; | |||||
| 244 | padding: 10px 12px 0 2px; | |||||
| 245 | margin-right: 0; | |||||
| 246 | select { | |||||
| 247 | text-transform: uppercase; | |||||
| 248 | height: 36px; | |||||
| 249 | max-width: 140px; | |||||
| 250 | letter-spacing: inherit; | |||||
| 251 | font-weight: inherit; | |||||
| 252 | color: #222529; | |||||
| 253 | } | |||||
| 254 | .sorter-label,.limiter .label {font-weight: inherit;} | |||||
| 255 | .products.wrapper ~ & { | |||||
| 256 | background: none; | |||||
| 257 | margin: 0; | |||||
| 258 | padding: 0; | |||||
| 259 | padding-top: 25px; | |||||
| 260 | font-size: 13px; | |||||
| 261 | font-weight: 400; | |||||
| 262 | color: inherit; | |||||
| 263 | letter-spacing: normal; | |||||
| 264 | position: static !important; | |||||
| 265 | select { | |||||
| 266 | height: 34px; | |||||
| 267 | max-width: auto; | |||||
| 268 | color: inherit; | |||||
| 269 | } | |||||
| 270 | } | |||||
| 271 | } | |||||
| 272 | } | |||||
| 273 | @media(max-width: 575px) { | |||||
| 274 | .toolbar { | |||||
| 275 | .modes,.sorter-label, .limiter .label {display: none;} | |||||
| 177 | } | 276 | } | |||
| 178 | } | 277 | } | |||
| 179 | ||||||
| 180 | .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__s) { | 278 | .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__s) { | |||
| 181 | .page-products .columns { | 279 | .page-products .columns { | |||
| 182 | position: relative; | 280 | position: relative; | |||
| 183 | z-index: 1; | 281 | z-index: 1; | |||
| 184 | padding-top: 0; | 282 | padding-top: 0; | |||
| 185 | } | 283 | } | |||
| 186 | } | 284 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.