348. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-07-12 04:43:11 +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.

348.1 Files compared

#LocationFileLast Modified
1Porto v4.0.5/Theme Files/Porto Theme/app/design/frontend/Smartwave/porto/web/css/source_forms.less2021-02-03 11:07:42 +0000
2Porto v4.0.6/Theme Files/Porto Theme/app/design/frontend/Smartwave/porto/web/css/source_forms.less2021-02-03 11:07:42 +0000

348.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged1352
Changed00
Inserted00
Removed00

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

348.4 Active regular expressions

No regular expressions were active.

348.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 @legend-border-bottom: 1px solid @color-gray-light6; 6 @legend-border-bottom: 1px solid @color-gray-light6;
7 @form-field__vertical-indent__desktop: 29px; 7 @form-field__vertical-indent__desktop: 29px;
8 @form-calendar-icon__color: @primary__color; 8 @form-calendar-icon__color: @primary__color;
9  9 
10 // 10 //
11 //    Common 11 //    Common
12 //-------------------------------------- 12 //--------------------------------------
13  13 
14 & when (@media-common = true) { 14 & when (@media-common = true) {
15  15 
16 .fieldset { 16 .fieldset {
17     .lib-form-fieldset(); 17     .lib-form-fieldset();
18     &:last-child { 18     &:last-child {
19         margin-bottom: 0; 19         margin-bottom: 0;
20     } 20     }
21     > .field, 21     > .field,
22     > .fields > .field { 22     > .fields > .field {
23         .lib-form-field(); 23         .lib-form-field();
24         &.no-label { 24         &.no-label {
25             > .label { 25             > .label {
26                 .lib-visually-hidden(); 26                 .lib-visually-hidden();
27             } 27             }
28         } 28         }
29         &.choice { 29         &.choice {
30             .label { 30             .label {
31                 font-weight: normal; 31                 font-weight: normal;
32                 margin: 0; 32                 margin: 0;
33                 display: inline; 33                 display: inline;
34             } 34             }
35         } 35         }
36         .label { 36         .label {
37             .column:not(.main) & { 37             .column:not(.main) & {
38                 font-weight: normal; 38                 font-weight: normal;
39             } 39             }
40             font-size: 0.92em; 40             font-size: 0.92em;
41         } 41         }
42         .note { 42         .note {
43           font-size: 0.92em; 43           font-size: 0.92em;
44         } 44         }
45         .field.choice { 45         .field.choice {
46             margin-bottom: @indent__s; 46             margin-bottom: @indent__s;
47             &:last-child { 47             &:last-child {
48                 margin-bottom: 0; 48                 margin-bottom: 0;
49             } 49             }
50         } 50         }
51     } 51     }
52     > .legend { 52     > .legend {
53       color: #222529; 53       color: #222529;
54     } 54     }
55 } 55 }
56 .legend + .fieldset, 56 .legend + .fieldset,
57 .legend + div { 57 .legend + div {
58     clear: both; 58     clear: both;
59 } 59 }
60 .legend { 60 .legend {
61     span { 61     span {
62         margin-right: @indent__xs; 62         margin-right: @indent__xs;
63     } 63     }
64 } 64 }
65 fieldset.field { 65 fieldset.field {
66     border: 0; 66     border: 0;
67     padding: 0; 67     padding: 0;
68 } 68 }
69 .field.date { 69 .field.date {
70     .time-picker { 70     .time-picker {
71         white-space: nowrap; 71         white-space: nowrap;
72         margin-top: @indent__s; 72         margin-top: @indent__s;
73         display: inline-block; 73         display: inline-block;
74     } 74     }
75 } 75 }
76  76 
77 .select-styling() { 77 .select-styling() {
78     .lib-css(appearance, none, 1); 78     .lib-css(appearance, none, 1);
79     appearance: none; 79     appearance: none;
80     border: 1px solid @border-color__base; 80     border: 1px solid @border-color__base;
81     height: 32px; 81     height: 32px;
82     background: #fff url('../images/select-bg.svg') no-repeat 99% 49%; 82     background: #fff url('../images/select-bg.svg') no-repeat 99% 49%;
83     background-size: 26px 60px; 83     background-size: 26px 60px;
84     padding-right: 25px; 84     padding-right: 25px;
85     text-indent: .01em; 85     text-indent: .01em;
86     text-overflow: ''; 86     text-overflow: '';
87     font-family: inherit; 87     font-family: inherit;
88     &::-ms-expand{ 88     &::-ms-expand{
89         display:none; 89         display:none;
90     } 90     }
91     .lt-ie10 & { 91     .lt-ie10 & {
92         background-image: none; 92         background-image: none;
93         padding-right: 4px; 93         padding-right: 4px;
94     } 94     }
95 } 95 }
96  96 
97 select { 97 select {
98     .select-styling(); 98     .select-styling();
99 } 99 }
100  100 
101 div.mage-error[generated] { 101 div.mage-error[generated] {
102     margin-top: 7px; 102     margin-top: 7px;
103     font-size: 1em; 103     font-size: 1em;
104 } 104 }
105 .field-error { 105 .field-error {
106     font-size: 1em; 106     font-size: 1em;
107 } 107 }
108 // TEMP 108 // TEMP
109  109 
110 .field .tooltip { 110 .field .tooltip {
111     .lib-tooltip(right); 111     .lib-tooltip(right);
112     .tooltip-content { 112     .tooltip-content {
113         min-width: 200px; 113         min-width: 200px;
114         white-space: normal; 114         white-space: normal;
115     } 115     }
116 } 116 }
117  117 
118 input:focus ~ .tooltip .tooltip-content, 118 input:focus ~ .tooltip .tooltip-content,
119 select:focus ~ .tooltip .tooltip-content { 119 select:focus ~ .tooltip .tooltip-content {
120     display: block; 120     display: block;
121 } 121 }
122  122 
123 .hasDatepicker { 123 .hasDatepicker {
124     + .ui-datepicker-trigger { 124     + .ui-datepicker-trigger {
125         .lib-button-reset(); 125         .lib-button-reset();
126         .lib-icon-font( 126         .lib-icon-font(
127         @_icon-font-content: @icon-calendar, 127         @_icon-font-content: @icon-calendar,
128         @_icon-font-color: @primary__color__lighter, 128         @_icon-font-color: @primary__color__lighter,
129         @_icon-font-size: @icon-calendar__font-size, 129         @_icon-font-size: @icon-calendar__font-size,
130         @_icon-font-line-height: @icon-calendar__font-size, 130         @_icon-font-line-height: @icon-calendar__font-size,
131         @_icon-font-display: block, 131         @_icon-font-display: block,
132         @_icon-font-text-hide: true 132         @_icon-font-text-hide: true
133         ); 133         );
134         display: inline-block; 134         display: inline-block;
135         vertical-align: middle; 135         vertical-align: middle;
136         &:focus { 136         &:focus {
137             box-shadow: none; 137             box-shadow: none;
138             outline: 0; 138             outline: 0;
139         } 139         }
140     } 140     }
141 } 141 }
142  142 
143 // 143 //
144 //    Sidebar forms 144 //    Sidebar forms
145 //-------------------------------------- 145 //--------------------------------------
146 .sidebar { 146 .sidebar {
147     .fieldset { 147     .fieldset {
148         margin: 0; 148         margin: 0;
149         > .field:not(.choice) >, 149         > .field:not(.choice) >,
150         .fields > .field { 150         .fields > .field {
151             &:not(:last-child) { 151             &:not(:last-child) {
152                 margin: 0 0 @form-field__vertical-indent; 152                 margin: 0 0 @form-field__vertical-indent;
153             } 153             }
154             .label { 154             .label {
155                 margin: 0 0 4px; 155                 margin: 0 0 4px;
156                 padding: 0 0 @indent__xs; 156                 padding: 0 0 @indent__xs;
157                 text-align: left; 157                 text-align: left;
158                 width: 100%; 158                 width: 100%;
159             } 159             }
160             .control { 160             .control {
161                 width: 100%; 161                 width: 100%;
162             } 162             }
163         } 163         }
164     } 164     }
165 } 165 }
166  166 
167 } 167 }
168  168 
169 // 169 //
170 //    Desktop 170 //    Desktop
171 //-------------------------------------- 171 //--------------------------------------
172 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { 172 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
173     .legend { 173     .legend {
174         .lib-css(border-bottom, @legend-border-bottom); 174         .lib-css(border-bottom, @legend-border-bottom);
175     } 175     }
176 } 176 }

Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.