Skip to content

Commit

Permalink
Add kuiIcon--basic and support icons in Table component. Display icon…
Browse files Browse the repository at this point in the history
…s in Visualize landing page.
  • Loading branch information
cjcenizal committed Feb 4, 2017
1 parent 5a5eecb commit 1dbffd1
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,14 @@
ng-click="landingController.toggleAll()"
>
</th>

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

<th class="kuiTableHeaderCell">
Visualization
</th>

<th class="kuiTableHeaderCell">
Type
</th>
Expand All @@ -102,6 +107,10 @@
>
</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 Down
1 change: 0 additions & 1 deletion src/core_plugins/kibana/public/visualize/wizard/wizard.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { DashboardConstants } from 'plugins/kibana/dashboard/dashboard_constants
import routes from 'ui/routes';
import RegistryVisTypesProvider from 'ui/registry/vis_types';
import uiModules from 'ui/modules';
import './wizard.less';

const module = uiModules.get('app/visualize', ['kibana/courier']);

Expand Down
6 changes: 0 additions & 6 deletions src/core_plugins/kibana/public/visualize/wizard/wizard.less

This file was deleted.

1 change: 1 addition & 0 deletions src/ui_framework/doc_site/src/views/icon/icon_basic.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div class="kuiIcon kuiIcon--basic fa-gear"></div>
4 changes: 4 additions & 0 deletions ui_framework/components/icon/_icon.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,7 @@
.kuiIcon--inactive {
color: $inactiveColor;
}

.kuiIcon--basic {
color: #565656;
}
4 changes: 3 additions & 1 deletion ui_framework/components/table/_table.scss
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@
* 2. Align checkbox with text in other cells.
*/
.kuiTableHeaderCell--checkBox,
.kuiTableRowCell--checkBox {
.kuiTableRowCell--checkBox,
.kuiTableHeaderCell--icon,
.kuiTableRowCell--icon {
width: 28px; /* 1 */
padding-right: 0;
line-height: 1;
Expand Down
6 changes: 6 additions & 0 deletions ui_framework/doc_site/src/views/icon/icon_example.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ export default createExample([{
<p>Use this Icon to denote useful information.</p>
),
html: require('./icon_info.html'),
}, {
title: 'Basic',
description: (
<p>Use this Icon when you don't want to communicate any particular meaning with the icon's color.</p>
),
html: require('./icon_basic.html'),
hasDarkTheme: false,
}, {
title: 'Success',
Expand Down
14 changes: 14 additions & 0 deletions ui_framework/doc_site/src/views/table/controlled_table.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
<th class="kuiTableHeaderCell kuiTableHeaderCell--checkBox">
<input type="checkbox" class="kuiCheckBox">
</th>
<th class="kuiTableHeaderCell kuiTableHeaderCell--icon">
</th>
<th class="kuiTableHeaderCell">
Title
</th>
Expand All @@ -69,6 +71,9 @@
<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 @@ -91,6 +96,9 @@
<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 @@ -113,6 +121,9 @@
<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 @@ -135,6 +146,9 @@
<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 1dbffd1

Please sign in to comment.