+
Copyright ©{{ "now" | date: "%Y" }}, Regents of the University of Californa and respective authors.
-+
This site is built following the Berkeley Class Site template, which is generously based on the Just the Class , and Just the Docs templates.
diff --git a/_includes/head_custom.html b/_includes/head_custom.html index ce29aa5..2e7aafa 100644 --- a/_includes/head_custom.html +++ b/_includes/head_custom.html @@ -2,5 +2,24 @@ - + + + diff --git a/_includes/nav_footer_custom.html b/_includes/nav_footer_custom.html index 0dcb58e..396860b 100644 --- a/_includes/nav_footer_custom.html +++ b/_includes/nav_footer_custom.html @@ -1,9 +1,9 @@ {% if site.class_archive_path %} - + {% endif %} diff --git a/_plugins/config_validator.rb b/_plugins/config_validator.rb index 06f832a..d49aa59 100644 --- a/_plugins/config_validator.rb +++ b/_plugins/config_validator.rb @@ -5,14 +5,17 @@ # 1) Ensures required attributes are present in the config file. # 2) Ensures the baseurl is a consistent format based on the semester # 3) Uses a `course_department` config to implement some shared styling/language. -# Future config validations might make sense, like footer/a11y/etc. +# 4) Ensures the `color_scheme` is valid. +# Future config validations might make sense, like footer/a11y/etc. configuration, # Implement additional validations by registering an entry in `KEY_VALIDATIONS` # This is a key_name => function_name map. # function_name should be defined in the ConfigValidator class, and is called with -# the *value* of the config. +# the key, value pair in the config. # Note that Jekyll parses the YAML file such that the config keys are *strings* not symbols. +# See the inclusion_validator to add simple allow-list style validations + # A simple class for nicer error message formatting. class ConfigValidationError < StandardError attr_reader :errors @@ -31,11 +34,17 @@ module Jekyll # Jekyll::ConfigValidator class definition (see docs at the top of file) class ConfigValidator SEMESTER_REGEXP = /(wi|sp|su|fa)\d\d$/ - VALID_DEPTS = %w[eecs dsus stat].freeze + VALID_COURSE_DEPARTMENT = %w[eecs dsus stat].freeze + VALID_COLOR_SCHEME = %w[light dark].freeze + + # To validate a key with an 'allow list': + # Use the function :inclusion_validator + # and definite VALID_KEY_NAME above KEY_VALIDATIONS = { url: :validate_clean_url, baseurl: :validate_semester_format, - course_department: :validate_department + course_department: :inclusion_validator, + color_scheme: :inclusion_validator }.freeze attr_accessor :config, :errors @@ -49,7 +58,7 @@ def validate validate_keys! KEY_VALIDATIONS.each do |key, validator| - send(validator, config[key.to_s]) if @config.key?(key.to_s) + send(validator, key, config[key.to_s]) if @config.key?(key.to_s) end raise ConfigValidationError, errors if errors.length.positive? @@ -66,12 +75,12 @@ def validate_keys! private - def validate_clean_url(url) + def validate_clean_url(_key, url) errors << '`url` should not end with a `/`' if url.end_with?('/') errors << '`url` should contain a protocol' unless url.match?(%r{https?://}) end - def validate_semester_format(baseurl) + def validate_semester_format(_key, baseurl) # This is just for consistency of URL presentation. errors << '`baseurl` must start with a `/`.' unless baseurl.match?(%r{^/}) # skip, just for the template. @@ -82,8 +91,9 @@ def validate_semester_format(baseurl) errors << "`baseurl` must be a valid semester (faXX, spXX, suXX or wiXX), not #{baseurl}" end - def validate_department(dept) - errors << "`course_department` must be one of #{VALID_DEPTS} (not '#{dept}')" unless VALID_DEPTS.include?(dept) + def inclusion_validator(key, value) + allowed = self.class.const_get("VALID_#{key.upcase}") + errors << "`#{key}` must be one of #{allowed} (not '#{value}')" unless allowed.include?(value) end end end diff --git a/_sass/berkeley/berkeley.scss b/_sass/berkeley/berkeley.scss new file mode 100644 index 0000000..5284780 --- /dev/null +++ b/_sass/berkeley/berkeley.scss @@ -0,0 +1,101 @@ +// This config applies to all berkeley courses. +// It is loaded *after* all Just-the-class customizations + +// UC Berkeley fonts 'Inter' (sans serif) 'Source Serif' (serif), and 'Source Code Pro' (monospace) +@import url('https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&family=Source+Code+Pro:ital,wght@0,200..900;1,200..900&family=Source+Serif+4:ital,opsz,wght@0,8..60,200..900;1,8..60,200..900&display=swap'); + +// Override default JTD CSS for larger/more accessibile fonts. +html { + font-size: 16px; +} + +body { + font-family: $body-font-family; + font-size: inherit; + line-height: $body-line-height; + color: $body-text-color; + background-color: $body-background-color; + overflow-wrap: break-word; +} + +// Link Colors +a, +.main-content .anchor-heading svg { + color: $link-color; + + &:hover, + &:focus { + color: $hover-focus-link-color; + } +} + +a:not([class]):hover { + text-decoration-color: lighten($link-color, 20%); +} + +h1, h2, h3, h4, h5, h6, +.serif { + font-family: $serif-font-family; +} + +// Override JTD to be darker +.label-green:not(g) { + background-color: $green-300; +} + +.label-red:not(g) { + background-color: $red-300; +} + +code { + padding: 0.2em 0.4em; + border: none; +} + +iframe { + max-width: 100%; +} + +details { + @extend .mb-4; +} + +summary { + @extend .btn, .btn-outline; + + width: 100%; +} + +.main-content-wrap { + max-width: $content-width; + margin: auto; +} + +.main-content { + dl { + display: block; + grid-template-columns: none; + } + + dt { + font-weight: 700; + text-align: start; + + &::after { + content: normal; + } + } + + dd { + font-weight: normal; + + + dt { + margin-top: 1em; + } + } +} + +// This is intended to be used for the footer +.text-lighter { + color: $body-lighter-color; +} diff --git a/_sass/berkeley/variables.scss b/_sass/berkeley/variables.scss new file mode 100644 index 0000000..366f259 --- /dev/null +++ b/_sass/berkeley/variables.scss @@ -0,0 +1,28 @@ +// Common Berkeley Variables. +// This file is explicitly included before berkeley.scss in setup.scss +// Some colors may be override by berkeley_light or berkeley_dark + +$content-width: 1200px; + +// Typography +$mono-font-family: "Source Code Pro", "SFMono-Regular", menlo, consolas, monospace !default; +$body-font-family: 'Inter', system-ui, -apple-system, blinkmacsystemfont, "Segoe UI", +roboto, "Helvetica Neue", arial, sans-serif, "Segoe UI Emoji" !default; +$serif-font-family: 'Source Serif 4', 'Georiga', 'Baskerville', serif; + +$berkeley-blue-old: #003262; +$berkeley-blue: #002676; // rgb(0, 38, 118); + +// Colors +$link-color: $berkeley-blue; +$hover-focus-link-color: lighten($link-color, 20%); + +// Layout +$gutter-spacing: $sp-6; +$gutter-spacing-sm: $sp-4; +$nav-width: 256px; + +// Components +$box-shadow: 0 1px 3px rgba(0, 0, 0, 0.07), 0 4px 14px rgba(0, 0, 0, 0.05); +$module-date-color: $link-color; +$staffer-image-size: 100px; diff --git a/_sass/color_schemes/dark.scss b/_sass/color_schemes/dark.scss new file mode 100644 index 0000000..f5b6df6 --- /dev/null +++ b/_sass/color_schemes/dark.scss @@ -0,0 +1,49 @@ +// This file is coped from Just The Docs +// Individual courses should not modify it! +// All deviations should be documented. +// https://github.com/just-the-docs/just-the-docs/blob/main/_sass/color_schemes/light.scss + +/////////// Do not modify this section. +$color-scheme: dark; +$body-background-color: $grey-dk-300; +$body-heading-color: $grey-lt-000; +$body-text-color: $grey-lt-300; +$link-color: $blue-000; +$nav-child-link-color: $grey-dk-000; +$sidebar-color: $grey-dk-300; +$base-button-color: $grey-dk-250; +$btn-primary-color: $blue-200; +$code-background-color: #31343f; // OneDarkJekyll default for syntax-one-dark-vivid +$code-linenumber-color: #dee2f7; // OneDarkJekyll .nf for syntax-one-dark-vivid +$feedback-color: darken($sidebar-color, 3%); +$table-background-color: $grey-dk-250; +$search-background-color: $grey-dk-250; +$search-result-preview-color: $grey-dk-000; +$border-color: $grey-dk-200; +/////////////////// Add modifications below + +@import '../snytax_highliters/a11y-dark'; + +// Override dark-mode variables here +$grey-dk-400: #0C0A0E !default; +$body-background-color: $grey-dk-400; +$sidebar-color: $grey-dk-400; +$search-background-color: $grey-dk-400; +$body-text-color: $white; +$body-lighter-color: darken($body-text-color, 20%); + +$link-color: #406FFE; +$hover-focus-link-color: darken($link-color, 10%); + +// TODO(template): We need to figure out a much better solution! +// This swaps the "dk" and "lt" variants from the original JTD files. +$grey-lt-000: #959396 !default; +$grey-lt-100: #5c5962 !default; +$grey-lt-200: #44434d !default; +$grey-lt-250: #302d36 !default; +$grey-lt-300: #27262b !default; + +$grey-dk-000: #f5f6fa !default; +$grey-dk-100: #eeebee !default; +$grey-dk-200: #ecebed !default; +$grey-dk-300: #e6e1e8 !default; diff --git a/_sass/color_schemes/light.scss b/_sass/color_schemes/light.scss new file mode 100644 index 0000000..5b0a71d --- /dev/null +++ b/_sass/color_schemes/light.scss @@ -0,0 +1,26 @@ +// This file is coped from Just The Docs +// Individual courses should not modify it! +// All deviations should be documented. +// https://github.com/just-the-docs/just-the-docs/blob/main/_sass/color_schemes/light.scss + +/////////// Do not modify this section. +$color-scheme: light !default; +$body-background-color: $white !default; +$body-heading-color: $grey-dk-300 !default; +$body-text-color: $grey-dk-100 !default; +$link-color: $purple-000 !default; +$nav-child-link-color: $grey-dk-100 !default; +$sidebar-color: $grey-lt-000 !default; +$base-button-color: #f7f7f7 !default; +$btn-primary-color: $purple-100 !default; +$code-background-color: $grey-lt-000 !default; +$feedback-color: darken($sidebar-color, 3%) !default; +$table-background-color: $white !default; +$search-background-color: $white !default; +$search-result-preview-color: $grey-dk-000 !default; +/////////////////// Add modifications below + +@import "../snytax_highliters/a11y-light"; + +// Minimum lightness on white. +$body-lighter-color: $grey-dk-100; diff --git a/_sass/custom/course_overrides.scss b/_sass/custom/course_overrides.scss new file mode 100644 index 0000000..ba372e2 --- /dev/null +++ b/_sass/custom/course_overrides.scss @@ -0,0 +1,2 @@ +// Put your custom CSS here! +// You an reference all variables in the Berkeley files diff --git a/_sass/custom/custom.scss b/_sass/custom/custom.scss index f028758..f2cca91 100644 --- a/_sass/custom/custom.scss +++ b/_sass/custom/custom.scss @@ -1,62 +1,12 @@ -// Just the Class dependencies -@import 'card'; - -// Just the Class styles -@import 'announcement'; -@import 'module'; -@import 'schedule'; -@import 'staffer'; - -// Overrides -code { - font-size: 14px; - padding: 0.2em 0.4em; - border: none; -} - -iframe { - max-width: 100%; -} - -details { - @extend .mb-4; -} - -summary { - @extend .btn, .btn-outline; - - width: 100%; -} - -.label-a11y-green:not(g) { - background-color: $green-300; -} - -.main-content-wrap { - max-width: $content-width; - margin: auto; -} - -.main-content { - dl { - display: block; - grid-template-columns: none; - } - - dt { - font-weight: 700; - text-align: start; - - &::after { - content: normal; - } - } - - dd { - font-weight: normal; - - + dt { - margin-top: 1em; - } - } -} +// You may want to add CSS in additional files. +// It's best to not edit this file too much. +// "course_overrides.scss" is designed for each course's customizations. +// You can make additional files as necessary. +// You would then add `@import "file"; to this file. + +// Just the Class customizations are all loaded in one file. +@import '../just-the-class/just-the-class'; +@import '../berkeley/berkeley'; + +// Place all of your course-specific CSS here. +@import './course_overrides'; diff --git a/_sass/custom/setup.scss b/_sass/custom/setup.scss new file mode 100644 index 0000000..e39267c --- /dev/null +++ b/_sass/custom/setup.scss @@ -0,0 +1,7 @@ +// Use this file to customize SASS variables. +// You will likely want to review the Jst the Docs CSS +// This file is loaded *early* in the SASS compilation process. + +// Load berkeley variable customizations +// These are loaded before berkeley_light and berkeley_dark themes +@import '../berkeley/variables'; diff --git a/_sass/custom/announcement.scss b/_sass/just-the-class/announcement.scss similarity index 100% rename from _sass/custom/announcement.scss rename to _sass/just-the-class/announcement.scss diff --git a/_sass/custom/card.scss b/_sass/just-the-class/card.scss similarity index 100% rename from _sass/custom/card.scss rename to _sass/just-the-class/card.scss diff --git a/_sass/just-the-class/just-the-class.scss b/_sass/just-the-class/just-the-class.scss new file mode 100644 index 0000000..dc5e2be --- /dev/null +++ b/_sass/just-the-class/just-the-class.scss @@ -0,0 +1,12 @@ +// This file is common to Just The Class / theme styles. +// You should not add CSS directly to this file. +// You probably want to add files to _sass/custom/custom.scss + +// Just the Class dependencies +@import 'card'; + +// Just the Class styles +@import 'announcement'; +@import 'module'; +@import 'schedule'; +@import 'staffer'; diff --git a/_sass/custom/lab.scss b/_sass/just-the-class/lab.scss similarity index 100% rename from _sass/custom/lab.scss rename to _sass/just-the-class/lab.scss diff --git a/_sass/custom/module.scss b/_sass/just-the-class/module.scss similarity index 100% rename from _sass/custom/module.scss rename to _sass/just-the-class/module.scss diff --git a/_sass/custom/schedule.scss b/_sass/just-the-class/schedule.scss similarity index 89% rename from _sass/custom/schedule.scss rename to _sass/just-the-class/schedule.scss index f059310..da5ce21 100644 --- a/_sass/custom/schedule.scss +++ b/_sass/just-the-class/schedule.scss @@ -22,7 +22,7 @@ .schedule-time { @extend .fs-2; - color: $grey-dk-000; + color: $grey-dk-200; height: 40px; margin: 0; padding: $sp-2; @@ -93,15 +93,16 @@ } &.lecture { - background-color: $grey-dk-000; + background-color: $grey-lt-300; + color: $grey-dk-300; } &.section { - background-color: $purple-000; + background-color: darken($purple-000, 15%); } &.office-hours { - background-color: $blue-000; + background-color: darken($green-200, 10%); } } } diff --git a/_sass/custom/staffer.scss b/_sass/just-the-class/staffer.scss similarity index 56% rename from _sass/custom/staffer.scss rename to _sass/just-the-class/staffer.scss index 988a721..0e8f959 100644 --- a/_sass/custom/staffer.scss +++ b/_sass/just-the-class/staffer.scss @@ -12,15 +12,22 @@ p, .staffer-name { margin: $sp-1 !important; + + .anchor-heading { + width: 1.8rem; + padding-left: 0.5rem; + padding-right: 0.5rem; + } } .staffer-badge { - @extend .label, .text-grey-dk-100, .bg-grey-lt-200; + @extend .label, .text-grey-dk-300, .bg-grey-lt-200; + -webkit-user-select: none; user-select: none; } .staffer-meta { - @extend .text-grey-dk-000; + @extend .text-grey-dk-300; } } diff --git a/_sass/snytax_highliters/a11y-dark.css b/_sass/snytax_highliters/a11y-dark.css new file mode 100644 index 0000000..20f3214 --- /dev/null +++ b/_sass/snytax_highliters/a11y-dark.css @@ -0,0 +1,136 @@ +/* a11y-dark theme */ +/* Based on the Tomorrow Night Eighties theme: https://github.com/isagalaev/highlight.js/blob/master/src/styles/tomorrow-night-eighties.css */ +/* @author: ericwbailey */ +/* Adapted to pygments/rouge by @cycomachead */ + +:root { + --pygments-a11y-bg-color: #2b2b2b; + --pygments-a11y-dark-on-light: #000; /* Used for errors */ + --pygments-a11y-light-gray: #d4d0ab; /* comments */ + --pygments-a11y-dark-gray: #f8f8f2; + --pygments-a11y-purple: #dcc6e0; + --pygments-a11y-blue: #00e0e0; + --pygments-a11y-green: #abe338; + --pygments-a11y-yellow: #ffd700; /* attributes */ + --pygments-a11y-orange: #f5ab35; + --pygments-a11y-red: #ffa07a; +} + +.highlight, +pre.highlight { + background: var(--pygments-a11y-bg-color); + color: var(--pygments-a11y-dark-gray); +} + +.highlight pre, +.highlight .hll, +.highlight .w { + background: var(--pygments-a11y-bg-color); +} + +.highlight .c { + color: var(--pygments-a11y-light-gray); + font-style: italic; +} + +.highlight .err { + color: var(--pygments-a11y-dark-on-light); + background-color: var(--pygments-a11y-red); +} + +.highlight .k, +.highlight .kc, +.highlight .kd, +.highlight .kn, +.highlight .kp, +.highlight .kr, +.highlight .kt { + color: var(--pygments-a11y-purple); +} + +.highlight .n, +.highlight .o, +.highlight .p, +.highlight .nf, +.highlight .nn, +.highlight .nx { + color: var(--pygments-a11y-dark-gray); +} + +.highlight .cm, +.highlight .cp, +.highlight .c1, +.highlight .cs { + color: var(--pygments-a11y-light-gray); + font-style: italic; +} + +.highlight .ge { + font-style: italic; +} + +.highlight .gs, +.highlight .ow { + font-weight: 700; +} + +.highlight .l, +.highlight .ld, +.highlight .s, +.highlight .sb, +.highlight .sc, +.highlight .sd, +.highlight .s2, +.highlight .se, +.highlight .sh, +.highlight .si, +.highlight .sx, +.highlight .s1 { + color: var(--pygments-a11y-green); +} + +.highlight .bp, +.highlight .nb, +.highlight .nc, +.highlight .no, +.highlight .nd, +.highlight .ni, +.highlight .ne, +.highlight .nl, +.highlight .nv, +.highlight .py, +.highlight .vc, +.highlight .vg { + color: var(--pygments-a11y-orange); /* #ca7601; */ +} + +.highlight .gd, +.highlight .nt, +.highlight .vi, +.highlight .language-json .w + .s2 { + color: var(--pygments-a11y-red); /* #e35549 */ +} + +.highlight .il, +.highlight .m, +.highlight .mf, +.highlight .mh, +.highlight .mi, +.highlight .mo, +.highlight .na { + color: var(--pygments-a11y-yellow); /* #b66a00 */ +} + +.highlight .sr, +.highlight .ss, +.highlight .language-json .kc { + color: var(--pygments-a11y-blue); /*#0083bb */ +} + +.highlight .gu { + color: var(--pygments-a11y-light-gray); /* was #75715e kind of dark yellow */ +} + +.highlight .gi { + color: var(--pygments-a11y-green); /* was #43d089 seafoam ish */ +} diff --git a/_sass/snytax_highliters/a11y-light.css b/_sass/snytax_highliters/a11y-light.css new file mode 100644 index 0000000..fc95d77 --- /dev/null +++ b/_sass/snytax_highliters/a11y-light.css @@ -0,0 +1,136 @@ +/* a11y-light theme */ +/* Based on the Tomorrow Night Eighties theme: https://github.com/isagalaev/highlight.js/blob/master/src/styles/tomorrow-night-eighties.css */ +/* @author: ericwbailey */ +/* Adapted to pygments/rouge by @cycomachead */ + +:root { + --pygments-a11y-bg-color: #fefefe; + --pygments-a11y-light-on-dark: #FFF; /* Used for errors */ + --pygments-a11y-light-gray: #696969; /* comments */ + --pygments-a11y-dark-gray: #545454; + --pygments-a11y-purple: #7928a1; + --pygments-a11y-blue: #007faa; + --pygments-a11y-green: #008000; + --pygments-a11y-yellow: #aa5d00; /* attributes */ + --pygments-a11y-orange: #aa5d00; + --pygments-a11y-red: #d91e18; +} + +.highlight, +pre.highlight { + background: var(--pygments-a11y-bg-color); + color: var(--pygments-a11y-dark-gray); +} + +.highlight pre, +.highlight .hll, +.highlight .w { + background: var(--pygments-a11y-bg-color); +} + +.highlight .c { + color: var(--pygments-a11y-light-gray); + font-style: italic; +} + +.highlight .err { + color: var(--pygments-a11y-light-on-dark); + background-color: var(--pygments-a11y-red); +} + +.highlight .k, +.highlight .kc, +.highlight .kd, +.highlight .kn, +.highlight .kp, +.highlight .kr, +.highlight .kt { + color: var(--pygments-a11y-purple); +} + +.highlight .n, +.highlight .o, +.highlight .p, +.highlight .nf, +.highlight .nn, +.highlight .nx { + color: var(--pygments-a11y-dark-gray); +} + +.highlight .cm, +.highlight .cp, +.highlight .c1, +.highlight .cs { + color: var(--pygments-a11y-light-gray); + font-style: italic; +} + +.highlight .ge { + font-style: italic; +} + +.highlight .gs, +.highlight .ow { + font-weight: 700; +} + +.highlight .l, +.highlight .ld, +.highlight .s, +.highlight .sb, +.highlight .sc, +.highlight .sd, +.highlight .s2, +.highlight .se, +.highlight .sh, +.highlight .si, +.highlight .sx, +.highlight .s1 { + color: var(--pygments-a11y-green); +} + +.highlight .bp, +.highlight .nb, +.highlight .nc, +.highlight .no, +.highlight .nd, +.highlight .ni, +.highlight .ne, +.highlight .nl, +.highlight .nv, +.highlight .py, +.highlight .vc, +.highlight .vg { + color: var(--pygments-a11y-orange); /* #ca7601; */ +} + +.highlight .gd, +.highlight .nt, +.highlight .vi, +.highlight .language-json .w + .s2 { + color: var(--pygments-a11y-red); /* #e35549 */ +} + +.highlight .il, +.highlight .m, +.highlight .mf, +.highlight .mh, +.highlight .mi, +.highlight .mo, +.highlight .na { + color: var(--pygments-a11y-yellow); /* #b66a00 */ +} + +.highlight .sr, +.highlight .ss, +.highlight .language-json .kc { + color: var(--pygments-a11y-blue); /*#0083bb */ +} + +.highlight .gu { + color: var(--pygments-a11y-light-gray); /* was #75715e kind of dark yellow */ +} + +.highlight .gi { + color: var(--pygments-a11y-green); /* was #43d089 seafoam ish */ +} diff --git a/_sass/snytax_highliters/hljs-a11y-dark.css b/_sass/snytax_highliters/hljs-a11y-dark.css new file mode 100644 index 0000000..b93b742 --- /dev/null +++ b/_sass/snytax_highliters/hljs-a11y-dark.css @@ -0,0 +1,99 @@ +/* a11y-dark theme */ +/* Based on the Tomorrow Night Eighties theme: https://github.com/isagalaev/highlight.js/blob/master/src/styles/tomorrow-night-eighties.css */ +/* @author: ericwbailey */ + +/* Comment */ +.hljs-comment, +.hljs-quote { + color: #d4d0ab; +} + +/* Red */ +.hljs-variable, +.hljs-template-variable, +.hljs-tag, +.hljs-name, +.hljs-selector-id, +.hljs-selector-class, +.hljs-regexp, +.hljs-deletion { + color: #ffa07a; +} + +/* Orange */ +.hljs-number, +.hljs-built_in, +.hljs-builtin-name, +.hljs-literal, +.hljs-type, +.hljs-params, +.hljs-meta, +.hljs-link { + color: #f5ab35; +} + +/* Yellow */ +.hljs-attribute { + color: #ffd700; +} + +/* Green */ +.hljs-string, +.hljs-symbol, +.hljs-bullet, +.hljs-addition { + color: #abe338; +} + +/* Blue */ +.hljs-title, +.hljs-section { + color: #00e0e0; +} + +/* Purple */ +.hljs-keyword, +.hljs-selector-tag { + color: #dcc6e0; +} + +.hljs { + display: block; + overflow-x: auto; + background: #2b2b2b; + color: #f8f8f2; + padding: 0.5em; +} + +.hljs-emphasis { + font-style: italic; +} + +.hljs-strong { + font-weight: bold; +} + +@media screen and (-ms-high-contrast: active) { + .hljs-addition, + .hljs-attribute, + .hljs-built_in, + .hljs-builtin-name, + .hljs-bullet, + .hljs-comment, + .hljs-link, + .hljs-literal, + .hljs-meta, + .hljs-number, + .hljs-params, + .hljs-string, + .hljs-symbol, + .hljs-type, + .hljs-quote { + color: highlight; + } + + .hljs-keyword, + .hljs-selector-tag { + font-weight: bold; + } +} diff --git a/_sass/snytax_highliters/hljs-a11y-light.css b/_sass/snytax_highliters/hljs-a11y-light.css new file mode 100644 index 0000000..d9d5f03 --- /dev/null +++ b/_sass/snytax_highliters/hljs-a11y-light.css @@ -0,0 +1,99 @@ +/* a11y-light theme */ +/* Based on the Tomorrow Night Eighties theme: https://github.com/isagalaev/highlight.js/blob/master/src/styles/tomorrow-night-eighties.css */ +/* @author: ericwbailey */ + +/* Comment */ +.hljs-comment, +.hljs-quote { + color: #696969; +} + +/* Red */ +.hljs-variable, +.hljs-template-variable, +.hljs-tag, +.hljs-name, +.hljs-selector-id, +.hljs-selector-class, +.hljs-regexp, +.hljs-deletion { + color: #d91e18; +} + +/* Orange */ +.hljs-number, +.hljs-built_in, +.hljs-builtin-name, +.hljs-literal, +.hljs-type, +.hljs-params, +.hljs-meta, +.hljs-link { + color: #aa5d00; +} + +/* Yellow */ +.hljs-attribute { + color: #aa5d00; +} + +/* Green */ +.hljs-string, +.hljs-symbol, +.hljs-bullet, +.hljs-addition { + color: #008000; +} + +/* Blue */ +.hljs-title, +.hljs-section { + color: #007faa; +} + +/* Purple */ +.hljs-keyword, +.hljs-selector-tag { + color: #7928a1; +} + +/* .hljs { + display: block; + overflow-x: auto; + background: #fefefe; + color: #545454; + padding: 0.5em; +} */ + +.hljs-emphasis { + font-style: italic; +} + +.hljs-strong { + font-weight: bold; +} + +@media screen and (-ms-high-contrast: active) { + .hljs-addition, + .hljs-attribute, + .hljs-built_in, + .hljs-builtin-name, + .hljs-bullet, + .hljs-comment, + .hljs-link, + .hljs-literal, + .hljs-meta, + .hljs-number, + .hljs-params, + .hljs-string, + .hljs-symbol, + .hljs-type, + .hljs-quote { + color: highlight; + } + + .hljs-keyword, + .hljs-selector-tag { + font-weight: bold; + } +} diff --git a/home.md b/home.md index b47561c..84ab9a7 100644 --- a/home.md +++ b/home.md @@ -8,7 +8,12 @@ seo: name: Just the Class --- -# Just the Class +# UC Berkeley Class Site Template + ++ +
+ Just the Class is a GitHub Pages template developed for the purpose of quickly deploying course websites. In addition to serving plain web pages and files, it provides a boilerplate for: diff --git a/spec/accessibility_spec.rb b/spec/accessibility_spec.rb index cb7c082..1bb3a21 100644 --- a/spec/accessibility_spec.rb +++ b/spec/accessibility_spec.rb @@ -6,26 +6,6 @@ # spec_helper ensures the webiste is built and can be served locally require 'spec_helper' -def site_url - @site_url ||= YAML.load_file(RSPEC_CONFIG_FILE)['url'] + YAML.load_file(RSPEC_CONFIG_FILE)['baseurl'] -end - -def load_site_urls - puts "Running accessibility tests, expected deploy URL: #{site_url}" - # TODO: Handle case where build is not in _site - sitemap_text = File.read('_site/sitemap.xml') - sitemap_links = sitemap_text.scan(%r{