Skip to content

Commit

Permalink
Add kuiSubduedText override. (#10988) (#10989)
Browse files Browse the repository at this point in the history
  • Loading branch information
cjcenizal authored Mar 31, 2017
1 parent 5620116 commit 9a6b3a3
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 3 deletions.
4 changes: 4 additions & 0 deletions ui_framework/components/typography/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,7 @@
line-height: $lineHeight;
font-size: $fontSize;
}

.kuiSubduedText {
color: $subduedFontColor !important;
}
3 changes: 3 additions & 0 deletions ui_framework/dist/ui_framework.css
Original file line number Diff line number Diff line change
Expand Up @@ -2308,6 +2308,9 @@ body {
line-height: 1.5;
font-size: 14px; }

.kuiSubduedText {
color: #9fa3a7 !important; }

.kuiVerticalRhythm + .kuiVerticalRhythm {
margin-top: 10px; }

Expand Down
2 changes: 1 addition & 1 deletion ui_framework/doc_site/src/views/typography/sub_title.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<h2 class="kuiSubTitle">
Chapter 1: The River on a Cold Morning
SubTitle
</h2>
11 changes: 11 additions & 0 deletions ui_framework/doc_site/src/views/typography/subdued_type.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<h1 class="kuiTitle kuiSubduedText">
Subdued Title
</h1>

<h2 class="kuiSubTitle kuiSubduedText">
Subdued SubTitle
</h2>

<p class="kuiText kuiSubduedText">
Subdued Text
</p>
2 changes: 1 addition & 1 deletion ui_framework/doc_site/src/views/typography/text.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<p class="kuiText">
That was the winter the Sager froze over.
Text
</p>
2 changes: 1 addition & 1 deletion ui_framework/doc_site/src/views/typography/title.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<h1 class="kuiTitle">
The Great American Novel
Title
</h1>
17 changes: 17 additions & 0 deletions ui_framework/doc_site/src/views/typography/typography_example.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
const titleHtml = require('./title.html');
const subTitleHtml = require('./sub_title.html');
const textHtml = require('./text.html');
const subduedHtml = require('./subdued_type.html');

export default props => (
<GuidePage title={props.route.name}>
Expand Down Expand Up @@ -66,5 +67,21 @@ export default props => (
html={textHtml}
/>
</GuideSection>

<GuideSection
title="Subdued type"
source={[{
type: GuideSectionTypes.HTML,
code: subduedHtml,
}]}
>
<GuideText>
You can drop type a half-step down in the type hierarchy.
</GuideText>

<GuideDemo
html={subduedHtml}
/>
</GuideSection>
</GuidePage>
);

0 comments on commit 9a6b3a3

Please sign in to comment.