Skip to content

Commit c5db04b

Browse files
committed
update theme
1 parent 4266ce4 commit c5db04b

File tree

5 files changed

+106
-45
lines changed

5 files changed

+106
-45
lines changed

Gruntfile.js

-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ module.exports = function(grunt) {
111111
'reveal.js/lib/**',
112112
'images/**',
113113
'reveal.js/plugin/**',
114-
'plugin/**',
115114
'**.md'
116115
]
117116
},

css/theme/print/paper.css

+21-24
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,15 @@
1313
beyond the edge of the printed page, and prevents
1414
unnecessary background images from printing */
1515
html {
16-
background: #fff;
17-
background-color: #fff;
16+
background: #000;
17+
background-color: #000;
1818
width: auto;
1919
height: auto;
2020
overflow: visible;
2121
}
2222
body {
23-
background: #fff;
24-
background-color: #fff;
25-
}
26-
.reveal body {
23+
background: #000;
24+
background-color: #000;
2725
font-size: 16pt;
2826
width: auto;
2927
height: auto;
@@ -48,19 +46,19 @@
4846

4947
/* SECTION 3: Set body font face, size, and color.
5048
Consider using a serif font for readability. */
51-
.reveal body, .reveal p, .reveal td, .reveal li, .reveal div {
49+
body, p, td, li, div {
5250
font-size: 16pt !important;
53-
font-family: "PragmataPro", serif;
54-
color: #000;
51+
font-family: "charterregular", serif;
52+
color: #fff5df;
5553
}
5654

5755
/* SECTION 4: Set heading font face, sizes, and color.
5856
Differentiate your headings from your body text.
5957
Perhaps use a large sans-serif for distinction. */
60-
.reveal h1, .reveal h2, .reveal h3, .reveal h4, .reveal h5, .reveal h6 {
58+
h1, h2, h3, h4, h5, h6 {
6159
height: auto;
62-
color: #000;
63-
font-family: "PragmataPro", sans-serif;
60+
color: #fef200;
61+
font-family: "Fira Sans", sans-serif;
6462
font-weight: 700;
6563
line-height: 1.2;
6664
letter-spacing: normal;
@@ -71,17 +69,17 @@
7169
}
7270

7371
/* Need to reduce the size of the fonts for printing */
74-
.reveal h1 { font-size: 22pt !important; }
75-
.reveal h2 { font-size: 20pt !important; }
76-
.reveal h3 { font-size: 18pt !important; }
77-
.reveal h4 { font-size: 16pt !important; }
72+
h1 { font-size: 22pt !important; }
73+
h2 { font-size: 20pt !important; }
74+
h3 { font-size: 18pt !important; }
75+
h4 { font-size: 16pt !important; }
7876

7977
/* SECTION 5: Make hyperlinks more usable.
8078
Ensure links are underlined, and consider appending
8179
the URL to the end of the link for usability. */
82-
.reveal a:link,
83-
.reveal a:visited {
84-
color: #000 !important;
80+
a:link,
81+
a:visited {
82+
color: #0cbff2 !important;
8583
text-decoration: none;
8684
}
8785
/*
@@ -95,7 +93,7 @@
9593

9694

9795
/* SECTION 6: more reveal.js specific additions by @skypanther */
98-
.revealul, .reveal ol, .reveal div, .reveal p {
96+
ul, ol, div, p {
9997
visibility: visible;
10098
position: static;
10199
width: auto;
@@ -112,7 +110,7 @@
112110
}
113111
.reveal pre code {
114112
padding: 20px;
115-
border: none;
113+
border: 1px solid #ddd;
116114
}
117115
.reveal blockquote {
118116
margin: 20px 0;
@@ -195,9 +193,8 @@
195193
.reveal section img {
196194
display: block;
197195
margin: 15px 0px;
198-
background: #263238;
199-
background-color: #263238;
200-
border: none;
196+
background: rgba(255,255,255,1);
197+
border: 1px solid #666;
201198
box-shadow: none;
202199
}
203200

css/theme/source/tscholak.scss

+4-19
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ $heading2Size: 2.11em;
3636
$heading3Size: 1.55em;
3737
$heading4Size: 1em;
3838
$heading1TextShadow: none;
39-
$blockMargin: 1ch;
39+
$blockMargin: 20px;
4040
$linkColor: #7dc6bf;
4141
$linkColorHover: #80cbc4;
4242
$selectionBackgroundColor: rgba(255, 255, 255, 1);
@@ -57,21 +57,6 @@ $selectionBackgroundColor: rgba(255, 255, 255, 1);
5757
.reveal .slides {
5858
text-align: left;
5959
}
60-
.reveal ol,
61-
.reveal dl {
62-
margin: 0; }
63-
.reveal ul {
64-
margin: 0 0 0 4ch; }
65-
.reveal ul ul,
66-
.reveal ul ol,
67-
.reveal ol ol,
68-
.reveal ol ul {
69-
margin-left: 4ch; }
70-
.reveal dd {
71-
margin-left: 4ch; }
72-
.reveal ol,
73-
.reveal dl {
74-
list-style-position: inside; }
7560
.reveal ul {
7661
list-style-type: none;
7762
}
@@ -96,7 +81,7 @@ $selectionBackgroundColor: rgba(255, 255, 255, 1);
9681
font-family: PragmataPro, monospace, sans-serif;
9782
}
9883
.reveal pre code {
99-
padding: 2ch;
84+
padding: 25px;
10085
max-height: 500px;
10186
background: $backgroundColor;
10287
color: $mainColor;
@@ -128,11 +113,11 @@ $selectionBackgroundColor: rgba(255, 255, 255, 1);
128113
border-top-color: $backgroundColor;
129114
}
130115
.reveal .progress {
131-
background: rgba(0, 0, 0, 0);
116+
background: $backgroundColor;
132117
}
133118
.reveal .slide-number {
134119
color: $linkColor;
135-
background: rgba(0, 0, 0, 0);
120+
background: $backgroundColor;
136121
font-family: $mainFont;
137122
}
138123

index.html

+35-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,40 @@
1414

1515
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, minimal-ui">
1616

17+
<!--
18+
/**
19+
* @license
20+
* MyFonts Webfont Build ID 3368564, 2017-04-03T22:03:21-0400
21+
*
22+
* The fonts listed in this notice are subject to the End User License
23+
* Agreement(s) entered into by the website owner. All other parties are
24+
* explicitly restricted from using the Licensed Webfonts(s).
25+
*
26+
* You may obtain a valid license at the URLs below.
27+
*
28+
* Webfont: PragmataPro-Bold by FSD
29+
* URL: http://www.myfonts.com/fonts/fsd/pragmata-pro/bold/
30+
*
31+
* Webfont: PragmataPro-BoldItalic by FSD
32+
* URL: http://www.myfonts.com/fonts/fsd/pragmata-pro/bold-italic/
33+
*
34+
* Webfont: PragmataPro-Italic by FSD
35+
* URL: http://www.myfonts.com/fonts/fsd/pragmata-pro/italic/
36+
*
37+
* Webfont: PragmataPro by FSD
38+
* URL: http://www.myfonts.com/fonts/fsd/pragmata-pro/regular/
39+
*
40+
*
41+
* License: http://www.myfonts.com/viewlicense?type=web&buildid=3368564
42+
* Licensed pageviews: 10,000
43+
* Webfonts copyright: Copyright (c) 2009 by Fabrizio Schiavi - http://www.fsd.it/. All
44+
* rights reserved.
45+
*
46+
* © 2017 MyFonts Inc
47+
*/
48+
-->
49+
<link rel="stylesheet" type="text/css" href="lib/css/pragmataProKit.css">
50+
1751
<link rel="stylesheet" href="css/reveal.css">
1852
<link rel="stylesheet" href="css/theme/tscholak.css" id="theme">
1953

@@ -49,7 +83,7 @@ <h3>The Subtitle</h3>
4983
<p>
5084
<small>twitter <a href="http://twitter.com/tscholak">@tscholak</a><br/>github <a href="http://github.com/tscholak">tscholak</a><br/>blog <a href="http://tscholak.github.io">tscholak.github.io</a></small>
5185
</p>
52-
<p style="margin-top: 2em;"><small>January 1, 2016</small></p>
86+
<p style="margin-top: 2em;"><small>January 1, 2017</small></p>
5387
</section>
5488

5589
<section data-markdown="content.md"

lib/css/pragmataProKit.css

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/**
2+
* @license
3+
* MyFonts Webfont Build ID 3368564, 2017-04-03T22:03:21-0400
4+
*
5+
* The fonts listed in this notice are subject to the End User License
6+
* Agreement(s) entered into by the website owner. All other parties are
7+
* explicitly restricted from using the Licensed Webfonts(s).
8+
*
9+
* You may obtain a valid license at the URLs below.
10+
*
11+
* Webfont: PragmataPro-Bold by FSD
12+
* URL: http://www.myfonts.com/fonts/fsd/pragmata-pro/bold/
13+
*
14+
* Webfont: PragmataPro-BoldItalic by FSD
15+
* URL: http://www.myfonts.com/fonts/fsd/pragmata-pro/bold-italic/
16+
*
17+
* Webfont: PragmataPro-Italic by FSD
18+
* URL: http://www.myfonts.com/fonts/fsd/pragmata-pro/italic/
19+
*
20+
* Webfont: PragmataPro by FSD
21+
* URL: http://www.myfonts.com/fonts/fsd/pragmata-pro/regular/
22+
*
23+
*
24+
* License: http://www.myfonts.com/viewlicense?type=web&buildid=3368564
25+
* Licensed pageviews: 10,000
26+
* Webfonts copyright: Copyright (c) 2009 by Fabrizio Schiavi - http://www.fsd.it/. All rights reserved.
27+
*
28+
* © 2017 MyFonts Inc
29+
*/
30+
31+
32+
/* @import must be at top of file, otherwise CSS will not work */
33+
@import url("//hello.myfonts.net/count/336674");
34+
35+
36+
@font-face {font-family: 'PragmataPro-Bold';src: url('webfonts/336674_0_0.eot');src: url('webfonts/336674_0_0.eot?#iefix') format('embedded-opentype'),url('webfonts/336674_0_0.woff2') format('woff2'),url('webfonts/336674_0_0.woff') format('woff'),url('webfonts/336674_0_0.ttf') format('truetype');}
37+
38+
39+
@font-face {font-family: 'PragmataPro-BoldItalic';src: url('webfonts/336674_1_0.eot');src: url('webfonts/336674_1_0.eot?#iefix') format('embedded-opentype'),url('webfonts/336674_1_0.woff2') format('woff2'),url('webfonts/336674_1_0.woff') format('woff'),url('webfonts/336674_1_0.ttf') format('truetype');}
40+
41+
42+
@font-face {font-family: 'PragmataPro-Italic';src: url('webfonts/336674_2_0.eot');src: url('webfonts/336674_2_0.eot?#iefix') format('embedded-opentype'),url('webfonts/336674_2_0.woff2') format('woff2'),url('webfonts/336674_2_0.woff') format('woff'),url('webfonts/336674_2_0.ttf') format('truetype');}
43+
44+
45+
@font-face {font-family: 'PragmataPro';src: url('webfonts/336674_3_0.eot');src: url('webfonts/336674_3_0.eot?#iefix') format('embedded-opentype'),url('webfonts/336674_3_0.woff2') format('woff2'),url('webfonts/336674_3_0.woff') format('woff'),url('webfonts/336674_3_0.ttf') format('truetype');}
46+

0 commit comments

Comments
 (0)