Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/vhx/quartz
Browse files Browse the repository at this point in the history
  • Loading branch information
@medhatnar
medhatnar committed Sep 19, 2017
2 parents 41ad1eb + ec2d6b9 commit 355297b
Show file tree
Hide file tree
Showing 8 changed files with 125 additions and 10 deletions.
14 changes: 10 additions & 4 deletions app/public/app.js
View file

Large diffs are not rendered by default.

36 changes: 36 additions & 0 deletions app/public/quartz.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6917,6 +6917,42 @@ a.text--southerly-sky:hover, a.text--southerly-sky:active {
a.text--southerly-sky.is-disabled:link, a.text--southerly-sky.is-disabled:visited, a.text--southerly-sky.is-disabled:hover, a.text--southerly-sky.is-disabled:active {
color: #b3bfc8; }

.text--regent-gray {
color: #8699a6; }
.text--regent-gray.text--transparent {
color: rgba(134, 153, 166, 0.5); }

a.text--regent-gray:link, a.text--regent-gray:visited {
color: #8699a6;
text-decoration: none; }

a.text--regent-gray:hover, a.text--regent-gray:active {
color: #1a2e3b;
text-decoration: none; }
a.text--regent-gray:hover.is-hover-text--regent-gray, a.text--regent-gray:active.is-hover-text--regent-gray {
color: #8699a6; }

a.text--regent-gray.is-disabled:link, a.text--regent-gray.is-disabled:visited, a.text--regent-gray.is-disabled:hover, a.text--regent-gray.is-disabled:active {
color: #1a2e3b; }

.text--astro-granite {
color: #1a2e3b; }
.text--astro-granite.text--transparent {
color: rgba(26, 46, 59, 0.5); }

a.text--astro-granite:link, a.text--astro-granite:visited {
color: #1a2e3b;
text-decoration: none; }

a.text--astro-granite:hover, a.text--astro-granite:active {
color: #8699a6;
text-decoration: none; }
a.text--astro-granite:hover.is-hover-text--astro-granite, a.text--astro-granite:active.is-hover-text--astro-granite {
color: #1a2e3b; }

a.text--astro-granite.is-disabled:link, a.text--astro-granite.is-disabled:visited, a.text--astro-granite.is-disabled:hover, a.text--astro-granite.is-disabled:active {
color: #8699a6; }

/* modifiers
......................................*/
.text--bold {
Expand Down
16 changes: 16 additions & 0 deletions dist/quartz.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7280,6 +7280,22 @@ a.text--regent-gray:hover, a.text--regent-gray:active {
a.text--regent-gray:hover.is-hover-text--regent-gray, a.text--regent-gray:active.is-hover-text--regent-gray {
color: #8699a6; }
a.text--regent-gray.is-disabled:link, a.text--regent-gray.is-disabled:visited, a.text--regent-gray.is-disabled:hover, a.text--regent-gray.is-disabled:active {
color: #1a2e3b; }

.text--astro-granite {
color: #1a2e3b; }
.text--astro-granite.text--transparent {
color: rgba(26, 46, 59, 0.5); }

a.text--astro-granite:link, a.text--astro-granite:visited {
color: #1a2e3b;
text-decoration: none; }
a.text--astro-granite:hover, a.text--astro-granite:active {
color: #8699a6;
text-decoration: none; }
a.text--astro-granite:hover.is-hover-text--astro-granite, a.text--astro-granite:active.is-hover-text--astro-granite {
color: #1a2e3b; }
a.text--astro-granite.is-disabled:link, a.text--astro-granite.is-disabled:visited, a.text--astro-granite.is-disabled:hover, a.text--astro-granite.is-disabled:active {
color: #8699a6; }

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

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions dist/text.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,22 @@ a.text--regent-gray:hover, a.text--regent-gray:active {
a.text--regent-gray:hover.is-hover-text--regent-gray, a.text--regent-gray:active.is-hover-text--regent-gray {
color: #8699a6; }
a.text--regent-gray.is-disabled:link, a.text--regent-gray.is-disabled:visited, a.text--regent-gray.is-disabled:hover, a.text--regent-gray.is-disabled:active {
color: #1a2e3b; }

.text--astro-granite {
color: #1a2e3b; }
.text--astro-granite.text--transparent {
color: rgba(26, 46, 59, 0.5); }

a.text--astro-granite:link, a.text--astro-granite:visited {
color: #1a2e3b;
text-decoration: none; }
a.text--astro-granite:hover, a.text--astro-granite:active {
color: #8699a6;
text-decoration: none; }
a.text--astro-granite:hover.is-hover-text--astro-granite, a.text--astro-granite:active.is-hover-text--astro-granite {
color: #1a2e3b; }
a.text--astro-granite.is-disabled:link, a.text--astro-granite.is-disabled:visited, a.text--astro-granite.is-disabled:hover, a.text--astro-granite.is-disabled:active {
color: #8699a6; }

/* modifiers
Expand Down
9 changes: 8 additions & 1 deletion quartz-css/text/docs/code/text.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
<p class="text-2 text--white">Text Blue</p>
<p class="text-2 text--vimeo-blue">Text Vimeo Blue</p>
<p class="text-2 text--sunset-orange">Text Sunset Orange</p>
<p class="text-2 text--southerly-sky">Text Southerly Sky</p>
<p class="text-2 text--regent-gray">Text Regent Gray</p>
<p class="text-2 text--astro-granite">Text Astro Granite</p>
<!-- Styles (for any color) -->
<p class="text-[size] text--[style]">Text Style Modifier</p>

Expand All @@ -54,7 +57,9 @@
<a href="#" class="text-2 text--blue">Link Blue</a>
<a href="#" class="text-2 text--vimeo-blue">Link Vimeo Blue Darkened</a>
<a href="#" class="text-2 text--sunset-orange">Link Sunset Orange Darkened</a>
<a href="#" class="text-2 text--southerly-sky">Link Astro Granite</a>
<a href="#" class="text-2 text--southerly-sky">Link Southerly Sky</a>
<a href="#" class="text-2 text--regent-gray">Link Regent Gray</a>
<a href="#" class="text-2 text--astro-granite">Link Astro Granite</a>

<!-- Disabled -->
<a href="#" class="text-2 is-disabled ">Link Default</a>
Expand All @@ -70,3 +75,5 @@
<a href="#" class="text-2 is-disabled text--vimeo-blue">Link Vimeo Blue</a>
<a href="#" class="text-2 is-disabled text--sunset-orange">Link Sunset Orange</a>
<a href="#" class="text-2 is-disabled text--southerly-sky">Link Southerly Sky</a>
<a href="#" class="text-2 is-disabled text--regent-gray">Link Regent Gray</a>
<a href="#" class="text-2 is-disabled text--astro-granite">Link Astro Granite</a>
12 changes: 9 additions & 3 deletions quartz-css/text/docs/guide.html.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ Q.components.guide.styleguide.ui.text.container = {
m('p.text-2.text--blue.margin-bottom-small', 'Text Blue'),
m('p.text-2.text--vimeo-blue.margin-bottom-small', 'Text Vimeo Blue'),
m('p.text-2.text--sunset-orange.margin-bottom-small', 'Text Sunset Orange'),
m('p.text-2.text--southerly-sky.margin-bottom-small', 'Text Southerly Sky')
m('p.text-2.text--southerly-sky.margin-bottom-small', 'Text Southerly Sky'),
m('p.text-2.text--regent-gray.margin-bottom-small', 'Text Regent Gray'),
m('p.text-2.text--astro-granite.margin-bottom-small', 'Text Astro Granite')
]);
}
}
Expand Down Expand Up @@ -85,7 +87,9 @@ Q.components.guide.styleguide.ui.text.container = {
m('a[href=#].text-2.block.text--blue.margin-bottom-small', 'Link Blue'),
m('a[href=#].text-2.block.text--vimeo-blue.margin-bottom-small', 'Link Vimeo Blue'),
m('a[href=#].text-2.block.text--sunset-orange.margin-bottom-small', 'Link Sunset Orange'),
m('a[href=#].text-2.block.text--southerly-sky.margin-bottom-small', 'Link Astro Granite')
m('a[href=#].text-2.block.text--southerly-sky.margin-bottom-small', 'Link Southerly Sky'),
m('a[href=#].text-2.block.text--regent-gray.margin-bottom-small', 'Link Regent Gray'),
m('a[href=#].text-2.block.text--astro-granite.margin-bottom-small', 'Link Astro Granite')
]);
}
}
Expand All @@ -107,7 +111,9 @@ Q.components.guide.styleguide.ui.text.container = {
m('a[href=#].text-2.is-disabled.block.text--blue.margin-bottom-small', 'Link Blue'),
m('a[href=#].text-2.is-disabled.block.text--vimeo-blue.margin-bottom-small', 'Link Vimeo Blue'),
m('a[href=#].text-2.is-disabled.block.text--sunset-orange.margin-bottom-small', 'Link Sunset Orange'),
m('a[href=#].text-2.is-disabled.block.text--southerly-sky.margin-bottom-small', 'Link Southerly Sky')
m('a[href=#].text-2.is-disabled.block.text--southerly-sky.margin-bottom-small', 'Link Southerly Sky'),
m('a[href=#].text-2.is-disabled.block.text--regent-gray.margin-bottom-small', 'Link Regent Gray'),
m('a[href=#].text-2.is-disabled.block.text--astro-granite.margin-bottom-small', 'Link Astro Granite'),
]);
}
}
Expand Down
30 changes: 29 additions & 1 deletion quartz-css/text/styles/text.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,7 @@ a.text--sunset-orange {
color: transparentize($southerly-sky, .5);
}
}

a.text--southerly-sky {
&:link,
&:visited {
Expand Down Expand Up @@ -538,11 +539,38 @@ a.text--regent-gray {
&.is-disabled {
&:link, &:visited,
&:hover, &:active {
color: $regent-gray;
color: $astro-granite;
}
}
}

.text--astro-granite {
color: $astro-granite;
&.text--transparent {
color: transparentize($astro-granite, .5);
}
}
a.text--astro-granite {
&:link,
&:visited {
color: $astro-granite;
text-decoration: none;
}
&:hover,
&:active {
color: $regent-gray;
text-decoration: none;
&.is-hover-text--astro-granite {
color: $astro-granite;
}
}
&.is-disabled {
&:link, &:visited,
&:hover, &:active {
color: $regent-gray;
}
}
}

/* modifiers
......................................*/
Expand Down

0 comments on commit 355297b

Please sign in to comment.