Merge branch 'develop'

2015-07-15 23:17:44 +01:00 · 2015-07-15 23:17:44 +01:00 · 2e09622de6
parent 8ba348d7ca 28d5e36260
commit 2e09622de6
3 changed files with 5 additions and 7 deletions
--- a/app/config/sculpin_site.yml
+++ b/app/config/sculpin_site.yml
@ -37,8 +37,6 @@ apple_touch_icon_sizes: [ 57, 114, 72, 144, 60, 120, 76, 152 ]
 favicon_sizes: [ 160, 96, 32, 16 ]

 main_menu:
-  - title: About
-    href: /
  - title: Services
    href: /services/
  - title: Testimonials
--- a/source/assets/css/styles.css
+++ b/source/assets/css/styles.css
--- a/source/assets/sass/components/_navbar.scss
+++ b/source/assets/sass/components/_navbar.scss
@ -1,5 +1,5 @@
-@each $page in about, work, services, testimonials, talks, blog, contact {
-  .page--#{$page} .nav__#{$page} {
-    @extend .active;
-  }
+@each $page in services, testimonials, talks, blog, contact {
+    .page--#{$page} .nav__#{$page} {
+        @extend .active;
+    }
 }