Revert "drop assets"

This reverts commit 455e16b.
gjtorikian · Oct 23, 2024 · 632efff · 632efff
1 parent 455e16b
commit 632efff
Show file tree

Hide file tree

Showing 15 changed files with 133 additions and 132 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,8 +4,5 @@
   },
   "[javascript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[ruby]": {
-    "editor.defaultFormatter": "Shopify.ruby-lsp"
   }
 }
diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,10 @@
 source 'https://rubygems.org'
 
 gem 'github-pages', group: :jekyll_plugins
+gem "jekyll-assets", group: :jekyll_plugins
+
+# Remove when jekyll-assets >= 4.0
+# https://github.com/envygeeks/jekyll-assets/issues/622
+gem "sprockets", "~> 3.7"
 
 gem 'rake'
diff --git a/_assets/css/_ace.scss b/_assets/css/_ace.scss
@@ -0,0 +1,5 @@
+.row div.ace-overrides {
+  position: relative;
+  height: 200px;
+  border: 1px #666 solid;
+}
diff --git a/_assets/css/_carbon.scss b/_assets/css/_carbon.scss
@@ -0,0 +1,50 @@
+#ad {
+  width: 125px;
+  position: fixed;
+  z-index: 99;
+  bottom: 10px;
+  right: 10px;
+  background-color: #fff;
+  border-radius: 3px;
+  font-size: 13px;
+}
+#ad a {
+  display: inline-block;
+  color: #4f5959;
+  font-weight: normal;
+}
+#ad span {
+  color: #4f5959;
+  display: block;
+}
+#ad img {
+  width: 125px;
+}
+#ad .carbon-img,
+#ad .carbon-text {
+  display: block;
+  margin-bottom: 4px;
+  font-weight: normal;
+  color: #304455;
+}
+#ad .carbon-poweredby {
+  color: #aaa;
+  font-size: 10px;
+  letter-spacing: 0.8px;
+  text-transform: uppercase;
+  font-weight: normal;
+}
+
+@media screen and (max-width: 1300px) {
+  .content.with-sidebar {
+    margin-left: 290px;
+  }
+  #ad {
+    z-index: 1;
+    position: relative;
+    padding: 0;
+    bottom: 0;
+    right: 0;
+    width: 100%;
+  }
+}
diff --git a/_assets/css/_lessons.scss b/_assets/css/_lessons.scss
@@ -0,0 +1,24 @@
+span.help-tooltip {
+  float: left;
+}
+
+.tooltip-inner {
+  min-width: 150px; //the minimum width
+}
+
+.renderpad {
+  background: rgba(255, 255, 255, 0.9);
+  border: 1px black dashed;
+}
+
+div.toBeRevealed {
+  display: none;
+}
+
+ol blockquote p {
+  font-size: 14px;
+}
+
+.btn-skip {
+  margin-top: 1em;
+}
diff --git a/_assets/css/main.scss b/_assets/css/main.scss
@@ -0,0 +1,47 @@
+body {
+  padding-bottom: 60px;
+}
+
+h1.title {
+  margin-bottom: 40px;
+  border-bottom: 1px solid black;
+}
+
+.nav-link.icon-github {
+  font-size: 20px;
+}
+
+/* Custom container */
+.container {
+  margin: 0 auto;
+  max-width: 1000px;
+}
+.container > hr {
+  margin: 60px 0;
+}
+
+.navbar .center-nav,
+.navbar .center-nav > li {
+  float: none;
+  display: inline-block;
+  *display: inline; /* ie7 fix */
+  *zoom: 1; /* hasLayout ie7 trigger */
+  vertical-align: top;
+}
+
+.navbar-inner {
+  text-align: center;
+}
+
+.navbar-inner {
+  border-radius: 0px;
+  padding-left: 0px;
+
+  .nav li a {
+    margin-top: 3px;
+  }
+}
+
+@import "ace";
+@import "lessons";
+@import "carbon";
diff --git a/assets/js/ga.js → _assets/js/ga.js b/assets/js/ga.js → _assets/js/ga.js
diff --git a/assets/js/lesson_plans.js → _assets/js/lesson_plans.js b/assets/js/lesson_plans.js → _assets/js/lesson_plans.js
diff --git a/assets/js/lessons.js → _assets/js/lessons.js b/assets/js/lessons.js → _assets/js/lessons.js
diff --git a/assets/js/main.js → _assets/js/main.js b/assets/js/main.js → _assets/js/main.js
diff --git a/assets/js/marked.js → _assets/js/marked.js b/assets/js/marked.js → _assets/js/marked.js
diff --git a/assets/js/navbar.js → _assets/js/navbar.js b/assets/js/navbar.js → _assets/js/navbar.js
diff --git a/assets/js/scrollto.js → _assets/js/scrollto.js b/assets/js/scrollto.js → _assets/js/scrollto.js
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -21,7 +21,7 @@
     />
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
 
-    <link href="/assets/css/main.css" rel="stylesheet" />
+    {% asset main.css %}
   </head>
 
   <body>
@@ -255,9 +255,7 @@ <h1 class="title">{{ page.title }}</h1>
       var environment = "production";
     </script>
 
-    <script src="/assets/js/main.js"></script>
-
-    {% if page.locale != 'en' %}
+    {% asset main.js %} {% if page.locale != 'en' %}
     <script src="/{{ page.locale }}/lesson_plans.js"></script>
     {% endif %}
   </body>

diff --git a/assets/css/main.css b/assets/css/main.css