Skip to content

Commit 405edb4

Browse files
committed
move topic inside header
1 parent c758c10 commit 405edb4

File tree

11 files changed

+74
-65
lines changed

11 files changed

+74
-65
lines changed

src/components/Card/Horizontal/Basic.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ const HorizontalBasic = () => (
1313
</a>
1414
</div>
1515
<div className="card__content">
16-
<div className="card__topic">{post.topic}</div>
1716
<header className="card__header">
17+
<div className="card__topic">{post.topic}</div>
1818
<h2 className="card__title" title={post.title}>
1919
<a href="#blog-detail">{post.title}.</a>
2020
</h2>

src/components/Card/Horizontal/Reverse.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ const HorizontalReverse = () => (
1212
</a>
1313
</div>
1414
<div className="card__content">
15-
<div className="card__topic">
16-
{post.topic}
17-
</div>
1815
<header className="card__header">
16+
<div className="card__topic">{post.topic}</div>
1917
<h2 className="card__title" title={post.title}>
2018
<a href="#blog-detail">{post.title}.</a>
2119
</h2>

src/components/Card/Horizontal/Video.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ const HorizontalVideo = () => (
1313
<Button url="#play" type="circle"><FaPlay /></Button>
1414
</div>
1515
<div className="card__content">
16-
<div className="card__topic">Watch the video</div>
1716
<header className="card__header">
17+
<div className="card__topic">Watch the video</div>
1818
<h2 className="card__title" title={post.title}>
1919
<a href="#blog-detail">{post.title}.</a>
2020
</h2>

src/components/Card/Overlay/Product.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@ const OverlayProduct = (props) => (
1616
</a>
1717
</div>
1818
<div className="card__content">
19-
<div className="card__topic">
20-
{props.topic}
21-
</div>
2219
<header className="class__header">
20+
<div className="card__topic">{props.topic}</div>
2321
<h5 className="card__title">
2422
<a href="#product-detail" title={props.title}>{props.title}</a>
2523
</h5>

src/components/Card/Stacked/Basic.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ const StackedBasic = (props) => (
1111
</a>
1212
</div>
1313
<div className="card__content">
14-
<div className="card__topic">{props.topic}</div>
1514
<header className="card__header">
15+
<div className="card__topic">{props.topic}</div>
1616
<h4 className="card__title" title={props.title}>
1717
<a href="#blog-detail">{props.title}</a>
1818
</h4>

src/components/Card/Stacked/FloatingIcon.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ const StackedFloatingIcon = (props) => (
1111
<Button url="#play" type="circle"><FaPlay /></Button>
1212
</div>
1313
<div className="card__content">
14-
<div className="card__topic">{props.topic}</div>
1514
<header className="card__header">
15+
<div className="card__topic">{props.topic}</div>
1616
<h4 className="card__title" title={props.title}>
1717
<a href="#blog-detail">{props.title}</a>
1818
</h4>

src/components/Card/Stacked/MediaObject.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ const StackedMediaObject = (props) => (
1212
</a>
1313
</div>
1414
<div className="card__content">
15-
<div className="card__topic">{props.topic}</div>
1615
<header className="card__header">
16+
<div className="card__toßpic">{props.topic}</div>
1717
<h4 className="card__title" title={props.title}>
1818
<a href="#blog-detail">{props.title}</a>
1919
</h4>

src/components/Card/Stacked/MinimalThemed.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ const StackedMinimalThemed = (props) => (
77
+ props.theme
88
+ (props.cssClasses ? " " + props.cssClasses:"")}>
99
<div className="card__content">
10-
<div className="card__topic">{props.topic}</div>
1110
<header className="card__header">
11+
<div className="card__topic">{props.topic}</div>
1212
<h4 className="card__title" title={props.title}>
1313
<a href="#blog-detail">
1414
{props.shortTitle}

src/components/Card/Stacked/Tour.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ const StackedTour = (props) => (
1111
</a>
1212
</div>
1313
<div className="card__content">
14-
<div className="card__topic">
15-
<FaMapMarkerAlt /> {props.topic}
16-
</div>
1714
<header className="card__header">
15+
<div className="card__topic">
16+
<FaMapMarkerAlt /> {props.topic}
17+
</div>
1818
<h4 className="card__title" title={props.title}>
1919
<a href="#tour-detail">{props.title}</a>
2020
</h4>

src/components/Code/Stacked/Basic.js

+3-7
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,12 @@ import '../../../../static/prism.css';
55
const code= `
66
<div class="card">
77
<div class="card__image">
8-
<a href="...">
9-
<img src="..." alt="" />
10-
</a>
8+
<img src="..." />
119
</div>
1210
<div class="card__content">
13-
<div class="card__topic">Topic</div>
1411
<header class="card__header">
15-
<h4 class="card__title">
16-
<a href="...">Card Title</a>
17-
</h4>
12+
<div class="card__topic">Topic</div>
13+
<h4 class="card__title">Card Title</h4>
1814
</header>
1915
</div>
2016
<div class="card__footer">

static/prism.css

+60-43
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
/* PrismJS 1.17.1
2-
https://prismjs.com/download.html#themes=prism-tomorrow&languages=markup+css */
2+
https://prismjs.com/download.html#themes=prism&languages=markup+css */
33
/**
4-
* prism.js tomorrow night eighties for JavaScript, CoffeeScript, CSS and HTML
5-
* Based on https://github.com/chriskempson/tomorrow-theme
6-
* @author Rose Pritchard
4+
* prism.js default theme for JavaScript, CSS and HTML
5+
* Based on dabblet (http://dabblet.com)
6+
* @author Lea Verou
77
*/
88

99
code[class*="language-"],
1010
pre[class*="language-"] {
11-
color: #ccc;
11+
color: black;
1212
background: none;
13+
text-shadow: 0 1px white;
1314
font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
1415
font-size: 1em;
1516
text-align: left;
@@ -27,7 +28,25 @@ pre[class*="language-"] {
2728
-moz-hyphens: none;
2829
-ms-hyphens: none;
2930
hyphens: none;
31+
}
32+
33+
pre[class*="language-"]::-moz-selection, pre[class*="language-"] ::-moz-selection,
34+
code[class*="language-"]::-moz-selection, code[class*="language-"] ::-moz-selection {
35+
text-shadow: none;
36+
background: #b3d4fc;
37+
}
3038

39+
pre[class*="language-"]::selection, pre[class*="language-"] ::selection,
40+
code[class*="language-"]::selection, code[class*="language-"] ::selection {
41+
text-shadow: none;
42+
background: #b3d4fc;
43+
}
44+
45+
@media print {
46+
code[class*="language-"],
47+
pre[class*="language-"] {
48+
text-shadow: none;
49+
}
3150
}
3251

3352
/* Code blocks */
@@ -39,7 +58,7 @@ pre[class*="language-"] {
3958

4059
:not(pre) > code[class*="language-"],
4160
pre[class*="language-"] {
42-
background: #2d2d2d;
61+
background: #f5f2f0;
4362
}
4463

4564
/* Inline code */
@@ -50,61 +69,63 @@ pre[class*="language-"] {
5069
}
5170

5271
.token.comment,
53-
.token.block-comment,
5472
.token.prolog,
5573
.token.doctype,
5674
.token.cdata {
57-
color: #999;
75+
color: slategray;
5876
}
5977

6078
.token.punctuation {
61-
color: #ccc;
62-
}
63-
64-
.token.tag,
65-
.token.attr-name,
66-
.token.namespace,
67-
.token.deleted {
68-
color: #e2777a;
79+
color: #999;
6980
}
7081

71-
.token.function-name {
72-
color: #6196cc;
82+
.namespace {
83+
opacity: .7;
7384
}
7485

86+
.token.property,
87+
.token.tag,
7588
.token.boolean,
7689
.token.number,
77-
.token.function {
78-
color: #f08d49;
79-
}
80-
81-
.token.property,
82-
.token.class-name,
8390
.token.constant,
84-
.token.symbol {
85-
color: #f8c555;
91+
.token.symbol,
92+
.token.deleted {
93+
color: #905;
8694
}
8795

8896
.token.selector,
89-
.token.important,
90-
.token.atrule,
91-
.token.keyword,
92-
.token.builtin {
93-
color: #cc99cd;
94-
}
95-
97+
.token.attr-name,
9698
.token.string,
9799
.token.char,
98-
.token.attr-value,
99-
.token.regex,
100-
.token.variable {
101-
color: #7ec699;
100+
.token.builtin,
101+
.token.inserted {
102+
color: #690;
102103
}
103104

104105
.token.operator,
105106
.token.entity,
106-
.token.url {
107-
color: #67cdcc;
107+
.token.url,
108+
.language-css .token.string,
109+
.style .token.string {
110+
color: #9a6e3a;
111+
background: hsla(0, 0%, 100%, .5);
112+
}
113+
114+
.token.atrule,
115+
.token.attr-value,
116+
.token.keyword {
117+
color: #07a;
118+
}
119+
120+
.token.function,
121+
.token.class-name {
122+
color: #DD4A68;
123+
}
124+
125+
.token.regex,
126+
.token.important,
127+
.token.variable {
128+
color: #e90;
108129
}
109130

110131
.token.important,
@@ -119,7 +140,3 @@ pre[class*="language-"] {
119140
cursor: help;
120141
}
121142

122-
.token.inserted {
123-
color: green;
124-
}
125-

0 commit comments

Comments
 (0)