423. Araxis Merge File Comparison Report

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

423.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/web/css/source_forms.less2016-05-15 11:49:36 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto_rtl/web/css/source_forms.less2021-02-03 11:06:08 +0000

423.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged7324
Changed14
Inserted412
Removed11

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

423.4 Active regular expressions

No regular expressions were active.

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

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