Produced by Araxis Merge on 2021-05-13 09:09:01 +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/Magento_Bundle/web/css/source | _module.less | 2018-06-23 22:12:02 +0000 |
| 2 | /Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Bundle/web/css/source | _module.less | 2021-01-29 02:40:24 +0000 |
| Description | Between Files 1 and 2 | |
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 34 | 402 |
| Changed | 14 | 72 |
| Inserted | 3 | 8 |
| Removed | 16 | 23 |
| 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 © 2018 Porto. All rights reserved. | 2 | // * Copyright © 2018 Porto. All rights reserved. | |||
| 3 | // */ | 3 | // */ | |||
| 4 | 4 | |||||
| 5 | // | 5 | // | |||
| 6 | // Common | 6 | // Common | |||
| 7 | // _____________________________________________ | 7 | // _____________________________________________ | |||
| 8 | 8 | |||||
| 9 | & when (@media-common = true) { | 9 | & when (@media-common = true) { | |||
| 10 | 10 | |||||
| 11 | .bundle-actions { | 11 | .bundle-actions { | |||
| 12 | margin | 12 | padding: 1.25rem 0 1.25rem; | |||
| 13 | .action.primary.customize { | 13 | border-top: 1px solid #e7e7e7; | |||
| 14 | &:extend(.abs-button-l all); | 14 | border-bottom: 1px solid #e7e7e7; | |||
| 15 | &:extend(.abs-button-responsive all); | 15 | margin-top: 1rem; | |||
| 16 | margin-bottom: 0 | |||||
| 17 | .action. | |||||
| 18 | letter-spacing: -.015em; | |||||
| 19 | border: none; | |||||
| 20 | background: #222529; | |||||
| 16 | } | 21 | } | |||
| 17 | } | 22 | } | |||
| 18 | 23 | |||||
| 19 | .bundle-options-container { | 24 | .bundle-options-container { | |||
| 20 | clear: both; | 25 | clear: both; | |||
| 21 | margin-bottom: @indent__xl; | 26 | margin-bottom: @indent__xl; | |||
| 22 | ||||||
| 23 | .legend.title { | 27 | .legend.title { | |||
| 24 | .lib-heading(h1); | 28 | font-size: 1.125rem; | |||
| 25 | border: 0; | 29 | color: #222529; | |||
| 26 | padding: 0; | 30 | font-weight: 600; | |||
| 31 | text-transform: uppercase; | |||||
| 32 | margin-bottom: 5px; | |||||
| 27 | } | 33 | } | |||
| 28 | 34 | button.customization {font-size: 1em;} | ||||
| 29 | .product-add-form { | 35 | .product-add-form { | |||
| 30 | display: none; | 36 | display: none; | |||
| 31 | } | 37 | } | |||
| 32 | ||||||
| 33 | .input-text.qty { | 38 | .input-text.qty { | |||
| 34 | &:extend(.abs-input-qty all); | 39 | &:extend(.abs-input-qty all); | |||
| 35 | } | 40 | } | |||
| 36 | ||||||
| 37 | .product-options-wrapper { | 41 | .product-options-wrapper { | |||
| 38 | margin-bottom: @indent__l; | 42 | margin-bottom: @indent__l; | |||
| 39 | .fieldset > .field { | 43 | .fieldset > .field { | |||
| 40 | border-top: 1px @color-gray-middle1 solid; | 44 | border-top: 1px @color-gray-middle1 solid; | |||
| 41 | padding-top: @form-field__vertical-indent; | 45 | padding-top: @form-field__vertical-indent; | |||
| 42 | &:first-of-type { | 46 | &:first-of-type { | |||
| 43 | border-top: 0; | 47 | border-top: 0; | |||
| 44 | padding-top: 0; | 48 | padding-top: 0; | |||
| 45 | } | 49 | } | |||
| 50 | > .label { | |||||
| 51 | font-size: 1rem; | |||||
| 52 | color: #222529; | |||||
| 53 | font-weight: 600; | |||||
| 54 | text-transform: uppercase; | |||||
| 55 | } | |||||
| 46 | } | 56 | } | |||
| 47 | .fieldset-bundle-options { | 57 | .fieldset-bundle-options { | |||
| 48 | .field.choice { | 58 | .field.choice { | |||
| 49 | .price-notice { | 59 | .price-notice { | |||
| 50 | &:extend(.abs-adjustment-incl-excl-tax all); | 60 | &:extend(.abs-adjustment-incl-excl-tax all); | |||
| 51 | } | 61 | } | |||
| 52 | } | 62 | } | |||
| 53 | } | 63 | } | |||
| 54 | .field.choice { | 64 | .field.choice { | |||
| 55 | input { | 65 | input { | |||
| 56 | float: left; | 66 | float: left; | |||
| 67 | margin-top: 6px; | |||||
| 57 | } | 68 | } | |||
| 58 | .label { | 69 | .label { | |||
| 59 | &:extend(.abs-add-clearfix all); | 70 | &:extend(.abs-add-clearfix all); | |||
| 60 | display: block; | 71 | display: block; | |||
| 61 | margin-left: 24px; | 72 | margin-left: 24px; | |||
| 62 | display: block; | 73 | display: block; | |||
| 63 | } | 74 | } | |||
| 64 | ||||||
| 65 | .product-name { | 75 | .product-name { | |||
| 66 | display: block; | 76 | display: block; | |||
| 67 | } | 77 | } | |||
| 68 | ||||||
| 69 | .label { | 78 | .label { | |||
| 70 | &:extend(.abs-add-clearfix all); | 79 | &:extend(.abs-add-clearfix all); | |||
| 71 | } | 80 | } | |||
| 72 | ||||||
| 73 | .price-notice { | 81 | .price-notice { | |||
| 74 | float: left; | 82 | float: left; | |||
| 75 | &:extend(.abs-adjustment-incl-excl-tax all); | 83 | &:extend(.abs-adjustment-incl-excl-tax all); | |||
| 76 | } | 84 | } | |||
| 77 | ||||||
| 78 | .price-excluding-tax { | 85 | .price-excluding-tax { | |||
| 79 | display: inline-block; | 86 | display: inline-block; | |||
| 80 | } | 87 | } | |||
| 81 | } | 88 | } | |||
| 82 | } | 89 | } | |||
| 83 | ||||||
| 84 | .action.back { | 90 | .action.back { | |||
| 85 | &:extend(.abs-action-button-as-link all); | 91 | &:extend(.abs-action-button-as-link all); | |||
| 86 | margin-bottom: @indent__l; | 92 | margin-bottom: @indent__l; | |||
| 87 | } | 93 | } | |||
| 88 | ||||||
| 89 | .block-bundle-summary { | 94 | .block-bundle-summary { | |||
| 90 | > .title { | 95 | > .title { | |||
| 91 | margin-bottom: 15px; | |||||
| 92 | > strong { | 96 | > strong { | |||
| 93 | .lib-heading(h2); | 97 | font-size: 1.125rem; | |||
| 98 | color: #222529; | |||||
| 99 | font-weight: 600; | |||||
| 100 | text-transform: uppercase; | |||||
| 94 | } | 101 | } | |||
| 95 | } | 102 | } | |||
| 96 | > .title, | 103 | > .title, | |||
| 97 | .bundle-summary .subtitle { | 104 | .bundle-summary .subtitle { | |||
| 98 | border-bottom: 1px @color-gray-middle1 solid; | 105 | border-bottom: 1px #e7e7e7 solid; | |||
| 99 | margin-bottom: @indent__m; | 106 | margin-bottom: 1.2rem; | |||
| 100 | padding-bottom: 16px; | 107 | padding-bottom: 10px; | |||
| 101 | } | 108 | } | |||
| 102 | .price-box { | 109 | .price-box { | |||
| 103 | margin-bottom: @indent__base; | 110 | margin-bottom: 0; | |||
| 104 | .price-label { | 111 | .price-label { | |||
| 105 | display: block; | 112 | display: block; | |||
| 106 | margin-bottom: @indent__xs; | 113 | margin-bottom: @indent__xs; | |||
| 107 | } | 114 | } | |||
| 108 | } | 115 | } | |||
| 109 | 116 | .box-tocart { | ||||
| 117 | margin-bottom: 15px; | |||||
| 118 | } | |||||
| 110 | .bundle-summary { | 119 | .bundle-summary { | |||
| 111 | margin-top: @indent__l; | |||||
| 112 | &.empty { | 120 | &.empty { | |||
| 113 | display: none; | 121 | display: none; | |||
| 114 | } | 122 | } | |||
| 115 | > .subtitle { | 123 | > .subtitle { | |||
| 116 | .lib-heading(h2); | 124 | font-size: 1.125rem; | |||
| 125 | color: #222529; | |||||
| 126 | font-weight: 600; | |||||
| 127 | text-transform: uppercase; | |||||
| 117 | display: block; | 128 | display: block; | |||
| 118 | } | 129 | } | |||
| 119 | } | 130 | } | |||
| 120 | ||||||
| 121 | .bundle.items { | 131 | .bundle.items { | |||
| 122 | &:extend(.abs-reset-list all); | 132 | &:extend(.abs-reset-list all); | |||
| 123 | > li { | 133 | > li { | |||
| 124 | margin-bottom: @indent__base; | 134 | margin-bottom: 5px; | |||
| 125 | } | 135 | .label { | |||
| 136 | font-weight: 600; | |||||
| 137 | color: #222529; | |||||
| 126 | } | 138 | } | |||
| 127 | ||||||
| 128 | .box-tocart { | |||||
| 129 | &:extend(.abs-box-tocart all); | |||||
| 130 | .action.primary { | |||||
| 131 | &:extend(.abs-button-l all); | |||||
| 132 | &:extend(.abs-button-responsive all); | |||||
| 133 | } | 139 | } | |||
| 134 | } | 140 | } | |||
| 135 | .product-addto-links { | 141 | .product-addto-links { | |||
| 136 | text-align: center; | 142 | text-align: center; | |||
| 137 | > .action { | 143 | > .action { | |||
| 138 | &:extend(.abs-actions-addto all); | 144 | &:extend(.abs-actions-addto all); | |||
| 139 | margin-right: 5%; | |||||
| 140 | &.tocompare { | 145 | &.tocompare { | |||
| 141 | .lib-icon-font-symbol( | 146 | .lib-icon-font-symbol( | |||
| 142 | @_icon-font-content: @icon-compare-full, | 147 | @_icon-font-content: @icon-compare-full, | |||
| 143 | @_icon-font-position: before | 148 | @_icon-font-position: before | |||
| 144 | ); | 149 | ); | |||
| 145 | } | 150 | } | |||
| 146 | } | 151 | } | |||
| 147 | } | 152 | } | |||
| 148 | ||||||
| 149 | .product-image-container, | 153 | .product-image-container, | |||
| 150 | .product.name, | 154 | .product.name, | |||
| 151 | .stock { | 155 | .stock { | |||
| 152 | &:extend(.abs-visually-hidden all); | 156 | &:extend(.abs-visually-hidden all); | |||
| 153 | } | 157 | } | |||
| 154 | } | 158 | } | |||
| 155 | p.required { | 159 | p.required { | |||
| 156 | .lib-css(color, @form-field-label-asterisk__color); | 160 | .lib-css(color, @form-field-label-asterisk__color); | |||
| 157 | } | 161 | } | |||
| 158 | .nested { | 162 | .nested { | |||
| 159 | .field label { | 163 | .field label { | |||
| 160 | font-weight: 400; | 164 | font-weight: 400; | |||
| 161 | } | 165 | } | |||
| 162 | .product-name { | 166 | .product-name { | |||
| 163 | font-weight: 600; | 167 | font-weight: 400; | |||
| 164 | } | 168 | } | |||
| 165 | .field.qty { | 169 | .field.qty { | |||
| 166 | .lib-form-field-type(@_type: block); | 170 | .lib-form-field-type(@_type: block); | |||
| 167 | .label { | 171 | .label { | |||
| 168 | font-weight: @form-field-label__font-weight; | 172 | font-weight: @form-field-label__font-weight; | |||
| 169 | } | 173 | } | |||
| 170 | &:last-child { | 174 | &:last-child { | |||
| 171 | margin-bottom: 0; | 175 | margin-bottom: 0; | |||
| 172 | } | 176 | } | |||
| 173 | margin-top: @form-field__vertical-indent; | 177 | margin-top: @form-field__vertical-indent; | |||
| 174 | } | 178 | } | |||
| 175 | } | 179 | } | |||
| 180 | .price-container { | |||||
| 176 | .price { | 181 | .price { | |||
| 177 | font-weight: @font-weight__semibold; | 182 | font-size: 1rem; | |||
| 183 | line-height: 1; | |||||
| 184 | font-weight: 600; | |||||
| 185 | letter-spacing: -.02em; | |||||
| 186 | color: #222529; | |||||
| 187 | } | |||||
| 178 | } | 188 | } | |||
| 179 | } | 189 | } | |||
| 180 | 190 | |||||
| 181 | .fieldset-bundle-options { | 191 | .fieldset-bundle-options { | |||
| 182 | .nested.options-list { | 192 | .nested.options-list { | |||
| 183 | .field.qty { | 193 | .field.qty { | |||
| 184 | display: block; | 194 | display: block; | |||
| 185 | margin-top: 9px; | 195 | margin-top: 9px; | |||
| 186 | } | 196 | } | |||
| 187 | } | 197 | } | |||
| 188 | } | 198 | } | |||
| 189 | } | 199 | } | |||
| 190 | 200 | |||||
| 191 | // | 201 | // | |||
| 192 | // Desktop | 202 | // Desktop | |||
| 193 | // _____________________________________________ | 203 | // _____________________________________________ | |||
| 194 | 204 | |||||
| 195 | .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { | 205 | .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { | |||
| 196 | .bundle-actions { | 206 | .bundle-actions { | |||
| 197 | .action.primary.customize { | 207 | .action.primary.customize { | |||
| 198 | width: auto; | 208 | width: auto; | |||
| 199 | } | 209 | } | |||
| 200 | } | 210 | } | |||
| 201 | .bundle-options-container { | 211 | .bundle-options-container { | |||
| 202 | .legend.title { | |||||
| 203 | font-size: 25px; | |||||
| 204 | } | |||||
| 205 | .bundle-options-wrapper, | 212 | .bundle-options-wrapper, | |||
| 206 | .product-options-wrapper { | 213 | .product-options-wrapper { | |||
| 207 | float: left; | 214 | float: left; | |||
| 208 | } | 215 | } | |||
| 209 | .block-bundle-summary { | 216 | .block-bundle-summary { | |||
| 210 | padding: @indent__s @indent__base; | 217 | padding: 0 15px; | |||
| 211 | &:extend(.abs-add-box-sizing-desktop all); | 218 | &:extend(.abs-add-box-sizing-desktop all); | |||
| 212 | float: right; | 219 | float: right; | |||
| 213 | width: 40%; | 220 | width: 49%; | |||
| 214 | position: relative; | 221 | position: relative; | |||
| 215 | .price-box { | 222 | .price-box { | |||
| 216 | .price-wrapper, | 223 | .price-wrapper, | |||
| 217 | .price-wrapper > .price { | 224 | .price-wrapper > .price { | |||
| 218 | font-size: @price-size-desktop; | 225 | font-size: 1.5rem; | |||
| 219 | line-height: @price-size-desktop; | 226 | line-height: 1; | |||
| 220 | font-weight: @font-weight__semibold; | 227 | font-weight: 600; | |||
| 228 | letter-spacing: -.02em; | |||||
| 229 | color: #222529; | |||||
| 221 | } | 230 | } | |||
| 222 | } | 231 | } | |||
| 223 | .price-container { | 232 | .price-container { | |||
| 224 | .weee { | 233 | .weee { | |||
| 225 | .lib-css(color, @price-color); | 234 | .lib-css(color, @price-color); | |||
| 226 | .price { | 235 | .price { | |||
| 227 | .lib-font-size(12); | 236 | .lib-font-size(12); | |||
| 228 | font-weight: @font-weight__bold; | 237 | font-weight: @font-weight__bold; | |||
| 229 | } | 238 | } | |||
| 230 | } | 239 | } | |||
| 231 | } | 240 | } | |||
| 232 | .price-including-tax + .price-excluding-tax { | 241 | .price-including-tax + .price-excluding-tax { | |||
| 233 | .price { | 242 | .price { | |||
| 234 | .lib-font-size(14); | 243 | .lib-font-size(14); | |||
| 235 | line-height: 16px; | 244 | line-height: 16px; | |||
| 236 | } | 245 | } | |||
| 237 | } | 246 | } | |||
| 238 | } | 247 | } | |||
| 239 | .bundle-options-wrapper, | 248 | .bundle-options-wrapper, | |||
| 240 | .block-bundle-summary { | 249 | .block-bundle-summary { | |||
| 241 | .page-layout-2columns-left &, | 250 | .page-layout-2columns-left &, | |||
| 242 | .page-layout-2columns-right &, | 251 | .page-layout-2columns-right &, | |||
| 243 | .page-layout-3columns & { | 252 | .page-layout-3columns & { | |||
| 244 | width: 48%; | 253 | width: 48%; | |||
| 245 | } | 254 | } | |||
| 246 | } | 255 | } | |||
| 247 | } | 256 | } | |||
| 248 | } | 257 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.