iankelling.org / git / iankelling.org / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 842a5c8)
convert css to scss
authorIan Kelling <ian@iankelling.org>
Mon, 3 Oct 2016 19:51:53 +0000 (12:51 -0700)
committerIan Kelling <ian@iankelling.org>
Mon, 3 Oct 2016 20:01:36 +0000 (13:01 -0700)
.gitignore patch | blob | history
_site/disabled.css [deleted file] patch | blob | history
b.rb patch | blob | history
build.rb patch | blob | history
css/common.scss [moved from _site/common.css with 100% similarity] patch | blob | history
css/gitweb-site.scss [moved from _site/gitweb-site.css with 100% similarity] patch | blob | history
css/main.scss [moved from _site/main.css with 100% similarity] patch | blob | history
setup.sh patch | blob | history

diff --git a/.gitignore b/.gitignore
index e29feb8e0e059b71e6126e9c4348654bb89b7837..8fee30467ad45656a38cc760f1b57d5d98f9cd8d 100644 (file)
--- 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 (file)
index e69de29..0000000
diff --git a/b.rb b/b.rb
index b5e2aa91bb94782a20a18316717492f4d92cc626..6cc14ec2131a942b335793b67487dcda83febfff 100644 (file)
--- a/b.rb
+++ b/b.rb
@@ -75,8 +75,8 @@ EOF
   <head>
     <meta charset="utf-8">
     <title>#{title}</title>
-    <link rel="stylesheet" href="/main.css">
-    <link rel="stylesheet" href="/common.css">
+    <link rel="stylesheet" href="/css/main.css">
+    <link rel="stylesheet" href="/css/common.css">
     <link rel="shortcut icon" href="/assets/favicon.png" />
     <meta name="description" content="#{o[:description] || DESCRIPTION}">
 #{o[:head]}
diff --git a/build.rb b/build.rb
index 507bd4e50fc2351182ac12bad7680f67b4391af6..f724fe92ca4e28a343ab2efb3a60c4788e0b21ef 100755 (executable)
--- 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 8eb53b43213df9d849cc92b9bebfcda502c20982..ee2d48754a4eba4731ee87ec793dc84f2de300d4 100755 (executable)
--- 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;
Content and automated setup of iankelling.org