Skip to content

Commit 77ddb13

Browse files
committed
CSS fixes
1 parent 54647dc commit 77ddb13

File tree

7 files changed

+47
-21
lines changed

7 files changed

+47
-21
lines changed

docs/client/components/AppNavbar/styles.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ body {
1010
position: fixed;
1111
min-height: 75px;
1212
width: 100%;
13+
top: 0;
1314
background-color: $primary-blue;
1415
margin: 0;
1516
color: $primary-white;
@@ -24,7 +25,7 @@ body {
2425
.parent-row {
2526
min-height: 75px;
2627
}
27-
28+
2829
.nav-wrapper {
2930
display: flex;
3031
align-items: center;

docs/client/components/ComponentsPage/index.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,23 @@ import styles from './styles.scss';
1111
const renderHowItLooks = (ExampleComponent) => (
1212
<div>
1313
<h3>How it looks</h3>
14-
<div>
14+
<div className="example">
1515
<ExampleComponent />
1616
</div>
1717
</div>
1818
);
1919

2020
const ComponentsPage = () => (
2121
<div className={styles.usage}>
22-
<div dangerouslySetInnerHTML={{ __html: CardReadme }} />
23-
{ renderHowItLooks(CardExample) }
24-
<div dangerouslySetInnerHTML={{ __html: ButtonReadme }} />
25-
{ renderHowItLooks(ButtonExample) }
26-
<div style={{ height: '300px' }} />
22+
<div className="usage-section">
23+
<div dangerouslySetInnerHTML={{ __html: CardReadme }} />
24+
{ renderHowItLooks(CardExample) }
25+
</div>
26+
27+
<div className="usage-section">
28+
<div dangerouslySetInnerHTML={{ __html: ButtonReadme }} />
29+
{ renderHowItLooks(ButtonExample) }
30+
</div>
2731
</div>
2832
);
2933

docs/client/components/ComponentsPage/styles.scss

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
:local(.usage) {
22
overflow: scroll;
3-
height: 800px;
4-
padding: 0 5%;
3+
height: 100%;
4+
padding: 0 1%;
55

66
table, td, th {
77
padding: 10px;
@@ -18,8 +18,29 @@
1818
border-radius: 4px;
1919
}
2020
}
21+
2122
.hljs {
2223
padding: 15px 0px;
2324
background: #f1f1f1;
25+
white-space: pre-wrap; /* Since CSS 2.1 */
26+
white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
27+
white-space: -pre-wrap; /* Opera 4-6 */
28+
white-space: -o-pre-wrap; /* Opera 7 */
29+
word-wrap: break-word;
30+
}
31+
32+
.usage-section {
33+
margin: 10px;
34+
padding: 10px;
35+
}
36+
37+
.usage-section:first-child {
38+
margin-top: 0;
39+
padding-top: 0;
40+
}
41+
42+
.example {
43+
padding: 10px;
44+
background: #fafafa;
2445
}
25-
}
46+
}

docs/client/styles.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
:local(.app-wrapper) {
2-
position: fixed;
32
width: 100%;
43
.content-wrapper {
54
margin-top: 75px;

src/card/defaultTheme.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
border-radius: 3px;
44
padding: 10px;
55
min-width: 300px;
6+
margin: 5px;
67
}
78

89
:local(.noPadding) {

src/card/readMe.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,11 @@ The base card component.
2222
### Usage
2323
```
2424
<Card
25-
header='Card String header'
25+
header="Hello world!"
2626
wrapContent
27-
noPadding
28-
theme={customTheme}>
29-
<span>Card Content</span>
30-
<span>Card Content</span>
31-
<span>Card Content</span>
27+
>
28+
<div>
29+
Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.
30+
</div>
3231
</Card>
33-
```
32+
```

src/examples/card.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ import Card from './../card';
55
const CardExample = () => (
66
<div>
77
<Card
8-
header="Card String header"
8+
header="Hello world!"
99
wrapContent
1010
>
11-
<div>Hello world!</div>
12-
<div>Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.</div>
11+
<div>
12+
Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.
13+
</div>
1314
</Card>
1415
</div>
1516
);

0 commit comments

Comments
 (0)