From 9d4f6268ec759fdd774d90efeb693932bdd52c20 Mon Sep 17 00:00:00 2001 From: Luke Barratt Date: Tue, 29 Apr 2014 21:20:02 +0100 Subject: [PATCH] Improving spacing for tabs and forums --- app/assets/stylesheets/components/_forms.scss | 1 + app/assets/stylesheets/components/_pagination.scss | 2 +- app/assets/stylesheets/components/_tabs.scss | 8 ++++++-- app/assets/stylesheets/layout/_sidebar.scss | 3 ++- app/assets/stylesheets/pages/_forums.scss | 1 + 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/components/_forms.scss b/app/assets/stylesheets/components/_forms.scss index d0baa6d..e86b20f 100644 --- a/app/assets/stylesheets/components/_forms.scss +++ b/app/assets/stylesheets/components/_forms.scss @@ -298,6 +298,7 @@ form.square { } form.search { + margin-bottom: 10px; .query { @include span-columns(7 of 9); diff --git a/app/assets/stylesheets/components/_pagination.scss b/app/assets/stylesheets/components/_pagination.scss index a485ae6..da205a7 100644 --- a/app/assets/stylesheets/components/_pagination.scss +++ b/app/assets/stylesheets/components/_pagination.scss @@ -4,5 +4,5 @@ .pagination { @include span-columns(12); - margin: 20px 0; + margin: 10px 0; } \ No newline at end of file diff --git a/app/assets/stylesheets/components/_tabs.scss b/app/assets/stylesheets/components/_tabs.scss index 1d67393..51b6041 100644 --- a/app/assets/stylesheets/components/_tabs.scss +++ b/app/assets/stylesheets/components/_tabs.scss @@ -4,7 +4,7 @@ .tabbed { $tabs-border-width: 1px; - $tabs-border-colour: lighten($light-blue, 40%); + $tabs-border-colour: $light-blue; $tabs-padding-horizontal: 16px; $tabs-height: 35px; @@ -21,6 +21,8 @@ display: block; a { + @include linear-gradient($blue, $dark-blue); + background-color: $blue; border: $tabs-border-width solid $tabs-border-colour; border-right: 0; padding: 0 $tabs-padding-horizontal; @@ -29,7 +31,6 @@ color: white; font-weight: 400; line-height: $tabs-height; - background-color: $blue; &:hover { cursor: pointer; @@ -49,6 +50,7 @@ z-index: 100; a { + @include linear-gradient($light-blue, $blue); background-color: $light-blue; } } @@ -59,6 +61,8 @@ @include span-columns(12); border: $tabs-border-width solid $tabs-border-colour; border-radius: 0 $base-border-radius $base-border-radius $base-border-radius; + background: lighten($light-gray, 10%); + box-shadow: $light-shadow; padding: 20px; } diff --git a/app/assets/stylesheets/layout/_sidebar.scss b/app/assets/stylesheets/layout/_sidebar.scss index 54aecec..949450a 100644 --- a/app/assets/stylesheets/layout/_sidebar.scss +++ b/app/assets/stylesheets/layout/_sidebar.scss @@ -38,7 +38,8 @@ .calendar { max-height: 400px; - overflow-x: scroll; + overflow-x: hidden; + overflow-y: scroll; } .shoutbox { diff --git a/app/assets/stylesheets/pages/_forums.scss b/app/assets/stylesheets/pages/_forums.scss index 1e3066f..494a10f 100644 --- a/app/assets/stylesheets/pages/_forums.scss +++ b/app/assets/stylesheets/pages/_forums.scss @@ -24,6 +24,7 @@ div#categories { table.category { table-layout: auto; + margin-bottom: 20px; } .bullet {