3 files changed, 47 insertions, 34 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
new file mode 100644
index 00000000..243760ac
--- /dev/null
+++ b/app/assets/stylesheets/application.scss
@@ -0,0 +1,46 @@
+//
+// This is a manifest file that'll be compiled into application.css, which will include all the files
+// listed below.
+//
+// Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's
+// vendor/assets/stylesheets directory can be referenced here using a relative path.
+//
+// You're free to add application-wide styles to this file and they'll appear at the bottom of the
+// compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+// files in this directory. Styles in this file should be added after the last require_* statement.
+// It is generally better to create a new file per style scope.
+//
+//= require normalize
+
+@import 'mixins';
+@import 'variables';
+@import 'layout';
+@import 'typography';
+@import 'downloads';
+@import 'search';
+@import 'front-page';
+@import 'sidebar';
+@import 'reference';
+@import 'forms';
+@import 'man-pages';
+@import 'book';
+@import 'book2';
+@import 'lists';
+
+code {
+  display: inline;
+  padding: 0 5px;
+}
+
+pre {
+  background-color: #fff;
+  border: solid 1px #efeee6;
+  border-radius: 3px;
+  color: $orange;
+  display: block;
+  font-family: $fixed-width-font-family;
+  line-height: 18px;
+  margin-bottom: 1em;
+  overflow: auto;
+  padding: 10px 15px 13px;
+}
diff --git a/app/assets/stylesheets/git-scm.scss b/app/assets/stylesheets/git-scm.scss
deleted file mode 100644
index cfde7762..00000000
--- a/app/assets/stylesheets/git-scm.scss
+++ /dev/null
@@ -1,33 +0,0 @@
-@import "normalize";
-@import "mixins";
-@import "variables";
-@import "layout";
-@import "typography";
-@import "downloads";
-@import "search";
-@import "front-page";
-@import "sidebar";
-@import "reference";
-@import "forms";
-@import "man-pages";
-@import "book";
-@import "book2";
-@import "lists";
-
-code {
-  display: inline;
-  padding: 0 5px;
-}
-
-pre {
-  display: block;
-  padding: 10px 15px 13px;
-  margin-bottom: 1em;
-  overflow: auto;
-  font-family: $fixed-width-font-family;
-  line-height: 18px;
-  color: #f14e32;
-  background-color: #fff;
-  border: solid 1px #efeee6;
-  border-radius: 3px;
-}
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 8daa782a..8c6fb595 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -19,7 +19,7 @@
 
   <link href='/favicon.ico' rel='shortcut icon' type='image/x-icon'>
 
-  <%= stylesheet_link_tag "git-scm.css" %>
+  <%= stylesheet_link_tag "application" %>
   <%= javascript_include_tag "modernize" %>
   <!--[if (gte IE 6)&(lte IE 8)]>
   <%= javascript_include_tag "/javascripts/selectivizr-min.js" %>