Skip to content

Commit bdd57f6

Browse files
lazdbernhard-adobe
authored andcommitted
fix: fix button width in InputGroup, fix DatePicker example, fixes #399 (#431)
also fixes the dash overlapping the quiet datepicker, fixes #394
1 parent 9ab6ff2 commit bdd57f6

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

components/inputgroup/index.css

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ governing permissions and limitations under the License.
2222
--spectrum-datepicker-range-dash-margin-left: calc(-0.5 * var(--spectrum-global-dimension-static-font-size-100));
2323
--spectrum-datepicker-range-dash-padding-top: 0;
2424
--spectrum-datepicker-range-dash-line-height: calc(var(--spectrum-textfield-height) - var(--spectrum-global-dimension-size-100));
25+
26+
--spectrum-combobox-button-width: calc(var(--spectrum-global-dimension-size-400) + var(--spectrum-global-dimension-size-25));
2527
}
2628

2729
.spectrum-InputGroup {
@@ -33,7 +35,8 @@ governing permissions and limitations under the License.
3335
border-radius: var(--spectrum-border-radius);
3436

3537
.spectrum-FieldButton {
36-
padding: 0 var(--spectrum-dropdown-padding-x);
38+
padding: 0;
39+
width: var(--spectrum-combobox-button-width);
3740
border-top-left-radius: var(--spectrum-combobox-fieldbutton-border-top-left-radius);
3841
border-bottom-left-radius: var(--spectrum-combobox-fieldbutton-border-bottom-left-radius);
3942
}
@@ -48,12 +51,16 @@ governing permissions and limitations under the License.
4851

4952
.spectrum-InputGroup--quiet {
5053
border-radius: var(--spectrum-combobox-quiet-fieldbutton-border-radius);
51-
.spectrum-FieldButton {
52-
border-radius: var(--spectrum-combobox-quiet-fieldbutton-border-radius);
5354

55+
.spectrum-FieldButton {
56+
width: auto;
5457
position: relative;
58+
59+
padding-left: var(--spectrum-dropdown-padding-x);
5560
padding-right: var(--spectrum-combobox-quiet-fieldbutton-padding-right);
61+
5662
border-bottom: var(--spectrum-textfield-quiet-affixed-border-size) solid;
63+
border-radius: var(--spectrum-combobox-quiet-fieldbutton-border-radius);
5764

5865
/* More hitarea */
5966
&:after {

components/inputgroup/metadata/datepicker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ examples:
9595
<div class="spectrum-InputGroup spectrum-InputGroup--quiet spectrum-Datepicker spectrum-Datepicker--range" role="combobox" aria-expanded="false" aria-haspopup="dialog">
9696
<input type="text" class="spectrum-Textfield spectrum-Textfield--quiet spectrum-InputGroup-field spectrum-Datepicker-startField" placeholder="mm/dd/yyyy" name="start" value="2018-10-01">
9797
<div class="spectrum-Datepicker--rangeDash"></div>
98-
<input type="text" class="spectrum-Textfield spectrum-Textfield--quiet spectrum-InputGroup-field spectrum-Datepicker-startField" placeholder="mm/dd/yyyy" name="end" value="2018-10-30">
98+
<input type="text" class="spectrum-Textfield spectrum-Textfield--quiet spectrum-InputGroup-field spectrum-Datepicker-endField" placeholder="mm/dd/yyyy" name="end" value="2018-10-30">
9999
<button type="button" class="spectrum-FieldButton spectrum-FieldButton--quiet" tabindex="-1" aria-label="Calendar">
100100
<svg class="spectrum-Icon spectrum-UIIcon-ChevronDownMedium spectrum-Dropdown-icon" focusable="false" aria-hidden="true">
101101
<use xlink:href="#spectrum-css-icon-ChevronDownMedium" />

0 commit comments

Comments
 (0)