31 Add more content view helpers

- Toolbar yield content was added - Font-family was added to global variables
frralf · Sep 11, 2013 · b6f0f0f · b6f0f0f
1 parent 4fc953c
commit b6f0f0f
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 19 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/thomas-mcdonald/bootstrap-sass.git
-  revision: 79e7f27bcd70aa56682a8460c0bd6871bb6da172
+  revision: 0e88056ac5d58fb0bbd23d3fe929eac01712d964
   branch: 3
   specs:
     bootstrap-sass (3.0.0.0)

diff --git a/source/assets/stylesheets/_variables.css.sass b/source/assets/stylesheets/_variables.css.sass
@@ -5,6 +5,8 @@ $base-color: $turquoise
 $base-dark-color: $midnight-blue
 $base-dark-color-alternative: $wet-asphalt
 
+$base-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif
+
 $brand-font-size: 1.8em
 
 $body-bg-primary: $silver

diff --git a/source/assets/stylesheets/application.css.sass b/source/assets/stylesheets/application.css.sass
@@ -4,6 +4,9 @@
 @import 'bootstrap'
 @import 'bootstrap_overrides'
 
+body
+  font-family: $base-font-family
+
 body.login
   color: $base-dark-color
   background-color: $body-bg-primary

diff --git a/source/dashboard.html.haml b/source/dashboard.html.haml
@@ -1,5 +1,21 @@
 - page 'Dashboard', 'dashboard'
 
+- content_for :toolbar do
+  .btn-group
+    %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Building'}
+      %i.icon-building
+    %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Laptop'}
+      %i.icon-laptop
+    %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Calendar'}
+      %i.icon-calendar
+      %span.badge 3
+    %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Lemon'}
+      %i.icon-lemon
+  .label.label-danger
+    Danger
+  .label.label-info
+    Info
+
 .panel
   .panel-heading
     %i.icon-beer.icon-large
@@ -14,10 +30,10 @@
   .panel-body
     .page-header
       %h4 System usage
-      .progress
-        .progress-bar.progress-bar-success{style: 'width: 35%'}
-        .progress-bar.progress-bar-warning{style: 'width: 20%'}
-        .progress-bar.progress-bar-danger{style: 'width: 10%'}
+    .progress
+      .progress-bar.progress-bar-success{style: 'width: 35%'}
+      .progress-bar.progress-bar-warning{style: 'width: 20%'}
+      .progress-bar.progress-bar-danger{style: 'width: 10%'}
     .page-header
       %h4 User statics
     .row.text-center

diff --git a/source/partials/_toolbar.haml b/source/partials/_toolbar.haml
@@ -1,15 +1,2 @@
 #toolbar
-  .btn-group
-    %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Building'}
-      %i.icon-building
-    %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Laptop'}
-      %i.icon-laptop
-    %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Calendar'}
-      %i.icon-calendar
-      %span.badge 3
-    %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Lemon'}
-      %i.icon-lemon
-  .label.label-danger
-    Danger
-  .label.label-info
-    Info
+  =yield_content :toolbar
diff --git a/source/tables.html.haml b/source/tables.html.haml
@@ -1,5 +1,17 @@
 - page 'Tables', 'tables'
 
+- content_for :toolbar do
+  .btn-group
+    %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Building'}
+      %i.icon-building
+    %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Laptop'}
+      %i.icon-laptop
+    %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Calendar'}
+      %i.icon-calendar
+      %span.badge 3
+    %a.btn{href: '#', data: {toggle: 'toolbar-tooltip'}, title: 'Lemon'}
+      %i.icon-lemon
+
 .panel.tables
   .panel-heading
     %i.icon-table.icon-large