Skip to content

Commit

Permalink
Reintroduce CSS style variables
Browse files Browse the repository at this point in the history
  • Loading branch information
davidrleonard committed Nov 30, 2016
1 parent 8f7a47a commit 78936c6
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 14 deletions.
6 changes: 5 additions & 1 deletion HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
v1.0.0
==================
* Reintroduce CSS style variables

v0.1.7
==================
* remove CSS style variables from 0.4.X release track
* remove CSS style variables from 0.1.X release track

v0.1.6
==================
Expand Down
20 changes: 10 additions & 10 deletions _objects.actionable.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
&:visited,
&:active,
&:focus {
color: $primary-blue;
color: var(--px-actionable-text-color, $primary-blue);
}
&:hover{
color: $primary-blue-hover;
color: var(--px-actionable-text-color--hover, $primary-blue-hover);
}
&:active {
color: $primary-blue-pressed;
color: var(--px-actionable-text-color--active, $primary-blue-pressed);
}
}

Expand All @@ -41,13 +41,13 @@
&:visited,
&:active,
&:focus {
color: $select-blue-default;
color: var(--px-selectable-text-color, $select-blue-default);
}
&:hover{
color: $select-blue-hover;
color: var(--px-selectable-text-color--hover, $select-blue-hover);
}
&:active {
color: $select-blue-pressed;
color: var(--px-selectable-text-color--active, $select-blue-pressed);
}
}

Expand All @@ -57,13 +57,13 @@
&:visited,
&:active,
&:focus {
color: $gray8;
color: var(--px-actionable-alt-text-color, $gray8);
}
&:hover{
color: $primary-blue;
color: var(--px-actionable-alt-text-color--hover, $primary-blue);
}
&:active {
color: $primary-blue-pressed;
color: var(--px-actionable-alt-text-color--active, $primary-blue-pressed);
}
}

Expand All @@ -75,7 +75,7 @@
&:hover,
&:active {
cursor: not-allowed;
color: $gray4;
color: var(--px-disabled-text-color, $gray4);
}
}

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "px-actionable-text-icons-design",
"version": "0.1.7",
"version": "1.0.0",
"authors": [
"General Electric"
],
Expand Down
2 changes: 1 addition & 1 deletion css/px-actionable-text-icons-design-demo.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "px-actionable-text-icons-design",
"version": "0.1.7",
"version": "1.0.0",
"description": "Actionable Text and Icon styles for Predix Experience",
"private": false,
"scripts": {
Expand Down

0 comments on commit 78936c6

Please sign in to comment.