Change site to Markdown. Updated SCSS.

atsansone · Jul 18, 2024 · dd93229 · dd93229
1 parent 13774db
commit dd93229
Show file tree

Hide file tree

Showing 51 changed files with 1,268 additions and 3 deletions.
diff --git a/.jekyll-metadata b/.jekyll-metadata
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # frozen_string_literal: true
 
 source "https://rubygems.org"
@@ -6,3 +7,12 @@ source "https://rubygems.org"
 
 # gem "jekyll", "~> 4.3"
 gem "github-pages", "~> 231", group: :jekyll_plugins
+=======
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+# gem "rails"
+
+gem "jekyll", "~> 4.3"
+>>>>>>> 9fe2fe1 (Change site to Markdown. Updated SCSS.)
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -0,0 +1,74 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
+    colorator (1.1.0)
+    concurrent-ruby (1.2.3)
+    em-websocket (0.5.3)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0)
+    eventmachine (1.2.7)
+    ffi (1.16.3)
+    forwardable-extended (2.6.0)
+    google-protobuf (3.25.3-x86_64-linux)
+    http_parser.rb (0.8.0)
+    i18n (1.14.5)
+      concurrent-ruby (~> 1.0)
+    jekyll (4.3.3)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 1.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 2.3, >= 2.3.1)
+      kramdown-parser-gfm (~> 1.0)
+      liquid (~> 4.0)
+      mercenary (>= 0.3.6, < 0.5)
+      pathutil (~> 0.9)
+      rouge (>= 3.0, < 5.0)
+      safe_yaml (~> 1.0)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
+    jekyll-watch (2.2.1)
+      listen (~> 3.0)
+    kramdown (2.4.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    liquid (4.0.4)
+    listen (3.9.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    mercenary (0.4.0)
+    pathutil (0.16.2)
+      forwardable-extended (~> 2.6)
+    public_suffix (5.0.5)
+    rake (13.2.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
+      ffi (~> 1.0)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
+    rouge (4.2.1)
+    safe_yaml (1.0.5)
+    sass-embedded (1.69.5)
+      google-protobuf (~> 3.23)
+      rake (>= 13.0.0)
+    strscan (3.1.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.5.0)
+    webrick (1.8.1)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  jekyll (~> 4.3)
+
+BUNDLED WITH
+   2.4.19
diff --git a/js/jquery/jquery.js → _assets/js/jquery/jquery.js b/js/jquery/jquery.js → _assets/js/jquery/jquery.js
diff --git a/js/js-readme.txt → _assets/js/js-readme.txt b/js/js-readme.txt → _assets/js/js-readme.txt
diff --git a/js/respond.min.js → _assets/js/respond.min.js b/js/respond.min.js → _assets/js/respond.min.js
diff --git a/js/site.js → _assets/js/site.js b/js/site.js → _assets/js/site.js
diff --git a/js/swfobject/expressInstall.swf → _assets/js/swfobject/expressInstall.swf b/js/swfobject/expressInstall.swf → _assets/js/swfobject/expressInstall.swf
diff --git a/js/swfobject/index.html → _assets/js/swfobject/index.html b/js/swfobject/index.html → _assets/js/swfobject/index.html
diff --git a/js/swfobject/index_dynamic.html → _assets/js/swfobject/index_dynamic.html b/js/swfobject/index_dynamic.html → _assets/js/swfobject/index_dynamic.html
diff --git a/js/swfobject/src/expressInstall.as → _assets/js/swfobject/src/expressInstall.as b/js/swfobject/src/expressInstall.as → _assets/js/swfobject/src/expressInstall.as
diff --git a/js/swfobject/src/expressInstall.fla → _assets/js/swfobject/src/expressInstall.fla b/js/swfobject/src/expressInstall.fla → _assets/js/swfobject/src/expressInstall.fla
diff --git a/js/swfobject/src/swfobject.js → _assets/js/swfobject/src/swfobject.js b/js/swfobject/src/swfobject.js → _assets/js/swfobject/src/swfobject.js
diff --git a/js/swfobject/swfobject.js → _assets/js/swfobject/swfobject.js b/js/swfobject/swfobject.js → _assets/js/swfobject/swfobject.js
diff --git a/js/swfobject/test.swf → _assets/js/swfobject/test.swf b/js/swfobject/test.swf → _assets/js/swfobject/test.swf
diff --git a/media/audio/audio-readme.txt → _assets/media/audio/audio-readme.txt b/media/audio/audio-readme.txt → _assets/media/audio/audio-readme.txt
diff --git a/media/img/2005q3DCAAnewsletter_Page_1.png → ...media/img/2005q3DCAAnewsletter_Page_1.png b/media/img/2005q3DCAAnewsletter_Page_1.png → ...media/img/2005q3DCAAnewsletter_Page_1.png
diff --git a/media/img/201101GCFANewsletter_Page_01.png → ...edia/img/201101GCFANewsletter_Page_01.png b/media/img/201101GCFANewsletter_Page_01.png → ...edia/img/201101GCFANewsletter_Page_01.png
diff --git a/media/img/DCAA_Logo.png → _assets/media/img/DCAA_Logo.png b/media/img/DCAA_Logo.png → _assets/media/img/DCAA_Logo.png
diff --git a/media/img/GCFA_Logo.png → _assets/media/img/GCFA_Logo.png b/media/img/GCFA_Logo.png → _assets/media/img/GCFA_Logo.png
diff --git a/media/img/Logo Large Scan.jpg → _assets/media/img/Logo Large Scan.jpg b/media/img/Logo Large Scan.jpg → _assets/media/img/Logo Large Scan.jpg
diff --git a/media/img/agrigento.jpg → _assets/media/img/agrigento.jpg b/media/img/agrigento.jpg → _assets/media/img/agrigento.jpg
diff --git a/media/img/img-readme.txt → _assets/media/img/img-readme.txt b/media/img/img-readme.txt → _assets/media/img/img-readme.txt
diff --git a/media/img/mount_etna.jpg → _assets/media/img/mount_etna.jpg b/media/img/mount_etna.jpg → _assets/media/img/mount_etna.jpg
diff --git a/media/media-readme.txt → _assets/media/media-readme.txt b/media/media-readme.txt → _assets/media/media-readme.txt
diff --git a/media/pdf/pdf-readme.txt → _assets/media/pdf/pdf-readme.txt b/media/pdf/pdf-readme.txt → _assets/media/pdf/pdf-readme.txt
diff --git a/media/swf/swf-readme.txt → _assets/media/swf/swf-readme.txt b/media/swf/swf-readme.txt → _assets/media/swf/swf-readme.txt
diff --git a/media/video/video-readme.txt → _assets/media/video/video-readme.txt b/media/video/video-readme.txt → _assets/media/video/video-readme.txt
diff --git a/css/css-readme.txt → _assets/sass/css-readme.txt b/css/css-readme.txt → _assets/sass/css-readme.txt
diff --git a/css/img/10px-baseline.png → _assets/sass/img/10px-baseline.png b/css/img/10px-baseline.png → _assets/sass/img/10px-baseline.png
diff --git a/css/img/1218-grid.png → _assets/sass/img/1218-grid.png b/css/img/1218-grid.png → _assets/sass/img/1218-grid.png
diff --git a/css/img/1248-grid.png → _assets/sass/img/1248-grid.png b/css/img/1248-grid.png → _assets/sass/img/1248-grid.png
diff --git a/css/img/12px-baseline.png → _assets/sass/img/12px-baseline.png b/css/img/12px-baseline.png → _assets/sass/img/12px-baseline.png
diff --git a/css/img/1378-grid.png → _assets/sass/img/1378-grid.png b/css/img/1378-grid.png → _assets/sass/img/1378-grid.png
diff --git a/css/img/14px-baseline.png → _assets/sass/img/14px-baseline.png b/css/img/14px-baseline.png → _assets/sass/img/14px-baseline.png
diff --git a/css/img/16px-baseline.png → _assets/sass/img/16px-baseline.png b/css/img/16px-baseline.png → _assets/sass/img/16px-baseline.png
diff --git a/css/img/18px-baseline.png → _assets/sass/img/18px-baseline.png b/css/img/18px-baseline.png → _assets/sass/img/18px-baseline.png
diff --git a/css/img/20px-baseline.png → _assets/sass/img/20px-baseline.png b/css/img/20px-baseline.png → _assets/sass/img/20px-baseline.png
diff --git a/css/img/22px-baseline.png → _assets/sass/img/22px-baseline.png b/css/img/22px-baseline.png → _assets/sass/img/22px-baseline.png
diff --git a/css/img/24px-baseline.png → _assets/sass/img/24px-baseline.png b/css/img/24px-baseline.png → _assets/sass/img/24px-baseline.png
diff --git a/css/img/300-grid.png → _assets/sass/img/300-grid.png b/css/img/300-grid.png → _assets/sass/img/300-grid.png
diff --git a/css/img/748-grid.png → _assets/sass/img/748-grid.png b/css/img/748-grid.png → _assets/sass/img/748-grid.png
diff --git a/css/img/978-grid.png → _assets/sass/img/978-grid.png b/css/img/978-grid.png → _assets/sass/img/978-grid.png
diff --git a/css/img/gfx-readme.txt → _assets/sass/img/gfx-readme.txt b/css/img/gfx-readme.txt → _assets/sass/img/gfx-readme.txt
diff --git a/css/print.css → _assets/sass/print.scss b/css/print.css → _assets/sass/print.scss
diff --git a/css/reset.css → _assets/sass/reset.scss b/css/reset.css → _assets/sass/reset.scss
diff --git a/css/screen-ie.css → _assets/sass/screen-ie.css b/css/screen-ie.css → _assets/sass/screen-ie.css