Skip to content

Commit

Permalink
Merge pull request #82 from vhx/link-hover-color
Browse files Browse the repository at this point in the history
Link hover color
  • Loading branch information
Narmin Shahin authored Sep 27, 2017
2 parents ab070c7 + b231807 commit 19e38cd
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 28 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### 1.5.4
**2017-9-27**
* default text now set to Regent Gray instead of Teal.

### 1.5.3
**2017-9-27**
* depreciated navy close icon, sidebars.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.5.3
1.5.4
2 changes: 1 addition & 1 deletion app/public/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -2058,7 +2058,7 @@ Q.components.guide.styleguide.ui.text.container = {
component: {
view: function() {
return m('div', [
m('a[href=#].text-2.block.margin-bottom-small', 'Link Teal (default)'),
m('a[href=#].text-2.block.margin-bottom-small', 'Link Regent Gray (default)'),
m('a[href=#].text-2.block.text--gray.margin-bottom-small', 'Link Gray'),
m('a[href=#].text-2.text--gray-light.inline.bg-navy.margin-bottom-small', 'Link Gray Light'),
m('a[href=#].text-2.block.text--navy.margin-bottom-small', 'Link Navy'),
Expand Down
6 changes: 3 additions & 3 deletions app/public/quartz.css
Original file line number Diff line number Diff line change
Expand Up @@ -6640,15 +6640,15 @@ body, ul, ol, dl, li, p, div, section, nav, table, h1, h2, h3, h4, h5, h6 {
a {
transition: color 200ms ease; }
a:link, a:visited {
color: #22B9B0;
color: #8699a6;
text-decoration: none; }
a:hover, a:active {
color: #149A97;
color: #00adef;
text-decoration: none; }
a.is-disabled:link, a.is-disabled:visited, a.is-disabled:hover, a.is-disabled:active {
cursor: default;
opacity: .5;
color: #22B9B0; }
color: #8699a6; }

/* sizes
......................................*/
Expand Down
2 changes: 1 addition & 1 deletion app/public/quartz.js
Original file line number Diff line number Diff line change
Expand Up @@ -1503,4 +1503,4 @@ vhxm.components.shared.select.ui.list.empty = {
view: function view() {
return m('li.padding-horz-large.padding-top-small.padding-bottom-medium.text--gray.text-center', 'No results');
}
};
};
20 changes: 10 additions & 10 deletions dist/component-checkbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -136,24 +136,24 @@
border: 1px solid #9aaab4; }

.form .checkbox.small {
min-height: 13.33333px; }
min-height: 13.3333333333px; }
.form .checkbox.small label {
min-height: 13.33333px;
line-height: 13.33333px; }
min-height: 13.3333333333px;
line-height: 13.3333333333px; }
.form .checkbox.small label .checkbox--icon {
width: 13.33333px;
height: 13.33333px; }
width: 13.3333333333px;
height: 13.3333333333px; }
.form .checkbox.small label .checkbox--icon .checkbox-animate {
width: 10.33333px;
height: 10.33333px;
width: 10.3333333333px;
height: 10.3333333333px;
top: 1px;
right: 1px; }
.form .checkbox.small label .checkbox--label {
width: calc(100% - 18.33333px);
left: 18.33333px; }
width: calc(100% - 18.3333333333px);
left: 18.3333333333px; }
.form .checkbox.small label .checkbox--label,
.form .checkbox.small label .checkbox--contain {
min-height: 13.33333px; }
min-height: 13.3333333333px; }

.form .checkbox.medium {
min-height: 20px; }
Expand Down
6 changes: 3 additions & 3 deletions dist/quartz.css
Original file line number Diff line number Diff line change
Expand Up @@ -7021,15 +7021,15 @@ body, ul, ol, dl, li, p, div, section, nav, table, h1, h2, h3, h4, h5, h6 {
a {
transition: color 200ms ease; }
a:link, a:visited {
color: #22B9B0;
color: #8699a6;
text-decoration: none; }
a:hover, a:active {
color: #149A97;
color: #00adef;
text-decoration: none; }
a.is-disabled:link, a.is-disabled:visited, a.is-disabled:hover, a.is-disabled:active {
cursor: default;
opacity: .5;
color: #22B9B0; }
color: #8699a6; }

/* sizes
......................................*/
Expand Down
2 changes: 1 addition & 1 deletion dist/quartz.min.css

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/text.css
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ body, ul, ol, dl, li, p, div, section, nav, table, h1, h2, h3, h4, h5, h6 {
a {
transition: color 200ms ease; }
a:link, a:visited {
color: #22B9B0;
color: #8699a6;
text-decoration: none; }
a:hover, a:active {
color: #149A97;
color: #00adef;
text-decoration: none; }
a.is-disabled:link, a.is-disabled:visited, a.is-disabled:hover, a.is-disabled:active {
cursor: default;
opacity: .5;
color: #22B9B0; }
color: #8699a6; }

/* sizes
......................................*/
Expand Down
4 changes: 2 additions & 2 deletions quartz-css/text/docs/guide.html.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Q.components.guide.styleguide.ui.text.container = {
component: {
view: function() {
return m('div', [
m('a[href=#].text-2.block.margin-bottom-small', 'Link Teal (default)'),
m('a[href=#].text-2.block.margin-bottom-small', 'Link Regent Gray (default)'),
m('a[href=#].text-2.block.text--gray.margin-bottom-small', 'Link Gray'),
m('a[href=#].text-2.text--gray-light.inline.bg-navy.margin-bottom-small', 'Link Gray Light'),
m('a[href=#].text-2.block.text--navy.margin-bottom-small', 'Link Navy'),
Expand All @@ -99,7 +99,7 @@ Q.components.guide.styleguide.ui.text.container = {
component: {
view: function() {
return m('div', [
m('a[href=#].text-2.is-disabled.block.margin-bottom-small', 'Link Teal (default)'),
m('a[href=#].text-2.is-disabled.block.margin-bottom-small', 'Link Regent Gray (default)'),
m('a[href=#].text-2.is-disabled.block.text--gray.margin-bottom-small', 'Link Gray'),
m('a[href=#].text-2.is-disabled.text--gray-light.inline.bg-navy.margin-bottom-small', 'Link Gray Light'),
m('a[href=#].text-2.is-disabled.block.text--navy.margin-bottom-small', 'Link Navy'),
Expand Down
6 changes: 3 additions & 3 deletions quartz-css/text/styles/text.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@ a {

&:link,
&:visited {
color: $teal-2;
color: $regent-gray;
text-decoration: none;
}
&:hover,
&:active {
color: $teal-3;
color: $vimeo-blue;
text-decoration: none;
}
&.is-disabled {
&:link, &:visited,
&:hover, &:active {
cursor: default;
opacity: .5;
color: $teal-2;
color: $regent-gray;
}
}
}
Expand Down

0 comments on commit 19e38cd

Please sign in to comment.