380. Araxis Merge File Comparison Report

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

380.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_rtl/Magento_Checkout/web/css/source/module/checkout_authentication.less2016-05-15 09:32:40 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto_rtl/Magento_Checkout/web/css/source/module/checkout_authentication.less2021-02-03 10:50:46 +0000

380.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged2432
Changed12
Inserted00
Removed00

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

380.4 Active regular expressions

No regular expressions were active.

380.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 // 6 //
7 //  Variables 7 //  Variables
8 //  _____________________________________________ 8 //  _____________________________________________
9  9 
10 @block-auth__dropdown__padding: 25px 18px; 10 @block-auth__dropdown__padding: 25px 18px;
11 @block-auth__dropdown__background-color: @color-white; 11 @block-auth__dropdown__background-color: @color-white;
12 @block-auth__or-label__size: 36px; 12 @block-auth__or-label__size: 36px;
13 @block-auth__width: 0; 13 @block-auth__width: 0;
14 @block-auth__border: 0; 14 @block-auth__border: 0;
15  15 
16 // 16 //
17 //  Common 17 //  Common
18 //  _____________________________________________ 18 //  _____________________________________________
19  19 
20 & when (@media-common = true) { 20 & when (@media-common = true) {
21     .authentication-dropdown { 21     .authentication-dropdown {
22         box-sizing: border-box; 22         box-sizing: border-box;
23         .modal-inner-wrap { 23         .modal-inner-wrap {
24             padding: @block-auth__dropdown__padding; 24             padding: @block-auth__dropdown__padding;
25         } 25         }
26         button.action-close { 26         button.action-close {
27             width: 40px; 27             width: 40px;
28             height: 40px; 28             height: 40px;
29             margin: 0; 29             margin: 0;
30         } 30         }
31         .modal-header { 31         .modal-header {
32             min-height: 0; 32             min-height: 0;
33             padding: 0; 33             padding: 0;
34             border: 0; 34             border: 0;
35         } 35         }
36         .modal-content { 36         .modal-content {
37             box-shadow: none; 37             box-shadow: none;
38             -webkit-box-shadow: none; 38             -webkit-box-shadow: none;
39             position: static; 39             position: static;
40             background: none; 40             background: none;
41             border: 0; 41             border: 0;
42             border-radius: 0; 42             border-radius: 0;
43         } 43         }
44     } 44     }
45     .authentication-wrapper { 45     .authentication-wrapper {
46         float: left; 46         float: left;
47         margin-top: -70px; 47         margin-top: -70px;
48         max-width: 50%; 48         max-width: 50%;
49         position: relative; 49         position: relative;
50         z-index: 1; 50         z-index: 1;
51         ._has-auth-shown & { 51         ._has-auth-shown & {
52             z-index: @modal__z-index; 52             z-index: @modal__z-index;
53         } 53         }
54          54 
55         button.action-auth-toggle { 55         button.action-auth-toggle {
56             border: 0; 56             border: 0;
57             color: @_link-color; 57             color: @_link-color;
58             padding: 0; 58             padding: 0;
59             background: none; 59             background: none;
60         } 60         }
61     } 61     }
62     .action-auth-toggle { 62     .action-auth-toggle {
63         &:extend(.abs-action-button-as-link all); 63         &:extend(.abs-action-button-as-link all);
64     } 64     }
65     .block-authentication { 65     .block-authentication {
66         .block-title { 66         .block-title {
67             .lib-font-size(@h3__font-size); 67             .lib-font-size(@h3__font-size);
68             border-bottom: 0; 68             border-bottom: 0;
69             margin-bottom: @indent__m; 69             margin-bottom: @indent__m;
70             strong { 70             strong {
71                 font-weight: @font-weight__light; 71                 font-weight: @font-weight__light;
72             } 72             }
73         } 73         }
74         .field { 74         .field {
75             .label { 75             .label {
76                 font-weight: @font-weight__regular; 76                 font-weight: @font-weight__regular;
77             } 77             }
78         } 78         }
79         .action.action-register, 79         .action.action-register,
80         .action.action-login { 80         .action.action-login {
81             &:extend(.abs-button-l all); 81             &:extend(.abs-button-l all);
82         } 82         }
83         .block[class] { 83         .block[class] {
84             margin: 0; 84             margin: 0;
85             ul { 85             ul {
86                 list-style: none; 86                 list-style: none;
87                 padding-right: @indent__s; 87                 padding-right: @indent__s;
88             } 88             }
89             .field { 89             .field {
90                 .control, 90                 .control,
91                 .label { 91                 .label {
92                     float: none; 92                     float: none;
93                     width: auto; 93                     width: auto;
94                 } 94                 }
95             } 95             }
96             & + .block { 96             & + .block {
97                 border-top: 1px solid @color-gray-light5; 97                 border-top: 1px solid @color-gray-light5;
98                 margin-top: @indent__xl; 98                 margin-top: @indent__xl;
99                 padding-top: @indent__xl; 99                 padding-top: @indent__xl;
100                 position: relative; 100                 position: relative;
101                 &::before { 101                 &::before {
102                     .lib-css(height, @block-auth__or-label__size); 102                     .lib-css(height, @block-auth__or-label__size);
103                     .lib-css(line-height, @block-auth__or-label__size - 2px); 103                     .lib-css(line-height, @block-auth__or-label__size - 2px);
104                     .lib-css(margin, -(@block-auth__or-label__size/2 + 1px) -(@block-auth__or-label__size / 2) 0 0); 104                     .lib-css(margin, -(@block-auth__or-label__size/2 + 1px) -(@block-auth__or-label__size / 2) 0 0);
105                     .lib-css(min-width, @block-auth__or-label__size); 105                     .lib-css(min-width, @block-auth__or-label__size);
106                     background: @color-white; 106                     background: @color-white;
107                     border-radius: 50%; 107                     border-radius: 50%;
108                     border: 1px solid @color-gray-light5; 108                     border: 1px solid @color-gray-light5;
109                     box-sizing: border-box; 109                     box-sizing: border-box;
110                     color: @color-gray-light5; 110                     color: @color-gray-light5;
111                     content: attr(data-label); 111                     content: attr(data-label);
112                     display: inline-block; 112                     display: inline-block;
113                     right: 50%; 113                     right: 50%;
114                     letter-spacing: normal; 114                     letter-spacing: normal;
115                     padding: 0 .2rem; 115                     padding: 0 .2rem;
116                     position: absolute; 116                     position: absolute;
117                     text-align: center; 117                     text-align: center;
118                     text-transform: uppercase; 118                     text-transform: uppercase;
119                     top: 0; 119                     top: 0;
120                 } 120                 }
121             } 121             }
122         } 122         }
123     } 123     }
124 } 124 }
125  125 
126 // 126 //
127 //  Desktop 127 //  Desktop
128 //  _____________________________________________ 128 //  _____________________________________________
129  129 
130 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { 130 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
131     .authentication-dropdown { 131     .authentication-dropdown {
132         .lib-css(background-color, @block-auth__dropdown__background-color); 132         .lib-css(background-color, @block-auth__dropdown__background-color);
133         .lib-css(border, @block-auth__border); 133         .lib-css(border, @block-auth__border);
134         position: absolute; 134         position: absolute;
135         text-align: right; 135         text-align: right;
136         top: 100%; 136         top: 100%;
137         transform-origin: 0 0; 137         transform-origin: 0 0;
138         transform: scale(1,0); 138         transform: scale(1,0);
139         transition: transform linear .1s, visibility 0s linear .1s; 139         transition: transform linear .1s, visibility 0s linear .1s;
140         visibility: hidden; 140         visibility: hidden;
141         width: 100%; 141         width: 100%;
142         box-shadow: 0 0 5px rgba(0,0,0,0.25); 142         box-shadow: 0 0 5px rgba(0,0,0,0.25);
143         border-radius: 8px; 143         border-radius: 8px;
144         border-top: 6px solid @theme-color; 144         border-top: 6px solid @theme-color;
145         &._show { 145         &._show {
146             .lib-css(z-index, @dropdown-list__z-index); 146             .lib-css(z-index, @dropdown-list__z-index);
147             transform: scale(1,1); 147             transform: scale(1,1);
148             transition: transform linear .1s, visibility 0s linear 0s; 148             transition: transform linear .1s, visibility 0s linear 0s;
149             visibility: visible; 149             visibility: visible;
150         } 150         }
151     } 151     }
152     .authentication-wrapper { 152     .authentication-wrapper {
153         .lib-column-width(@checkout-sidebar__columns); 153         .lib-column-width(@checkout-sidebar__columns);
154         text-align: left; 154         text-align: left;
155         margin-top: -95px; 155         margin-top: -95px;
156     } 156     }
157     .block-authentication { 157     .block-authentication {
158         .block-title { 158         .block-title {
159             font-size: 20px; 159             font-size: 20px;
160             border-bottom: 0; 160             border-bottom: 0;
161             margin: 0; 161             margin: 0;
162             margin-bottom: 20px; 162             margin-bottom: 20px;
163         } 163         }
164         .actions-toolbar { 164         .actions-toolbar {
165             > .primary { 165             > .primary {
166                 display: inline; 166                 display: inline;
167                 float: left; 167                 float: left;
168                 margin-left: 0; 168                 margin-left: 0;
169                 .action { 169                 .action {
170                     margin-left: 0; 170                     margin-left: 0;
171                 } 171                 }
172             } 172             }
173             > .secondary { 173             > .secondary {
174  174 
175             } 175             }
176         } 176         }
177     } 177     }
178     .popup-authentication { 178     .popup-authentication {
179         .modal-inner-wrap { 179         .modal-inner-wrap {
180             min-width: @screen__m; 180             min-width: @screen__m;
181             width: 60%; 181             width: 60%;
182         } 182         }
183         .block-authentication { 183         .block-authentication {
184             .lib-vendor-prefix-display(flex); 184             .lib-vendor-prefix-display(flex);
185             .lib-vendor-prefix-flex-direction(row); 185             .lib-vendor-prefix-flex-direction(row);
186             border-top: 1px solid @color-gray-light5; 186             border-top: 1px solid @color-gray-light5;
187         } 187         }
188         .block[class], 188         .block[class],
189         .form-login, 189         .form-login,
190         .fieldset, 190         .fieldset,
191         .block-content { 191         .block-content {
192             .lib-vendor-prefix-display(flex); 192             .lib-vendor-prefix-display(flex);
193             .lib-vendor-prefix-flex-direction(column); 193             .lib-vendor-prefix-flex-direction(column);
194             .lib-vendor-prefix-flex-grow(1); 194             .lib-vendor-prefix-flex-grow(1);
195         } 195         }
196         .block[class] { 196         .block[class] {
197             box-sizing: border-box; 197             box-sizing: border-box;
198             float: right; 198             float: right;
199             padding: @indent__s @indent__l 0 0; 199             padding: @indent__s @indent__l 0 0;
200             width: 50%; 200             width: 50%;
201             & + .block { 201             & + .block {
202                 border-right: 1px solid @color-gray-light5; 202                 border-right: 1px solid @color-gray-light5;
203                 border-top: 0; 203                 border-top: 0;
204                 margin: 0; 204                 margin: 0;
205                 padding: @indent__s @indent__xl 0 0; 205                 padding: @indent__s @indent__xl 0 0;
206                 &::before { 206                 &::before {
207                     right: 0; 207                     right: 0;
208                     top: 50%; 208                     top: 50%;
209                 } 209                 }
210             } 210             }
211         } 211         }
212         .actions-toolbar { 212         .actions-toolbar {
213             margin-bottom: 0; 213             margin-bottom: 0;
214             margin-top: auto; 214             margin-top: auto;
215         } 215         }
216     } 216     }
217 } 217 }