Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update various markdown widths #185

Merged
merged 2 commits into from
Jun 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion packages/example/src/pages/components/Aside.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@ The `<Aside>` component is a wrapper component that adds styling to make the tex
<Row>
<Column colMd={5} colLg={7} className="bx--type-expressive-heading-03">

![test](./images/featured.png)
It is more important than ever that we own our own ethos, make palpable our brand values, and incorporate an instantly identifiable IBMness in everything we do.

> Without aesthetic, design is either the humdrum repetition of familiar clichés or a wild scramble for novelty. Without aesthetic, the computer is but a mindless speed machine, producing effects without substance, form without relevant content, or content without meaningful form.
>
> <cite>– Paul Rand</cite>

Aesthetic is defined as the philosophical theory or set of principles governing outward appearance or actions.

</Column>
<Column colSm={0} colMd={2} colLg={3} offsetMd={1} noGutterSm>
Expand Down
14 changes: 11 additions & 3 deletions packages/example/src/pages/components/markdown.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -175,14 +175,22 @@ Markdown | Less | Pretty
1 | 2 | 3
```

## Blockquotes
## Blockquotes and citations

> This is a Blockquote
It is more important than ever that we own our own ethos, make palpable our brand values, and incorporate an instantly identifiable IBMness in everything we do.

> This is a Blockquote.
> This line is part of the same quote.

> <cite>– Allison</cite>

It is more important than ever that we own our own ethos, make palpable our brand values, and incorporate an instantly identifiable IBMness in everything we do.

#### Code

```
> This is a Blockquote
> This is a Blockquote.
> This line is part of the same quote.

> <cite>– Allison</cite>
```
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
@import '~carbon-components/scss/globals/scss/vars';
@import '~carbon-components/scss/globals/scss/layout';

header.header button {
display: flex;
justify-content: center;
align-items: center;
.header button {
svg {
margin-top: 0;
margin-top: $spacing-02;
}
}

Expand All @@ -20,9 +17,3 @@ header.header {
.header.hidden {
top: -48px;
}

button.icon {
display: flex;
justify-content: center;
align-items: center;
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
@include carbon--type-style('expressive-heading-03', true);
margin-bottom: $layout-03;

// 6 col
@include carbon--breakpoint('md') {
width: calc(62.5% - 2rem);
width: 75%;
}

// 8 columns wide
// 8 col
@include carbon--breakpoint('lg') {
width: calc(66.667% - 2rem);
width: 66.667%;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
margin-left: -$spacing-05;
padding-left: $spacing-05;

// 5 columns wide
// 6 col
@include carbon--breakpoint('md') {
width: calc(63%);
width: 75%;
}

// 8 columns wide
// 8 col
@include carbon--breakpoint('lg') {
width: calc(67.3%);
width: 66.667%;
}
}

Expand All @@ -42,16 +42,32 @@

.blockquote .paragraph {
@include carbon--type-style('expressive-heading-03');
margin-bottom: 0;
}

.blockquote .paragraph--responsive {
// 6 col
@include carbon--breakpoint('md') {
width: calc(62.5% - 3rem);
width: calc(75% - 3rem);
}

// 8 columns wide
// 8 col
@include carbon--breakpoint('lg') {
width: calc(66.667% - 3rem);
}
}

// If quote is inside a user specified row then allow the grid code to set the width
:global(.#{$prefix}--row) .blockquote .paragraph {
width: calc(100% - 3rem);
}

.blockquote cite {
@include carbon--type-style('body-long-01');
display: block;
margin-top: $spacing-02;
}

//---------------------------------------
// Responsive widths
//---------------------------------------
Expand Down