diff --git a/README.md b/README.md index 7db80e4..839fa0b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # README +[![Build Status](https://travis-ci.com/dlage/ss-calculator.svg?branch=master)](https://travis-ci.com/dlage/ss-calculator) + This README would normally document whatever steps are necessary to get the application up and running. diff --git a/app/javascript/stylesheets/application.scss b/app/javascript/stylesheets/application.scss index 7f834ef..7975214 100644 --- a/app/javascript/stylesheets/application.scss +++ b/app/javascript/stylesheets/application.scss @@ -1,9 +1,25 @@ @import 'toastr'; -body { - height: 100%; - padding-top: 5rem; -} #toast-container { padding-top: 5rem; +} +.footer { + background-color: #f5f5f5; +} + +main > .container { + padding: 60px 15px 0; +} + +.footer { + background-color: #f5f5f5; +} + +.footer > .container { + padding-right: 15px; + padding-left: 15px; +} + +code { + font-size: 80%; } \ No newline at end of file diff --git a/app/views/layouts/_content.html.erb b/app/views/layouts/_content.html.erb index 63df87f..94db2a8 100644 --- a/app/views/layouts/_content.html.erb +++ b/app/views/layouts/_content.html.erb @@ -1,5 +1,5 @@ -
-
+
+
<%= yield %>
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index e69de29..5856fee 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -0,0 +1,5 @@ +
+
+ Place sticky footer content here. +
+
diff --git a/app/views/layouts/_top_navigation.html.erb b/app/views/layouts/_top_navigation.html.erb index b22f1c2..6788fbe 100644 --- a/app/views/layouts/_top_navigation.html.erb +++ b/app/views/layouts/_top_navigation.html.erb @@ -1,10 +1,11 @@ -