Skip to content

Commit

Permalink
Remove icon cells from Table component. Fix Visualize landing table h…
Browse files Browse the repository at this point in the history
…eader bug and type icon position.
  • Loading branch information
cjcenizal committed Feb 4, 2017
1 parent 50e2da7 commit 5625264
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 30 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
confirm-click="listingController.deleteSelectedItems()"
confirmation="Are you sure you want to delete the selected visualizations? This action is irreversible!"
aria-label="Delete selected objects"
ng-hide="listingController.getSelectedItemsCount() === 0"
ng-if="listingController.getSelectedItemsCount() > 0"
tooltip="Delete selected visualizations"
>
<span aria-hidden="true" class="kuiButton__icon kuiIcon fa-trash"></span>
Expand All @@ -52,7 +52,7 @@
class="kuiButton kuiButton--primary"
href="#/visualize/step/1"
aria-label="Create new visualization"
ng-hide="listingController.getSelectedItemsCount() > 0"
ng-if="listingController.getSelectedItemsCount() === 0"
tooltip="Create new visualization"
>
<span aria-hidden="true" class="kuiButton__icon kuiIcon fa-plus"></span>
Expand Down Expand Up @@ -80,9 +80,6 @@
>
</th>

<th class="kuiTableHeaderCell kuiTableHeaderCell--icon">
</th>

<th class="kuiTableHeaderCell">
Name
</th>
Expand All @@ -107,10 +104,6 @@
>
</td>

<td class="kuiTableRowCell kuiTableRowCell--icon">
<div class="kuiIcon kuiIcon--basic {{ item.icon }}"></div>
</td>

<td class="kuiTableRowCell">
<div class="kuiTableRowCell__liner">
<a class="kuiLink" ng-href="{{ item.url }}">
Expand All @@ -121,7 +114,10 @@

<td class="kuiTableRowCell">
<div class="kuiTableRowCell__liner">
{{ item.type.title }}
<span class="kuiStatusText">
<span class="kuiStatusText__icon kuiIcon {{ item.icon }}"></span>
{{ item.type.title }}
</span>
</div>
</td>
</tr>
Expand Down
4 changes: 1 addition & 3 deletions ui_framework/components/table/_table.scss
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,7 @@
* 2. Align checkbox with text in other cells.
*/
.kuiTableHeaderCell--checkBox,
.kuiTableRowCell--checkBox,
.kuiTableHeaderCell--icon,
.kuiTableRowCell--icon {
.kuiTableRowCell--checkBox {
width: 28px; /* 1 */
padding-right: 0;
line-height: 1;
Expand Down
4 changes: 1 addition & 3 deletions ui_framework/dist/ui_framework.css
Original file line number Diff line number Diff line change
Expand Up @@ -1424,9 +1424,7 @@ body {
* 2. Align checkbox with text in other cells.
*/
.kuiTableHeaderCell--checkBox,
.kuiTableRowCell--checkBox,
.kuiTableHeaderCell--icon,
.kuiTableRowCell--icon {
.kuiTableRowCell--checkBox {
width: 28px;
/* 1 */
padding-right: 0;
Expand Down
14 changes: 0 additions & 14 deletions ui_framework/doc_site/src/views/table/controlled_table.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@
<th class="kuiTableHeaderCell kuiTableHeaderCell--checkBox">
<input type="checkbox" class="kuiCheckBox">
</th>
<th class="kuiTableHeaderCell kuiTableHeaderCell--icon">
</th>
<th class="kuiTableHeaderCell">
Title
</th>
Expand All @@ -71,9 +69,6 @@
<td class="kuiTableRowCell kuiTableRowCell--checkBox">
<input type="checkbox" class="kuiCheckBox">
</td>
<th class="kuiTableRowCell kuiTableRowCell--icon">
<div class="kuiIcon kuiIcon--basic fa-coffee"></div>
</th>
<td class="kuiTableRowCell">
<a class="kuiLink" href="#">Alligator</a>
</td>
Expand All @@ -96,9 +91,6 @@
<td class="kuiTableRowCell kuiTableRowCell--checkBox">
<input type="checkbox" class="kuiCheckBox">
</td>
<th class="kuiTableRowCell kuiTableRowCell--icon">
<div class="kuiIcon kuiIcon--basic fa-bomb"></div>
</th>
<td class="kuiTableRowCell">
<a class="kuiLink" href="#">Boomerang</a>
</td>
Expand All @@ -121,9 +113,6 @@
<td class="kuiTableRowCell kuiTableRowCell--checkBox">
<input type="checkbox" class="kuiCheckBox">
</td>
<th class="kuiTableRowCell kuiTableRowCell--icon">
<div class="kuiIcon kuiIcon--basic fa-trophy"></div>
</th>
<td class="kuiTableRowCell">
<a class="kuiLink" href="#">Celebration</a>
</td>
Expand All @@ -146,9 +135,6 @@
<td class="kuiTableRowCell kuiTableRowCell--checkBox">
<input type="checkbox" class="kuiCheckBox">
</td>
<th class="kuiTableRowCell kuiTableRowCell--icon">
<div class="kuiIcon kuiIcon--basic fa-child"></div>
</th>
<td class="kuiTableRowCell">
<a class="kuiLink" href="#">Dog</a>
</td>
Expand Down

0 comments on commit 5625264

Please sign in to comment.