Skip to content

Commit 1dbffd1

Browse files
committed
Add kuiIcon--basic and support icons in Table component. Display icons in Visualize landing page.
1 parent 5a5eecb commit 1dbffd1

8 files changed

Lines changed: 37 additions & 8 deletions

File tree

src/core_plugins/kibana/public/visualize/landing/visualize_landing.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,14 @@
7979
ng-click="landingController.toggleAll()"
8080
>
8181
</th>
82+
83+
<th class="kuiTableHeaderCell kuiTableHeaderCell--icon">
84+
</th>
85+
8286
<th class="kuiTableHeaderCell">
8387
Visualization
8488
</th>
89+
8590
<th class="kuiTableHeaderCell">
8691
Type
8792
</th>
@@ -102,6 +107,10 @@
102107
>
103108
</td>
104109

110+
<td class="kuiTableRowCell kuiTableRowCell--icon">
111+
<div class="kuiIcon kuiIcon--basic {{ item.icon }}"></div>
112+
</td>
113+
105114
<td class="kuiTableRowCell">
106115
<div class="kuiTableRowCell__liner">
107116
<a class="kuiLink" ng-href="{{ item.url }}">

src/core_plugins/kibana/public/visualize/wizard/wizard.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { DashboardConstants } from 'plugins/kibana/dashboard/dashboard_constants
77
import routes from 'ui/routes';
88
import RegistryVisTypesProvider from 'ui/registry/vis_types';
99
import uiModules from 'ui/modules';
10-
import './wizard.less';
1110

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

src/core_plugins/kibana/public/visualize/wizard/wizard.less

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<div class="kuiIcon kuiIcon--basic fa-gear"></div>

ui_framework/components/icon/_icon.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,7 @@
3030
.kuiIcon--inactive {
3131
color: $inactiveColor;
3232
}
33+
34+
.kuiIcon--basic {
35+
color: #565656;
36+
}

ui_framework/components/table/_table.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@
8888
* 2. Align checkbox with text in other cells.
8989
*/
9090
.kuiTableHeaderCell--checkBox,
91-
.kuiTableRowCell--checkBox {
91+
.kuiTableRowCell--checkBox,
92+
.kuiTableHeaderCell--icon,
93+
.kuiTableRowCell--icon {
9294
width: 28px; /* 1 */
9395
padding-right: 0;
9496
line-height: 1;

ui_framework/doc_site/src/views/icon/icon_example.jsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ export default createExample([{
1717
<p>Use this Icon to denote useful information.</p>
1818
),
1919
html: require('./icon_info.html'),
20+
}, {
21+
title: 'Basic',
22+
description: (
23+
<p>Use this Icon when you don't want to communicate any particular meaning with the icon's color.</p>
24+
),
25+
html: require('./icon_basic.html'),
2026
hasDarkTheme: false,
2127
}, {
2228
title: 'Success',

ui_framework/doc_site/src/views/table/controlled_table.html

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@
4949
<th class="kuiTableHeaderCell kuiTableHeaderCell--checkBox">
5050
<input type="checkbox" class="kuiCheckBox">
5151
</th>
52+
<th class="kuiTableHeaderCell kuiTableHeaderCell--icon">
53+
</th>
5254
<th class="kuiTableHeaderCell">
5355
Title
5456
</th>
@@ -69,6 +71,9 @@
6971
<td class="kuiTableRowCell kuiTableRowCell--checkBox">
7072
<input type="checkbox" class="kuiCheckBox">
7173
</td>
74+
<th class="kuiTableRowCell kuiTableRowCell--icon">
75+
<div class="kuiIcon kuiIcon--basic fa-coffee"></div>
76+
</th>
7277
<td class="kuiTableRowCell">
7378
<a class="kuiLink" href="#">Alligator</a>
7479
</td>
@@ -91,6 +96,9 @@
9196
<td class="kuiTableRowCell kuiTableRowCell--checkBox">
9297
<input type="checkbox" class="kuiCheckBox">
9398
</td>
99+
<th class="kuiTableRowCell kuiTableRowCell--icon">
100+
<div class="kuiIcon kuiIcon--basic fa-bomb"></div>
101+
</th>
94102
<td class="kuiTableRowCell">
95103
<a class="kuiLink" href="#">Boomerang</a>
96104
</td>
@@ -113,6 +121,9 @@
113121
<td class="kuiTableRowCell kuiTableRowCell--checkBox">
114122
<input type="checkbox" class="kuiCheckBox">
115123
</td>
124+
<th class="kuiTableRowCell kuiTableRowCell--icon">
125+
<div class="kuiIcon kuiIcon--basic fa-trophy"></div>
126+
</th>
116127
<td class="kuiTableRowCell">
117128
<a class="kuiLink" href="#">Celebration</a>
118129
</td>
@@ -135,6 +146,9 @@
135146
<td class="kuiTableRowCell kuiTableRowCell--checkBox">
136147
<input type="checkbox" class="kuiCheckBox">
137148
</td>
149+
<th class="kuiTableRowCell kuiTableRowCell--icon">
150+
<div class="kuiIcon kuiIcon--basic fa-child"></div>
151+
</th>
138152
<td class="kuiTableRowCell">
139153
<a class="kuiLink" href="#">Dog</a>
140154
</td>

0 commit comments

Comments
 (0)