build common css into single css file

diff --git a/b.rb b/b.rb
index 6cc14ec2131a942b335793b67487dcda83febfff..4611b5d7fe9cc237c98341c2b8765acae5fdeddb 100644 (file)
--- 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 54bb033f4f3c5f676c7a5106d9fed8ccd786ec81..11b81e287608685453f81102b871d48eb5dcce5a 100644 (file)
--- 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 42eb84199af6148c8654a2324344d21f79738cae..375f7ec6f3263d60a8fae322da0fe3fa9b3d173d 100644 (file)
--- 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 ee2d48754a4eba4731ee87ec793dc84f2de300d4..94dffe29c1f62aa8d04ec3f36c978bcd706a85bd 100755 (executable)
--- 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;