Skip to content
This repository has been archived by the owner on Dec 8, 2022. It is now read-only.

Inset button wrap fix #211

Merged
merged 2 commits into from
Oct 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 12 additions & 1 deletion e2e/input-box.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ describe('Input box', () => {
it('should match previous input box with select when disabled', async (done) => {
await SkyHostBrowser.scrollTo('#input-box-select-disabled');

expect('#input-box-select').toMatchBaselineScreenshot(done, {
expect('#input-box-select-disabled').toMatchBaselineScreenshot(done, {
screenshotName: getScreenshotName('input-box-select-disabled')
});
});
Expand Down Expand Up @@ -519,6 +519,17 @@ describe('Input box', () => {
});
}
);

it(
'should match previous narrow input box with an inset button',
async (done) => {
await SkyHostBrowser.scrollTo('#input-box-button-inset-narrow');

expect('#input-box-button-inset-narrow').toMatchBaselineScreenshot(done, {
screenshotName: getScreenshotName('input-box-button-inset-narrow')
});
}
);
}

beforeEach(async () => {
Expand Down
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@angular/platform-browser": "9.1.12",
"@angular/platform-browser-dynamic": "9.1.12",
"@angular/router": "9.1.12",
"@blackbaud/auth-client": "2.34.0",
"@blackbaud/auth-client": "2.35.0",
"@blackbaud/skyux-lib-clipboard": "4.0.0",
"@blackbaud/skyux-lib-code-block": "4.0.1",
"@blackbaud/skyux-lib-media": "4.0.0",
Expand All @@ -53,7 +53,7 @@
"@skyux/core": "4.3.0",
"@skyux/datetime": "4.5.2",
"@skyux/docs-tools": "4.7.1",
"@skyux/forms": "4.13.0",
"@skyux/forms": "4.13.1",
"@skyux/http": "4.0.1",
"@skyux/i18n": "4.0.2",
"@skyux/indicators": "4.5.0",
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions src/app/public/modules/input-box/input-box.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ sky-input-box {
background-color: $sky-color-white;
@include sky-input-box-modern-border;
color: $sky-theme-modern-font-data-label-color;
flex-wrap: nowrap;
margin-bottom: 0;
padding: 0;

Expand Down
37 changes: 37 additions & 0 deletions src/app/visual/input-box/input-box-visual.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -686,6 +686,43 @@
</sky-column>
</sky-row>

<sky-row>
<sky-column>
<div
id="input-box-button-inset-narrow"
>
<sky-input-box
class="sky-margin-stacked-lg"
>
<label
class="sky-control-label"
[for]="inputBoxButtonInsetNarrow.id"
>
Input with inset button (narrow)
</label>
<input
class="sky-form-control"
skyId
type="text"
#inputBoxButtonInsetNarrow="skyId"
>
<div
class="sky-input-group-btn sky-input-box-btn-inset"
>
<button
class="sky-btn sky-btn-default"
type="button"
>
<sky-icon
icon="search"
></sky-icon>
</button>
</div>
</sky-input-box>
</div>
</sky-column>
</sky-row>

</sky-fluid-grid>

</div>
4 changes: 4 additions & 0 deletions src/app/visual/input-box/input-box-visual.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@
min-height: 1px;
min-width: 1px;
}

#input-box-button-inset-narrow {
width: 300px;
}