From eb71560d7fae019f2a35279038c9c83924379764 Mon Sep 17 00:00:00 2001 From: Simon Cossar Date: Sun, 14 Jun 2015 00:22:23 -0700 Subject: [PATCH 1/2] Add gemfile --- Gemfile.lock | 3 --- 1 file changed, 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c93cc92661e..1513d4324b4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -484,6 +484,3 @@ DEPENDENCIES uglifier unf unicorn - -BUNDLED WITH - 1.10.3 From d396e4eeedfd898f5136160dff16936c3f67ad17 Mon Sep 17 00:00:00 2001 From: Simon Cossar Date: Mon, 15 Jun 2015 15:24:08 -0700 Subject: [PATCH 2/2] set inline category-badge to display inline --- Gemfile.lock | 3 +++ app/assets/stylesheets/common/base/topic.scss | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index 4b2f5efd72d..75d65a9bb85 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -484,3 +484,6 @@ DEPENDENCIES uglifier unf unicorn + +BUNDLED WITH + 1.10.3 diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss index 17956cc16d0..af7f87704a0 100644 --- a/app/assets/stylesheets/common/base/topic.scss +++ b/app/assets/stylesheets/common/base/topic.scss @@ -43,3 +43,22 @@ float: right; } } + +// Target the .badge-category text, the bullet icon needs to maintain `display: block` +#suggested-topics h3 .badge-wrapper.bullet span.badge-category, +#suggested-topics h3 .badge-wrapper.box span, +#suggested-topics h3 .badge-wrapper.bar span { + display: inline; +} + +#suggested-topics h3 .badge-wrapper.bullet span.badge-category, { + // Override vertical-align: text-top from `badges.css.scss` + vertical-align: baseline; +} + +#suggested-topics h3 .badge-wrapper.bullet, +#suggested-topics h3 .badge-wrapper.bullet span.badge-category-parent-bg, +#suggested-topics h3 .badge-wrapper.bullet span.badge-category-bg { + // Top of bullet aligns with top of line - adjust line height to vertically align bullet. + line-height: 0.8; +}