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.

Sign up for GitHub

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

This adds a placeholder for the instructor block so that we can do testing #13

Merged
merged 2 commits into from
Dec 13, 2021
Merged

This adds a placeholder for the instructor block so that we can do testing #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e25fdf3
add instructor block
zkamvar Dec 13, 2021
3ecb42a
regenerated lesson css
actions-user Dec 13, 2021
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
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: varnish
Title: Front-end for The Carpentries Lesson Template
Version: 0.0.0.9007
Version: 0.0.0.9008
Authors@R:
person(given = "Zhian N.",
family = "Kamvar",
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# varnish 0.0.0.9008

* instructor block placeholder added

# varnish 0.0.0.9007

* update css to use em and not px
Expand Down
93 changes: 93 additions & 0 deletions inst/pkgdown/assets/css/lesson.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -930,6 +930,94 @@ pre.sql::before, pre.language-sql::before {
-webkit-font-smoothing: antialiased;
}

.instructor {
padding: 0 0 0.325em 0.325em;
border: 0.065em solid;
border-color: #ce1d9d;
border-radius: 0.26em;
margin: 0.975em 0.325em 0.65em 0;
}

.instructor h2 {
padding-top: 0.325em;
padding-bottom: 0.325em;
font-size: 1.3em;
background: linear-gradient(to bottom, #ce1d9d, #e026ad);
border-color: #ce1d9d;
margin-top: 0em;
margin-left: -0.325em;
}

.instructor h2:before {
font-family: 'Glyphicons Halflings';
content: "i";
float: left;
padding-left: 0.325em;
padding-right: 0.325em;
display: inline-block;
-webkit-font-smoothing: antialiased;
}

.instructor h3 {
padding-top: 0.325em;
padding-bottom: 0.325em;
font-size: 1.17em;
background: linear-gradient(to bottom, #ce1d9d, #e026ad);
border-color: #ce1d9d;
margin-top: 0em;
margin-left: -0.325em;
}

.instructor h3:before {
font-family: 'Glyphicons Halflings';
content: "i";
float: left;
padding-left: 0.325em;
padding-right: 0.325em;
display: inline-block;
-webkit-font-smoothing: antialiased;
}

.instructor h4 {
padding-top: 0.325em;
padding-bottom: 0.325em;
font-size: 1.04em;
background: linear-gradient(to bottom, #ce1d9d, #e026ad);
border-color: #ce1d9d;
margin-top: 0em;
margin-left: -0.325em;
}

.instructor h4:before {
font-family: 'Glyphicons Halflings';
content: "i";
float: left;
padding-left: 0.325em;
padding-right: 0.325em;
display: inline-block;
-webkit-font-smoothing: antialiased;
}

.instructor h5 {
padding-top: 0.325em;
padding-bottom: 0.325em;
font-size: 0.91em;
background: linear-gradient(to bottom, #ce1d9d, #e026ad);
border-color: #ce1d9d;
margin-top: 0em;
margin-left: -0.325em;
}

.instructor h5:before {
font-family: 'Glyphicons Halflings';
content: "i";
float: left;
padding-left: 0.325em;
padding-right: 0.325em;
display: inline-block;
-webkit-font-smoothing: antialiased;
}

.callout h3,
.challenge h3,
.checklist h3,
Expand All @@ -938,6 +1026,7 @@ pre.sql::before, pre.language-sql::before {
.objectives h3,
.prereq h3,
.solution h3,
.instructor h3,
.testimonial h3 {
font-size: 1.17em;
}
Expand Down Expand Up @@ -982,6 +1071,10 @@ pre.sql::before, pre.language-sql::before {
background-color: #fc8dc120;
}

.instructor {
background-color: #ce1d9d20;
}

blockquote p {
margin: 0.325em;
}
Expand Down
4 changes: 4 additions & 0 deletions inst/pkgdown/assets/css/lesson.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ $color-objectives: #daee84 !default;
$color-prereq: #9cd6dc !default;
$color-solution: #ded4b9 !default;
$color-testimonial: #fc8dc1 !default;
$color-instructor: #ce1d9d !default;

//----------------------------------------
// Specialized code blocks.
Expand Down Expand Up @@ -183,6 +184,7 @@ $codeblock-padding: 0.325em !default;
.prereq{ @include bkSetup($color-prereq, "\e124"); }
.solution{ @include bkSetup($color-solution, "\e105"); }
.testimonial{ @include bkSetup($color-testimonial, "\e143"); }
.instructor{ @include bkSetup($color-instructor, "i"); }

.callout h3,
.challenge h3,
Expand All @@ -192,6 +194,7 @@ $codeblock-padding: 0.325em !default;
.objectives h3,
.prereq h3,
.solution h3,
.instructor h3,
.testimonial h3 {
font-size: 1.17em;
}
Expand All @@ -206,6 +209,7 @@ font-size: 1.17em;
.prereq { background-color: #9cd6dc20; }
.solution { background-color: #ded4b94d; }
.testimonial { background-color: #fc8dc120; }
.instructor { background-color: #ce1d9d20; }

blockquote p {
margin: 0.325em;
Expand Down