Skip to content

Commit 2d335a9

Browse files
mindreeper2420mindreeper2420
authored
Merge pull request #7 from mindreeper2420/v0.8.0
fix(update): Generalize icon names; update stylesheets
2 parents dd1d3e2 + 93c673a commit 2d335a9

File tree

8 files changed

+18
-25
lines changed

8 files changed

+18
-25
lines changed

‎_includes/header.html‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta name="description" content="Red Hat User Experience Design">
77
<meta name="author" content="Red Hat UXD">
88
<meta http-equiv="X-UA-Compatible" content="IE=edge">
9-
<link rel="shortcut icon" href="{{ page.relative_path }}assets/img/uxd.png">
9+
<link rel="shortcut icon" href="{{ page.relative_path }}assets/img/favicon.png">
1010
<title>{% if page.title %}{{ page.title }}{% endif %}</title>
1111
<!-- link to main stylesheet -->
1212
<link rel="stylesheet" type="text/css" href="{{ page.relative_path }}assets/css/styles.css">
@@ -19,7 +19,5 @@
1919
<!-- Site JS -->
2020
<script src="{{ page.relative_path }}assets/js/designSearch.js"></script>
2121
<script src="{{ page.relative_path }}assets/js/designSort.js"></script>
22-
<!-- Place this tag in your head or just before your close body tag. -->
23-
<script async defer src="https://buttons.github.io/buttons.js"></script>
2422
</head>
2523
<body>

‎_includes/nav.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<span class="icon-bar"></span>
1010
</button>
1111
<a class="navbar-brand" href="{{ page.relative_path }}">
12-
<img alt="brand" src="{{ page.relative_path }}assets/img/uxd.png" alt="UXD" width="25px">
12+
<img alt="brand" src="{{ page.relative_path }}assets/img/icon.png" alt="UXD" width="25px">
1313
</a>
1414
</div>
1515
<!-- Collect the nav links, forms, and other content for toggling -->

‎_sass/base.scss‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,6 @@ body { font-size: $fa-font-size-base; }
1616
text-decoration: none;
1717
}
1818
}
19-
.green { background-color: $color-pf-green-200; }
20-
.blue { background-color: $color-pf-blue-200; }
21-
.light-blue { background-color: $color-pf-blue-100; }
22-
.light-blue-text { color: $color-pf-black !important; }
23-
.orange { background-color: $color-pf-orange-200; }
24-
.purple {
25-
background-color: $color-pf-purple-200;
26-
color: $color-pf-white;
27-
}
28-
.red {
29-
background-color: $color-pf-red-100;
30-
color: $color-pf-white;
31-
}
3219
.filter-control {
3320
list-style: none;
3421
padding: 0 5px;

‎_sass/table-colors.scss‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
@import "vendor/patternfly/variables.scss";
2+
3+
.green { background-color: $color-pf-green-200; }
4+
.blue { background-color: $color-pf-blue-200; }
5+
.light-blue { background-color: $color-pf-blue-100; }
6+
.light-blue-text { color: $color-pf-black !important; }
7+
.orange { background-color: $color-pf-orange-200; }
8+
.purple {
9+
background-color: $color-pf-purple-200;
10+
color: $color-pf-white;
11+
}
12+
.red {
13+
background-color: $color-pf-red-100;
14+
color: $color-pf-white;
15+
}

‎assets/css/styles.scss‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,11 @@
33
---
44
@charset "utf-8";
55

6-
// PatternFly import
7-
//@import "patternfly/patternfly";
8-
9-
// Variables to modify font folders
10-
// $icon-font-path: "../fonts/bootstrap";
11-
// $fa-font-path: "../fonts/font-awesome";
12-
136
// Imports
147
@import "../_sass/vendor/patternfly/_patternfly";
15-
// @import "_bootstrap";
168
@import "../_sass/vendor/patternfly/font-awesome";
179

1810
// Site styles
1911
@import "base";
12+
@import "table-colors";
2013
@import "design-links";

‎assets/img/uxd.png‎ renamed to ‎assets/img/favicon.png‎

File renamed without changes.

‎assets/img/icon.png‎

67.2 KB
Loading

‎assets/img/uxd_logo.png‎

-4.32 KB
Binary file not shown.

0 commit comments

Comments
 (0)