From 93985043326fbfe6783f3dda5ddd2d33921bd34a Mon Sep 17 00:00:00 2001 From: Kris Aubuchon Date: Sat, 12 Jul 2014 00:12:50 -0400 Subject: [PATCH 1/2] fixing appearance of horizontal scrollbar on topic list at about 996px wide --- app/assets/stylesheets/common/foundation/mixins.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/common/foundation/mixins.scss b/app/assets/stylesheets/common/foundation/mixins.scss index 11e47c82776..8fa2a8c6cb7 100644 --- a/app/assets/stylesheets/common/foundation/mixins.scss +++ b/app/assets/stylesheets/common/foundation/mixins.scss @@ -13,7 +13,7 @@ } @mixin medium-width { - @media screen and (min-width: 967px) and (max-width: 1139px) { + @media screen and (min-width: 1000px) and (max-width: 1139px) { @content; } } From 8da4046d79bfc3e3d5b572a2dcdcfca5207461ce Mon Sep 17 00:00:00 2001 From: Kris Aubuchon Date: Sat, 12 Jul 2014 00:36:01 -0400 Subject: [PATCH 2/2] minor alignment fixes on badge page w/description --- app/assets/stylesheets/common/base/user-badges.scss | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/common/base/user-badges.scss b/app/assets/stylesheets/common/base/user-badges.scss index 48ab3d85fd6..025327e8139 100644 --- a/app/assets/stylesheets/common/base/user-badges.scss +++ b/app/assets/stylesheets/common/base/user-badges.scss @@ -124,8 +124,10 @@ table.badges-listing { } .show-badge .user-badge-with-posts .badge-user { - width: 400px; - + width: 45%; + padding: 0 0 0 4%; + margin-bottom: 20px; + .badge-info { width: 100px; display: block; @@ -136,7 +138,6 @@ table.badges-listing { width: 250px; display: block; float: left; - margin-top: 67px; margin-left: 18px; text-align: left; }