Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

278 inputgroup flexbox #279

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

278 inputgroup flexbox #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
73a9ef0
adding flexbox impl
Sep 25, 2018
a04f77e
linting
Sep 25, 2018
8d6a4ba
$ alignment
Sep 25, 2018
b2073c5
variable use
Sep 25, 2018
481a1aa
fixing IE alignment issues
Sep 26, 2018
5752445
moved all flexbox into @supports (display: flex)
Sep 26, 2018
a7dc556
adding button alignment overrides
Sep 26, 2018
91acf40
linting
Sep 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 59 additions & 1 deletion examples/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,68 @@ class App extends PureComponent<{}, AppState> {
</Row>

<Row>
<Column>
<Column xs={12} sm={6}>
<h3>Using DIVs as Buttons</h3>
<InputGroup>
<input type="number" />
<Button component="div" tabIndex={0}>
Done
</Button>
</InputGroup>

<InputGroup block>
<InputGroupAddon>$</InputGroupAddon>
<input type="number" />
<Button component="div" tabIndex={0}>
Done
</Button>
</InputGroup>

<InputGroup block>
<InputGroupAddon>
<span>$</span>
</InputGroupAddon>
<input type="number" />
<Button component="div" tabIndex={0}>
Done
</Button>
</InputGroup>

<InputGroup>
<Button component="div" tabIndex={0}>
1
</Button>
<Button component="div" tabIndex={0}>
2
</Button>
<Button component="div" tabIndex={0}>
3
</Button>
<Button component="div" tabIndex={0}>
4
</Button>
</InputGroup>
</Column>
<Column xs={12} sm={6}>
<h3>Using Buttons</h3>
<InputGroup>
<InputGroupAddon>£</InputGroupAddon>
<input type="number" />
</InputGroup>
<InputGroup block>
<InputGroupAddon>£</InputGroupAddon>
<input type="number" />
<Button>I'm a button!</Button>
</InputGroup>
<InputGroup>
<input type="number" />
<Button>Send Button</Button>
</InputGroup>
<InputGroup block>
<Button>Button 1</Button>
<Button>Button 2</Button>
<Button>Button 3</Button>
<Button>Button 4</Button>
</InputGroup>
</Column>
</Row>
Expand Down
1 change: 1 addition & 0 deletions src/less/buttons.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@

&.block {
display: block;
display: flex; // lesshint duplicateProperty: false
width: 100%;
margin-left: 0;
}
Expand Down
119 changes: 77 additions & 42 deletions src/less/inputs.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,66 +131,101 @@ textarea {
}

.input-group {
display: inline-table !important; // lesshint importantRule: false
display: inline-table;
width: auto;
margin-top: @margin-large;
margin-bottom: @margin-large;
margin: @margin-large auto;
border-collapse: separate;
border-spacing: 0;

&.block {
display: table;
width: 100%;
}

& > * { // lesshint universalSelector: false
width: 1px;
button,
.button,
.input-group-addon {
width: 1%;
white-space: nowrap;
vertical-align: middle;
}

& > input,
& > .input,
& > select,
& > .select {
width: 100%;
}
}

& > label,
& > input,
& > select,
& > button,
& > .input-group-addon,
& > .input,
& > .select,
& > .label,
& > .button {
display: table-cell;
margin-top: 0;
margin-bottom: 0;
input,
button,
.button,
.input-group-addon {
border: @input-border;
border-right: @border-none;

&:first-child {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
border-left-width: 0;
}

&:last-child {
border: @input-border;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
/* IE10 layout fix */
div.button {
overflow: inherit;
}

&:not(:last-child):not(:first-child) {
border-radius: 0;
}
& > *:first-child { // lesshint universalSelector: false
border-left: @input-border;
border-top-left-radius: @border-radius-base;
border-bottom-left-radius: @border-radius-base;
}

& > input,
& > select,
& > .input,
& > .select {
width: 100%;
& > *:last-child { // lesshint universalSelector: false
border-top-right-radius: @border-radius-base;
border-bottom-right-radius: @border-radius-base;
}

& > .input-group-addon {
& > * { // lesshint universalSelector: false
display: table-cell;
min-height: @input-height;
border-left-width: none;
border-radius: 0;
vertical-align: middle;
height: @input-height;
white-space: nowrap;
}

.input-group-addon {
padding: @padding-base / 2 @padding-base;
border-radius: @border-radius-base;
background-color: @input-group-addon-background;
line-height: 1em;
}
}

@supports (display: flex) {
.input-group {
display: inline-flex;

&.block {
display: flex;

& > input,
& > .input,
& > select,
& > .select {
flex-grow: 1;
justify-self: stretch;
width: auto;
}

button,
.button,
.input-group-addon {
width: auto;
}
}

button,
.button,
.input-group-addon {
display: inline-flex;
}

.input-group-addon {
align-items: center;
}
}
}
2 changes: 2 additions & 0 deletions src/less/overrides.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,12 @@ pre {
cursor: pointer;
overflow: hidden;
display: inline-block;
display: inline-flex; // lesshint duplicateProperty: false
text-decoration: none;
font-size: @font-size-button;
line-height: @line-height-button;
height: auto;
align-items: center;
}

button {
Expand Down