Skip to content

Commit

Permalink
Merge pull request #18 from fleetbase/styling-updates
Browse files Browse the repository at this point in the history
small styling updates for tag input component, and added param to adj…
  • Loading branch information
roncodes authored Aug 25, 2023
2 parents da1d0f4 + 439aac1 commit a7ac588
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
4 changes: 2 additions & 2 deletions addon/components/table.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
rows=@rows
pagination=@pagination
body=(component "table/body" selectable=@selectable rows=@rows columns=this.visibleColumns canExpand=@canExpand onRowClick=@onRowClick)
head=(component "table/head" canSelectAll=@canSelectAll canExpand=@canExpand rows=@rows columns=this.visibleColumns allRowsToggled=this.allRowsToggled selectAllRows=this.selectAllRows)
head=(component "table/head" canSelectAll=@canSelectAll canExpand=@canExpand rows=@rows columns=this.visibleColumns allRowsToggled=this.allRowsToggled selectAllRows=this.selectAllRows selectAllColumnWidth=@selectAllColumnWidth)
)}}
{{#if @insertPagination}}
<Table::Foot @tfootVerticalOffset={{@tfootVerticalOffset}} @tfootVerticalOffsetElements={{@tfootVerticalOffsetElements}}>
Expand All @@ -25,7 +25,7 @@
<Table::Head @canSelectAll={{@canSelectAll}} @columns={{this.visibleColumns}}>
<Table::Row>
{{#if @canSelectAll}}
<Table::Th @width={{40}} @resizable={{false}}>
<Table::Th @width={{or @selectAllColumnWidth 40}} @resizable={{false}}>
<Table::Cell::Checkbox @value={{this.allRowsToggled}} @onToggle={{this.selectAllRows}} />
</Table::Th>
{{/if}}
Expand Down
5 changes: 4 additions & 1 deletion addon/components/table/cell/base.hbs
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<div aria-label={{n-a @value}}>
<div class="relative" aria-label={{n-a @value}}>
<span class={{@column.cellClassNames}}>
{{#if (has-block)}}
{{yield}}
{{else}}
{{n-a @value}}
{{/if}}
</span>
{{#if @column.showOnlineIndicator}}
<FaIcon @icon="circle" class="absolute left-0 top-0 {{if (get @row (or @onlineColumn 'online')) "text-green-500" "text-yellow-200"}}" />
{{/if}}
</div>
6 changes: 5 additions & 1 deletion addon/styles/components/input.css
Original file line number Diff line number Diff line change
Expand Up @@ -443,10 +443,13 @@ body[data-theme='dark'] .money-input-currency-selector .ember-basic-dropdown-con
@apply border border-blue-900 bg-gray-900 py-1;
}

.emberTagInput.form-input,
.emberTagInput {
height: 39px;
display: flex;
flex-direction: row;
padding: 0.25rem 0.5rem;
line-height: 1rem;
}

.emberTagInput li.emberTagInput-new {
Expand All @@ -459,7 +462,8 @@ body[data-theme='dark'] .money-input-currency-selector .ember-basic-dropdown-con
@apply text-sm;
background-color: transparent;
margin: 0;
padding: 0;
line-height: 1.25rem;
padding: 0.25rem;
}

.emberTagInput .emberTagInput-tag {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fleetbase/ember-ui",
"version": "0.1.7",
"version": "0.1.8",
"description": "Fleetbase UI provides all the interface components, helpers, services and utilities for building a Fleetbase extension into the Console.",
"keywords": [
"fleetbase-ui",
Expand Down

0 comments on commit a7ac588

Please sign in to comment.