From 4f567e839f47b86e93c16133941c47b79336e38e Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Mon, 9 Feb 2015 22:00:17 +0100 Subject: [PATCH] Merge --- app/views/layouts/_topbar.slim | 2 +- app/views/packages/details.slim | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/_topbar.slim b/app/views/layouts/_topbar.slim index fc1de9e..1d67f4f 100644 --- a/app/views/layouts/_topbar.slim +++ b/app/views/layouts/_topbar.slim @@ -19,7 +19,7 @@ header ul.right li class=('active' if controller_name=='welcome') a href="/" Home - li class=('active' if controller_name=='package') + li class=('active' if controller_name=='packages') a href="/packages" Explore li class=('active' if controller_name=='upload') a href="/upload" Contribute diff --git a/app/views/packages/details.slim b/app/views/packages/details.slim index 4d9219c..cb0bf09 100644 --- a/app/views/packages/details.slim +++ b/app/views/packages/details.slim @@ -9,7 +9,7 @@ .small-12.columns h1 =@package.name - .small-12.medium-8.columns + .small-7.medium-7.columns p.subtitle = @package.description ul.small-block-grid-1.medium-block-grid-2.large-block-grid-2 @@ -35,7 +35,7 @@ // TODO: Enable comments in a later version // = partial '/package/comments' - .small-12.medium-4.columns + .small-5.medium-5.columns .bigpanel // Use action long description p