diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..fcab0b2
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+custom: paypal.me/PhlowMedia
+patreon: phlow
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
diff --git a/.gitignore b/.gitignore
index 2d2eb81..4276cbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
-_site/
-.sass-cache/
+_site
+.bundle
.DS_Store
+.jekyll-cache
+.jekyll-metadata
+.sass-cache
+Gemfile.lock
diff --git a/Gemfile b/Gemfile
deleted file mode 100644
index ed09564..0000000
--- a/Gemfile
+++ /dev/null
@@ -1,13 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'jekyll'
-
-group :jekyll_plugins do
- gem 'jekyll-gist'
- gem 'jekyll-paginate'
- gem "jekyll-asciidoc"
-end
-
-gem 'asciidoctor', '~> 1.5.4'
-gem 'coderay', '1.1.1'
-
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index 01b92bd..0000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,68 +0,0 @@
-GEM
- remote: https://rubygems.org/
- specs:
- addressable (2.5.0)
- public_suffix (~> 2.0, >= 2.0.2)
- asciidoctor (1.5.5)
- coderay (1.1.1)
- colorator (1.1.0)
- faraday (0.10.0)
- multipart-post (>= 1.2, < 3)
- ffi (1.9.14)
- forwardable-extended (2.6.0)
- jekyll (3.3.1)
- addressable (~> 2.4)
- colorator (~> 1.0)
- jekyll-sass-converter (~> 1.0)
- jekyll-watch (~> 1.1)
- kramdown (~> 1.3)
- liquid (~> 3.0)
- mercenary (~> 0.3.3)
- pathutil (~> 0.9)
- rouge (~> 1.7)
- safe_yaml (~> 1.0)
- jekyll-asciidoc (2.0.1)
- asciidoctor (>= 1.5.0)
- jekyll (>= 2.3.0)
- jekyll-gist (1.4.0)
- octokit (~> 4.2)
- jekyll-paginate (1.1.0)
- jekyll-sass-converter (1.5.0)
- sass (~> 3.4)
- jekyll-watch (1.5.0)
- listen (~> 3.0, < 3.1)
- kramdown (1.13.0)
- liquid (3.0.6)
- listen (3.0.8)
- rb-fsevent (~> 0.9, >= 0.9.4)
- rb-inotify (~> 0.9, >= 0.9.7)
- mercenary (0.3.6)
- multipart-post (2.0.0)
- octokit (4.6.2)
- sawyer (~> 0.8.0, >= 0.5.3)
- pathutil (0.14.0)
- forwardable-extended (~> 2.6)
- public_suffix (2.0.4)
- rb-fsevent (0.9.8)
- rb-inotify (0.9.7)
- ffi (>= 0.5.0)
- rouge (1.11.1)
- safe_yaml (1.0.4)
- sass (3.4.22)
- sawyer (0.8.1)
- addressable (>= 2.3.5, < 2.6)
- faraday (~> 0.8, < 1.0)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- asciidoctor (~> 1.5.4)
- coderay (= 1.1.1)
- jekyll
- jekyll-asciidoc
- jekyll-gist
- jekyll-paginate
-
-BUNDLED WITH
- 1.13.6
diff --git a/README.md b/README.md
index 5dca78c..efa2545 100644
--- a/README.md
+++ b/README.md
@@ -1,67 +1,6 @@
-[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=Phlow&url=https://github.com/Phlow/feeling-responsive&title=Support%20Feeling%20Responsive%20Jekyll%20Theme&language=en_GB&tags=github,jekyll,theme,webdesign&category=software)
+This is the source of the course web page for UCSD CSE 15L in Winter 2022.
+The page is live at https://ucsd-cse15l-w22.github.io/
-# Newsletter: Stay in Touch for Future Updates
+It's based on a theme called *Feeling Responsive*?
Created with ♥ by Phlow with Jekyll based on Feeling Responsive.
' +credits: 'Created by Joe Politz, using Jekyll based on Feeling Responsive by Phlow.
' # Main author of the website # See > authors.yml -author: phlow +author: joe # This URL is the main address for absolute links. Don't include a slash at the end. # -url: 'https://phlow.github.io' -baseurl: '/feeling-responsive' +url: 'https://ucsd-cse15l-w22.github.io' +baseurl: '' # This is for the editing function in _/includes/improve_content # Leave it empty if your site is not on GitHub/GitHub Pages @@ -38,14 +38,14 @@ improve_content: https://github.com/Phlow/feeling-responsive/edit/gh-pages # Example: # Markdown-Example for posts ![Image Text]({{ site.urlimg }}image.jpg) # -urlimg: 'https://phlow.github.io/feeling-responsive/images/' +urlimg: 'https://ucsd-cse15l-w22.github.io/images/' # Logo size is 600x80 pixels logo: "logo.png" -# Gems -gems: +# Plugins +plugins: - jekyll-asciidoc - jekyll-gist - jekyll-paginate @@ -63,11 +63,11 @@ paginate_path: "blog/page:num" # Pagination path › Important for blog page i # Theme works best with Kramdown (using the table of contents function) -markdown: kramdown -permalink: /:categories/:title/ -highlight: rouge -excerpt_separator: "" -include: ['.htaccess'] +markdown : kramdown +permalink : /:categories/:title/ +highlight : rouge +excerpt_separator : "" +include : ['.htaccess'] # Exclude these files from your production _site exclude: - .sass-cache @@ -76,6 +76,7 @@ exclude: - LICENSE - README.md - INSTALL.md + - vendor # The language setting is used in /includes/header.html for html-settings @@ -136,17 +137,6 @@ defaults: -# _____ __________ -# / ___// ____/ __ \ -# \__ \/ __/ / / / / -# ___/ / /___/ /_/ / -# /____/_____/\____/ Verify Website to Webmaster Tools - -google_author: 'https://plus.google.com/u/0/118311555303973066167' -google_site_verification: 'Vk0IOJ2jwG_qEoG7fuEXYqv0m2rLa8P778Fi_GrsgEQ' -bing_webmastertools_id: '0FB4C028ABCF07C908C54386ABD2D97F' -# alexa_verify_id: '' - # ______ _ @@ -156,18 +146,10 @@ bing_webmastertools_id: '0FB4C028ABCF07C908C54386ABD2D97F' # /_/ \__,_/ |___/_/\___/\____/_/ /_/____/ Favicon-Crap: Favicons, Chrome, Android & Apple Touch Buttons # More information » https://mathiasbynens.be/notes/touch-icons -favicon-32x32: 'favicon-32x32.png' -touch-icon-192x192: 'touch-icon-192x192.png' -apple-touch-icon-180x180-precomposed: 'apple-touch-icon-180x180-precomposed.png' -apple-touch-icon-152x152-precomposed: 'apple-touch-icon-152x152-precomposed.png' -apple-touch-icon-144x144-precomposed: 'apple-touch-icon-144x144-precomposed.png' -apple-touch-icon-120x120-precomposed: 'apple-touch-icon-120x120-precomposed.png' -apple-touch-icon-114x114-precomposed: 'apple-touch-icon-114x114-precomposed.png' -apple-touch-icon-76x76-precomposed: 'apple-touch-icon-76x76-precomposed.png' -apple-touch-icon-72x72-precomposed: 'apple-touch-icon-72x72-precomposed.png' -apple-touch-icon-precomposed: 'apple-touch-icon-precomposed.png' -msapplication_tileimage: 'msapplication_tileimage.png' # Size 144x144 -msapplication_tilecolor: '#fabb00' +favicon-32x32 : 'CSELogo-color-vrable-thm.png' +touch-icon-192x192 : 'CSELogo-color-vrable-thm.png' +apple-touch-icon-180x180-precomposed : 'CSELogo-color-vrable-thm.png' +apple-touch-icon-152x152-precomposed : 'CSELogo-color-vrable-thm.png' # ______ __ __ @@ -176,9 +158,9 @@ msapplication_tilecolor: '#fabb00' # / __/ / /_/ / /__/ __/ /_/ / /_/ / /_/ / ,< # /_/ \__,_/\___/\___/_.___/\____/\____/_/|_| Facebook-Optimization › http://j.mp/fb_optimize -og_image: 'http://images.phlow.de/phlow/phlow_de-logo-512x.png' -og_locale: 'en_EN' -og_type: 'website' +og_image : 'CSELogo-color-vrable-thm.png' +og_locale : 'en_EN' +og_type : 'website' # _____ _ __ __ ___ ___ @@ -191,8 +173,8 @@ og_type: 'website' # socialmedia: - twitter: phlow - facebook: phlow.media + twitter : phlow + facebook : phlow.media # ____ _ @@ -204,7 +186,7 @@ socialmedia: # # used in _includes/comments -disqus_shortname: feelingresponsive +# disqus_shortname: # _____ @@ -215,8 +197,8 @@ disqus_shortname: feelingresponsive # sass: - sass_dir: _sass - style: :compressed + sass_dir : _sass + style : :compressed # ___ __ __ _ @@ -228,7 +210,7 @@ sass: # # used in _includes/footer_scripts -google_analytics_tracking_id: UA-60112281-1 +# google_analytics_tracking_id: @@ -264,7 +246,7 @@ google_analytics_tracking_id: UA-60112281-1 asciidoctor-enabled: false asciidoctor: - description: testtewtetrue + description: attributes: source-highlighter: coderay coderay-css: style diff --git a/_config_dev.yml b/_config_dev.yml index 5a5f83a..e8d645b 100644 --- a/_config_dev.yml +++ b/_config_dev.yml @@ -20,7 +20,7 @@ sass: # trace_selectors: true # debug_info: true # FUTURE https://github.com/jekyll/jekyll-sass-converter/issues/12 - sourcemap: true + # sourcemap: true # Produces an error # Disable when not in production google_analytics_tracking_id: false diff --git a/_data/authors.yml b/_data/authors.yml index 491829f..5be2e44 100644 --- a/_data/authors.yml +++ b/_data/authors.yml @@ -5,10 +5,10 @@ # 3. Change default post/page authors in config.yml # # Resource › http://blog.sorryapp.com/blogging-with-jekyll/2014/02/06/adding-authors-to-your-jekyll-site.html -phlow: # replace this with your info - name: "Phlow" +joe: # replace this with your info + name: "Joe Politz" siterole: "webmaster, developer, copywriter, designer" - uri: http://phlow.de/ - email: - twitter: "@phlow" + uri: https://jpolitz.github.io + email: "jpolitz@eng.ucsd.edu" + twitter: "@joepolitz" # you can add more authors here \ No newline at end of file diff --git a/_data/language.yml b/_data/language.yml index e107f3e..41faefa 100644 --- a/_data/language.yml +++ b/_data/language.yml @@ -17,7 +17,7 @@ if_you_are_not_redirected_automatically: "If you are not redirected automaticall click_here: "click here" next_post_in: "Next Post in" previous_post_in: "Previous Post in" -breadcrumb_start: "Start" +breadcrumb_start: "Home" edit: "Edit" this_content_is_open_source: "This content is open source." help_improve_it: "Help improve it" diff --git a/_data/navigation.yml b/_data/navigation.yml index 749b176..5d8eca4 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -1,75 +1,26 @@ -- title: Start +- title: CSE15L url: "/" side: left -- title: Getting Started - url: "/getting-started/" +- title: Syllabus + url: "/syllabus/" side: left -- title: "Templates" - url: "/design/" +- title: "Weeks" + url: "/weeks/" side: left dropdown: - - title: "Grid & Colors" - url: "/design/grid/" - - title: "Typography" - url: "/design/typography/typography/" - - title: "Page/Post" - url: "/design/page/" - - title: "Post-Left-Sidebar" - url: "/design/post-left-sidebar/" - - title: "Post-Right-Sidebar" - url: "/design/post-right-sidebar/" - - title: "Page Full-Width" - url: "/design/page-fullwidth/" - - title: "Blog-Page" - url: "/blog/" - - title: "Video" - url: "/design/video/" - - title: "Gallery" - url: "/design/gallery/" - - title: "Portfolio" - url: "/design/portfolio/" + - title: "Week 1" + url: "/week/week1/" + - title: "Week 2" + url: "/week/week2/" + - title: "Week 3" + url: "/week/week3/" + - title: "Week 4" + url: "/week/week4/" + - title: "Week 5" + url: "/week/week5/" -- title: "Header Styles" - url: "/headers/" +- title: "Office Hours" + url: "/office-hours/" side: left - dropdown: - - title: "Header with Full-Width-Image" - url: "/design/header-full-width-image/" - - title: "Header with Image and Pattern" - url: "/design/header-image-pattern/" - - title: "Header with image and color" - url: "/design/header-image-color/" - - title: "Header Only With Logo" - url: "/design/header-logo-only/" - - title: "Header With Text" - url: "/design/header-with-text/" - - title: "No Header" - url: "/design/no-header/" - - title: "No Header but Image" - url: "/design/no-header-but-image/" - -- title: Documentation - url: "/documentation/" - side: left - dropdown: - - title: "Changelog" - url: "/changelog/" - - title: "Roadmap" - url: "/roadmap/" - -- title: Blog - url: "/blog/" - side: left - dropdown: - - title: "Blog Archive" - url: "/blog/archive/" - -- title: "Search" - url: "/search/" - side: right - -- title: "Contact" - url: "/contact/" - side: right diff --git a/_data/socialmedia.yml b/_data/socialmedia.yml index 16acb42..1ccd6b0 100644 --- a/_data/socialmedia.yml +++ b/_data/socialmedia.yml @@ -1,28 +1,3 @@ -- name: GitHub - url: http://github.com/phlow - class: icon-github - title: Code und mehr... - -- name: YouTube - url: http://www.youtube.com/PhlowMedia - class: icon-youtube - title: "Videos, Video-Anleitungen und Filme von Phlow auf YouTube" - -- name: Twitter - url: http://twitter.com/phlow - class: icon-twitter - title: "Immer das Neuste von Phlow gibt es auf Twitter" - -- name: Mixcloud - url: http://www.mixcloud.com/phlow/ - class: icon-cloud - title: "Mixe, was sonst?" - -- name: Phlow YouTube Google+ - url: https://plus.google.com/u/0/+Phlow - class: icon-googleplus - title: "YouTube Google+" - # - name: Facebook # url: http://www.facebook.com/ # class: icon-facebook diff --git a/_includes/_favicon.html b/_includes/_favicon.html index 3807a6e..4161f8b 100644 --- a/_includes/_favicon.html +++ b/_includes/_favicon.html @@ -1,7 +1,7 @@ {% comment %} -* +* * More Information › https://mathiasbynens.be/notes/touch-icons -* +* {% endcomment %} {% comment %} Regular Old-Skool Favicon: {% endcomment %} {% if site.favicon-32x32 %}{% endif %} diff --git a/_includes/_footer_scripts.html b/_includes/_footer_scripts.html index a82968b..340973b 100755 --- a/_includes/_footer_scripts.html +++ b/_includes/_footer_scripts.html @@ -17,39 +17,6 @@ -{% if site.google_analytics_tracking_id %} - -{% endif %} - -{% comment %} -# Start of Tawk.to Script -# -# More information in _config.yml -# -{% endcomment %} -{% if site.tawkto_embed_uri and page.tawkto == true %} - -{% endif %} diff --git a/_includes/_frontpage-widget.html b/_includes/_frontpage-widget.html index e9fe020..1b5b76e 100644 --- a/_includes/_frontpage-widget.html +++ b/_includes/_frontpage-widget.html @@ -1,20 +1,29 @@ +{% comment %} +* +* First the include captures the url and image in a +* separate variable to make the code better readable. +* +* These variables are widget_url and widget_image +* +{% endcomment %} + +{% capture widget_url %}{% if include.widget.url == NULL %}{% elsif include.widget.url contains 'http' %}{{ include.widget.url }}{% else %}{{ site.url }}{{ site.baseurl }}{{ include.widget.url }}{% endif %}{% endcapture %} + +{% capture widget_image %}{% if include.widget.image contains 'http' %}{{ include.widget.image }}{% else %}{{ site.urlimg }}{{ include.widget.image }}{% endif %}{% endcapture %} + + \ No newline at end of file diff --git a/_includes/_head.html b/_includes/_head.html index 68a2391..102c595 100644 --- a/_includes/_head.html +++ b/_includes/_head.html @@ -46,9 +46,9 @@ - {% if site.google_site_verification %}{% endif %} + {% if site.google_site_verification %}{% endif %} {% if site.bing_webmastertools_id %}{% endif %} - {% if site.google_author %}{% endif %} + {% if site.yandex_site_verification %}{% endif %} {% if site.alexa_verify_id %}{% endif %} {% if page.noindex == true or layout.noindex == true %}{% endif %} @@ -88,3 +88,13 @@ {% unless page.style == NULL %} {% endunless %} + + {% if site.google_analytics_tracking_id %} + + + {% endif %} + diff --git a/_includes/_meta_information.html b/_includes/_meta_information.html index e9b6253..ee515ee 100644 --- a/_includes/_meta_information.html +++ b/_includes/_meta_information.html @@ -9,23 +9,25 @@ {% endif %} {% if page.date %} - + {% endif %} - {% if page.categories %} {{ page.categories | join: ' · ' | upcase }}{% endif %} + {% if page.categories != empty %} {{ page.categories | join: ' · ' | upcase }}{% endif %}