From: Ian Kelling <ian@iankelling.org>
Date: Mon, 3 Oct 2016 20:04:39 +0000 (-0700)
Subject: build common css into single css file
X-Git-Url: https://iankelling.org/git/?p=iankelling.org;a=commitdiff_plain;h=512e27c6bf1c40085f9fcc4c9769ef5b8ba6f4f9;ds=sidebyside

build common css into single css file
---

diff --git a/b.rb b/b.rb
index 6cc14ec..4611b5d 100644
--- a/b.rb
+++ b/b.rb
@@ -76,7 +76,6 @@ EOF
     <meta charset="utf-8">
     <title>#{title}</title>
     <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/css/gitweb-site.scss b/css/gitweb-site.scss
index 54bb033..11b81e2 100644
--- a/css/gitweb-site.scss
+++ b/css/gitweb-site.scss
@@ -1,3 +1,4 @@
+@import 'common';
 
 .main-content-stripe {
     /* i don't like bright white. copy a gitweb color */
diff --git a/css/main.scss b/css/main.scss
index 42eb841..375f7ec 100644
--- a/css/main.scss
+++ b/css/main.scss
@@ -1,3 +1,5 @@
+@import 'common';
+
 #cc-by-sa {
     /* It sits too high by default. */
     vertical-align: middle;
diff --git a/setup.sh b/setup.sh
index ee2d487..94dffe2 100755
--- a/setup.sh
+++ b/setup.sh
@@ -73,7 +73,6 @@ our @extra_breadcrumbs = (
 our \$home_link_str = 'git';
 our \$site_footer = '$PWD/_site/gitweb-footer.html';
 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;