Skip to content

Commit

Permalink
docs: fix combobox and table docs (#3191)
Browse files Browse the repository at this point in the history
* fix combobox and table docs

* more fixes

* allow empty
  • Loading branch information
mikerodonnell89 committed Sep 3, 2020
1 parent 69989b0 commit d0d49b1
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<fieldset fd-fieldset class="flex-form">
<div fd-form-item>
<label fd-form-label for="form-combo-2">Select Fruit:</label>
<fd-combobox formControlName="disabledComboControl" fd-form-control id="form-combo-2"></fd-combobox>
<fd-combobox formControlName="disabledComboControl" id="form-combo-2"></fd-combobox>
Disabled: {{ customForm.controls.disabledComboControl.disabled }}<br />
Selected Value: {{ customForm.controls.disabledComboControl.value }}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<label fd-form-label>Success</label>
<fd-form-input-message-group>
<fd-input-group
fd-form-control
[addOnText]="'Button'"
[compact]="true"
[button]="true"
Expand All @@ -39,7 +38,6 @@
<label fd-form-label>Warning</label>
<fd-form-input-message-group>
<fd-input-group
fd-form-control
[addOnText]="'Button'"
[button]="true"
[state]="'warning'"
Expand All @@ -57,7 +55,6 @@
<label fd-form-label>Error</label>
<fd-form-input-message-group>
<fd-input-group
fd-form-control
[addOnText]="'Button'"
[button]="true"
[state]="'error'"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import { TableToolbarExampleComponent } from './examples/table-toolbar-example.c
import { TableCustomDialogComponent } from './examples/table-custom-columns-example/table-custom-dialog.component';
import { CdkTableModule } from '@angular/cdk/table';
import { DragDropModule } from '@angular/cdk/drag-drop';
import { SharedDocumentationModule } from '../../../documentation/shared-documentation.module';

const routes: Routes = [
{
Expand Down Expand Up @@ -61,6 +62,7 @@ const routes: Routes = [
ObjectStatusModule,
SharedDocumentationPageModule,
RouterModule.forChild(routes),
SharedDocumentationModule
],
exports: [RouterModule],
declarations: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ export class CoreDocumentationComponent extends DocumentationBaseComponent {
{ url: 'core/popover', name: 'Popover' },
{ url: 'core/product-switch', name: 'Product Switch' },
{ url: 'core/radio', name: 'Radio Button' },
{ url: 'core/select-native', name: 'Select Native' },
{ url: 'core/select', name: 'Select' },
{ url: 'core/shellbar', name: 'Shellbar' },
{ url: 'core/sideNavigation', name: 'Side Navigation' },
Expand Down
2 changes: 1 addition & 1 deletion libs/core/src/lib/combobox/combobox.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<fd-input-group
[compact]="compact"
[button]="showDropdownButton"
[glyph]="showDropdownButton ? glyph : ''"
[glyph]="showDropdownButton ? glyph : ' '"
[state]="state"
[buttonFocusable]="buttonFocusable"
[disabled]="disabled || readOnly"
Expand Down

0 comments on commit d0d49b1

Please sign in to comment.