From f98cd29f7b53a7c08f21792773a5b3b49d41eb9c Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Mon, 3 Oct 2016 12:51:53 -0700 Subject: [PATCH 1/1] convert css to scss --- .gitignore | 2 ++ _site/disabled.css | 0 b.rb | 4 ++-- build.rb | 4 ++++ _site/common.css => css/common.scss | 0 _site/gitweb-site.css => css/gitweb-site.scss | 0 _site/main.css => css/main.scss | 0 setup.sh | 4 ++-- 8 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 _site/disabled.css rename _site/common.css => css/common.scss (100%) rename _site/gitweb-site.css => css/gitweb-site.scss (100%) rename _site/main.css => css/main.scss (100%) diff --git a/.gitignore b/.gitignore index e29feb8..8fee304 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +/.sass-cache +/_site/css /_site/blog /_site/blog.html /_site/feed.xml diff --git a/_site/disabled.css b/_site/disabled.css deleted file mode 100644 index e69de29..0000000 diff --git a/b.rb b/b.rb index b5e2aa9..6cc14ec 100644 --- a/b.rb +++ b/b.rb @@ -75,8 +75,8 @@ EOF #{title} - - + + #{o[:head]} diff --git a/build.rb b/build.rb index 507bd4e..f724fe9 100755 --- a/build.rb +++ b/build.rb @@ -89,3 +89,7 @@ if File.exists? ('../resume.md') end stdpage('favorite-things', File.read('../favorite-things.html')) + +# we could use ruby native stuff here, but this was +# better documented so meh. +system("scss --cache-location ../.sass-cache --update ../css:css") diff --git a/_site/common.css b/css/common.scss similarity index 100% rename from _site/common.css rename to css/common.scss diff --git a/_site/gitweb-site.css b/css/gitweb-site.scss similarity index 100% rename from _site/gitweb-site.css rename to css/gitweb-site.scss diff --git a/_site/main.css b/css/main.scss similarity index 100% rename from _site/main.css rename to css/main.scss diff --git a/setup.sh b/setup.sh index 8eb53b4..ee2d487 100755 --- a/setup.sh +++ b/setup.sh @@ -72,8 +72,8 @@ our @extra_breadcrumbs = ( ); our \$home_link_str = 'git'; our \$site_footer = '$PWD/_site/gitweb-footer.html'; -push @stylesheets, "/gitweb-site.css"; -push @stylesheets, "/common.css"; +push @stylesheets, "/css/gitweb-site.css"; +push @stylesheets, "/css/common.css"; our \$favicon = '/assets/favicon.png'; # default is 25, cuts off descriptions. our \$projects_list_description_width = 40; -- 2.30.2