Skip to content

Commit 632c958

Browse files
authored
Merge pull request #80 from rackerlabs/fix-icon-squash
Fix Icon Styling
2 parents 1d74410 + 434af85 commit 632c958

File tree

4 files changed

+13
-15
lines changed

4 files changed

+13
-15
lines changed

source/_templates/partials/head.njk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u"
1313
crossorigin="anonymous">
1414

15-
<link rel="stylesheet" href="bootstrap.helix.css">
15+
<link rel="stylesheet" href="https://2d2bf231b82dfe76fe36-fa12562cfe810d69bedcc36a0ac289ef.ssl.cf1.rackcdn.com/css/bootstrap.helix.css">
1616
<link rel="stylesheet" href="helix-ui.css">
1717
<link rel="stylesheet" href="docs.css">
1818

source/components/icon/HxIcon.less

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
1-
:host {
2-
background-color: inherit;
3-
color: inherit;
4-
display: inline-block;
5-
height: 1em;
6-
width: 1em;
1+
@import (reference) './hx-icon';
72

8-
/*
9-
if the requested icon type is not valid (nothing injected),
10-
make sure the element doesn't consume space on the page.
11-
*/
12-
&:empty {
13-
height: 0;
14-
width: 0;
15-
}
3+
:host {
4+
&:extend(hx-icon);
165
}
176

187
::slotted(svg) {
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
hx-icon {
2+
background-color: inherit;
3+
color: inherit;
4+
display: inline-block;
5+
flex-shrink: 0;
6+
height: 1em;
7+
width: 1em;
8+
}

source/helix-ui.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
@import 'checkbox/checkbox';
2020
@import 'code/code';
2121
@import 'grid/grid';
22+
@import 'icon/hx-icon';
2223
@import 'navigation/navigation';
2324
@import 'reveal/reveal';
2425
@import 'table/table';

0 commit comments

Comments
 (0)