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

Feature/bold html #7

Merged
merged 2 commits into from
Oct 6, 2016
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
10 changes: 5 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Package: tint
Type: Package
Title: Tint Is Not Tufte
Version: 0.0.1.1
Date: 2016-10-03
Title: Tint is not Tufte
Version: 0.0.1.2
Date: 2016-10-06
Author: Dirk Eddelbuettel
Maintainer: Dirk Eddelbuettel <edd@debian.org>
Description: A Tufte-alike html style for rmarkdown.
Description: A 'tufte'-alike style for 'rmarkdown'.
URL: http://dirk.eddelbuettel.com/code/tint.html
BugReports: https://github.com/eddelbuettel/tint/issues
Imports: htmltools, knitr, rmarkdown
License: GPL (>= 2)
License: GPL-3
RoxygenNote: 5.0.1
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ A quick screenshot is below:
![](http://eddelbuettel.github.com/tint/tint-region.png)

and the full underlying document is [available too](http://eddelbuettel.github.com/tint/). Its sources
are included in the packages as [skeleton.Rmd](https://github.com/eddelbuettel/tint/blob/master/inst/rmarkdown/templates/tint/skeleton/skeleton.Rmd).
are included in the packages as [skeleton.Rmd](https://github.com/eddelbuettel/tint/blob/master/inst/rmarkdown/templates/html/skeleton/skeleton.Rmd).

### Status

Expand All @@ -52,5 +52,5 @@ Dirk Eddelbuettel, borrowing heavily from JJ and Yihui in

### License

GPL (>= 2) for my parts and the code from [tufte](https://cran.r-project.org/package=tufte),
GPL-3 for my parts and the code from [tufte](https://cran.r-project.org/package=tufte),
mostly MIT for what comes from Dave Liepman and Jef Lippiat.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
50 changes: 42 additions & 8 deletions inst/rmarkdown/templates/html/resources/tint.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,37 @@

@font-face {
font-family: "Roboto";
/*src: url("https://fonts.googleapis.com/css?family=Roboto") format("truetype");*/
src: url("font/roboto/Roboto-Regular.ttf");
src: url("font/roboto/Roboto-Regular.ttf") format("truetype");
font-weight: 400;
font-style: normal;
}

@font-face {
font-family: "Roboto Mono";
/*src: url("https://fonts.googleapis.com/css?family=Roboto+Mono") format("truetype");*/
src: url("font/roboto/RobotoMono-Regular.ttf");
src: url("font/roboto/RobotoMono-Regular.ttf") format("truetype");
font-weight: 400;
font-style: normal;
}

@font-face {
font-family: "Roboto Condensed";
/*src: url("https://fonts.googleapis.com/css?family=Roboto+Condensed") format("truetype");*/
src: url("font/roboto/RobotoCondensed-Regular.ttf");
src: url("font/roboto/RobotoCondensed-Regular.ttf") format("truetype");
font-weight: 400;
font-style: normal;
}

@font-face {
font-family: "Roboto Condensed Bold";
src: url("font/roboto/RobotoCondensed-Bold.ttf") format("truetype");
font-weight: 700;
font-style: normal;
}

@font-face {
font-family: "Roboto Condensed Italic";
src: url("font/roboto/RobotoCondensed-Italic.ttf") format("truetype");
font-weight: 400;
font-style: italic;
}

/* Tufte CSS styles */
Expand All @@ -39,15 +53,17 @@ body { width: 87.5%;
max-width: 1400px;
counter-reset: sidenote-counter; }

h1.title { font-weight: 400;
h1.title { font-weight: 700;
font-style: normal;
font-family: 'Roboto Condensed Bold', Arial, Helvetica, sans-serif;
margin-top: 4rem;
margin-bottom: 1.5rem;
font-size: 3.2rem;
line-height: 1; }

h1 { font-style: normal;
font-weight: 400;
font-weight: 700;
font-family: 'Roboto Condensed Bold', Arial, Helvetica, sans-serif;
margin-top: 2.1rem;
margin-bottom: 0;
font-size: 2.2rem;
Expand Down Expand Up @@ -102,6 +118,24 @@ p { line-height: 2rem;
padding-right: 0;
vertical-align: baseline; }

italic {
font-style: italic;
font-weight: 400;
font-family: "Roboto Condensed Italic";
}

emph {
font-style: italic;
font-weight: 400;
font-family: "Roboto Condensed Italic";
}

strong {
font-style: normal;
font-weight: 700;
font-family: "Roboto Condensed Bold";
}

blockquote { font-size: 1.4rem; }

blockquote p { width: 50%; }
Expand Down