opdavies/oliverdavies.uk-old-sculpin
Archived
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
Oliver Davies 2015-07-15 23:17:44 +01:00
parent 8ba348d7ca 28d5e36260
commit 2e09622de6
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/config/sculpin_site.yml
View file

@ -37,8 +37,6 @@ apple_touch_icon_sizes: [ 57, 114, 72, 144, 60, 120, 76, 152 ]
favicon_sizes: [ 160, 96, 32, 16 ] favicon_sizes: [ 160, 96, 32, 16 ]
main_menu: main_menu:
- title: About
href: /
- title: Services - title: Services
href: /services/ href: /services/
- title: Testimonials - title: Testimonials

2
source/assets/css/styles.css
View file

File diff suppressed because one or more lines are too long

2
source/assets/sass/components/_navbar.scss
View file

@ -1,4 +1,4 @@
@each $page in about, work, services, testimonials, talks, blog, contact { @each $page in services, testimonials, talks, blog, contact {
.page--#{$page} .nav__#{$page} { .page--#{$page} .nav__#{$page} {
@extend .active; @extend .active;
} }