Merge branch 'master' of http://192.168.20.39:8989/r/apache-tomcat-8.5.78

13693261870

2022-09-16 354b3dbfbffb3df45212a2a44dbbf48b4acc2594

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
.#{$prefix}grid-row-editor {
    .#{$prefix}field {
        margin: 0 ceil($grid-row-editor-field-spacing / 2) 0 floor($grid-row-editor-field-spacing / 2);
    }
 
    @if $include-ext-form-field-display {
        .#{$prefix}form-display-field {
            padding: 
                top($grid-row-editor-field-padding) + $form-field-border-width
                right($grid-row-editor-field-padding) + $form-field-border-width
                bottom($grid-row-editor-field-padding) + $form-field-border-width
                left($grid-row-editor-field-padding) + $form-field-border-width;
        }
 
        @if $include-ext-grid-column-action {
            .#{$prefix}form-action-col-field {
                padding:
                    max(ceil(($grid-editor-height - $grid-actioncolumn-icon-height) / 2), 0)
                    max($grid-actioncolumn-horizontal-padding - ceil($grid-row-editor-field-spacing / 2), 0)
                    max(floor(($grid-editor-height - $grid-actioncolumn-icon-height) / 2), 0)
                    max($grid-actioncolumn-horizontal-padding - floor($grid-row-editor-field-spacing / 2), 0);
            }
        }
    }
 
    @if $include-ext-form-field-text {
        .#{$prefix}form-text {
            padding: $grid-row-editor-field-padding;
 
            .#{$prefix}gecko & {
                // firefox adds an additional px of horizontal space inside text inputs
                padding-left: max((left($grid-row-editor-field-padding) - 1), 0);
                padding-right: max((right($grid-row-editor-field-padding) - 1), 0);
            }
        }
    }
 
    .#{$prefix}panel-body {
        // !important is needed to override dock layout border-management rules
        border-top: $grid-row-editor-border !important;
        border-bottom: $grid-row-editor-border !important;
        padding: $grid-row-editor-padding;
        background-color: $grid-row-editor-background-color;
    }
 
    @if $include-ext-form-field-checkbox {
        .#{$prefix}grid-with-col-lines & {
            .#{$prefix}form-cb {
                margin-right: $grid-row-cell-border-width;
            }
 
            @if $include-rtl {
                .#{$prefix}rtl.#{$prefix}form-cb {
                    margin-right: 0;
                    margin-left: $grid-row-cell-border-width;
                }
            }
        }
    }
}
 
@include x-frame(
    $cls: grid-row-editor-buttons,
    $ui: default-bottom, // change default to $ui when RowEditor adds ui support
    $border-radius: 0 0
        $grid-row-editor-button-container-border-radius
        $grid-row-editor-button-container-border-radius,
    $border-width: 0
        $grid-row-editor-border-width
        $grid-row-editor-border-width
        $grid-row-editor-border-width,
    $padding: $grid-row-editor-button-container-padding,
    $background-color: $grid-row-editor-background-color,
    $background-gradient: null,
    $table: true
);
 
@include x-frame(
    $cls: grid-row-editor-buttons,
    $ui: default-top, // change default to $ui when RowEditor adds ui support
    $border-radius:
        $grid-row-editor-button-container-border-radius
        $grid-row-editor-button-container-border-radius
        0 0,
    $border-width:
        $grid-row-editor-border-width
        $grid-row-editor-border-width
        0
        $grid-row-editor-border-width,
    $padding: flip-vertical($grid-row-editor-button-container-padding),
    $background-color: $grid-row-editor-background-color,
    $background-gradient: null,
    $table: true
);
 
// change default to #{$ui} when RowEditor adds ui support
.#{$prefix}grid-row-editor-buttons-default-bottom {
    top: $grid-editor-height + vertical($grid-row-editor-padding) +
        top($grid-row-editor-border-width);
}
 
// change default to #{$ui} when RowEditor adds ui support
.#{$prefix}grid-row-editor-buttons-default-top {
    bottom: $grid-editor-height + vertical($grid-row-editor-padding) +
        bottom($grid-row-editor-border-width);
}
 
.#{$prefix}grid-row-editor-buttons {
    border-color: $grid-row-editor-border-color;
}
 
.#{$prefix}row-editor-update-button {
    margin-right: ceil($grid-row-editor-button-spacing / 2);
}
.#{$prefix}row-editor-cancel-button {
    margin-left: floor($grid-row-editor-button-spacing / 2);
}
 
@if $include-rtl {
    .#{$prefix}rtl.#{$prefix}row-editor-update-button {
        margin-left: ceil($grid-row-editor-button-spacing / 2);
        margin-right: auto;
    }
    .#{$prefix}rtl.#{$prefix}row-editor-cancel-button {
        margin-right: floor($grid-row-editor-button-spacing / 2);
        margin-left: auto;
    }
}
 
.#{$prefix}grid-row-editor-errors {
    .#{$prefix}tip-body {
        padding: $grid-row-editor-error-tip-body-padding;
    }
}
 
.#{$prefix}grid-row-editor-errors-item {
    list-style: $grid-row-editor-error-tip-list-style;
    margin-left: $grid-row-editor-error-tip-list-spacing;
}
 
@if $include-rtl {
    .#{$prefix}rtl.#{$prefix}grid-row-editor-errors {
        .#{$prefix}grid-row-editor-errors-item {
            margin-left: 0;
            margin-right: $grid-row-editor-error-tip-list-spacing;
        }
    }
}