Added padding in warning/success boxes\n\nThere's probably an easier way to do this than to migrate to scss but ¯\_(ツ)_/¯

dannguyen · dannguyen · commit 69e8a51086c6 · 2015-07-09T11:14:18.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .DS_Store
 _site
 .ruby-version
+.sass-cache/
diff --git a/_config.yml b/_config.yml
@@ -21,3 +21,6 @@ relative_permalinks: false
 
 gems:
   - jekyll-redirect-from
+
+sass:
+    sass_dir: assets/_sass
diff --git a/_includes/header.html b/_includes/header.html
@@ -12,8 +12,7 @@
   <title>{{ page.title }} - {{ site.title }}</title>
 
   <link rel="shortcut icon" href="/favicon.ico"/>
-  <link rel="stylesheet" href="/proxy/https/github.com/assets/css/bootstrap.css">
-  <link rel="stylesheet" href="/proxy/https/github.com/assets/css/site.css">
+  <link rel="stylesheet" href="{{ "/proxy/https/github.com/assets/css/main.css" | prepend: site.baseurl }}">
 
   <link rel="canonical" href="{{ site.url }}{{ page.url }}" />
 
@@ -71,4 +70,4 @@
         </ul>
       </div><!--/.nav-collapse -->
     </div>
-  </div>
+  </div>
diff --git a/assets/_sass/bootstrap.scss b/assets/_sass/bootstrap.scss
diff --git a/assets/_sass/boxes.scss b/assets/_sass/boxes.scss
@@ -0,0 +1,10 @@
+.bgbox{
+  padding: 19px; /* same as bootstrap's .well */
+  &.success{
+    @extend .bg-success;
+  }
+  &.warning{
+    @extend .bg-warning;
+    @extend .text-danger;
+  }
+}
diff --git a/assets/_sass/site.scss b/assets/_sass/site.scss
diff --git a/assets/css/main.scss b/assets/css/main.scss
@@ -0,0 +1,6 @@
+---
+# Only the main Sass file needs front matter (the dashes are enough)
+---
+@charset "utf-8";
+
+@import "bootstrap", "site", "boxes";
diff --git a/schema.md b/schema.md
@@ -12,7 +12,7 @@ id: schema
   
   
   
-{: .bg-warning .text-danger}
+{: .bgbox.warning}
 ***IMPORTANT NOTE***  
 This version of the schema has been deprecated in favor of the [Project Open Data Metadata Schema v1.1](/v1.1/schema). Federal CFO-Act agencies are expected to complete the transition to the v1.1 schema by **February 1st, 2015**.   
     
diff --git a/v1.1/schema.md b/v1.1/schema.md
@@ -8,7 +8,7 @@ id: schema v1.1
 ---
 
 
-{: .bg-success}
+{: .bgbox.success}
 ***New Schema***  
 This version of the schema replaces [Project Open Data Metadata Schema v1.0](/schema). Federal CFO-Act agencies are expected to complete the transition to the v1.1 schema by **February 1st, 2015**. <br> <br> To see changes from v1.0 to v1.1 see the [Version 1.1 Update](/catalog/#version-11-update) especially the field mappings in [Metadata Resources](/v1.1/metadata-resources/#field-mappings) and the [Metadata Changelog](/metadata-changelog/)
 

-Original file line number
+Diff line change
   <title>{{ page.title }} - {{ site.title }}</title>
   <link rel="shortcut icon" href="/favicon.ico"/>
 -  <link rel="stylesheet" href="/assets/css/bootstrap.css">
 -  <link rel="stylesheet" href="/assets/css/site.css">
 +  <link rel="stylesheet" href="{{ "/assets/css/main.css" | prepend: site.baseurl }}">
   <link rel="canonical" href="{{ site.url }}{{ page.url }}" />
         </ul>
       </div><!--/.nav-collapse -->
     </div>
 -  </div>
 +  </div>