diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss index b12f28f9a8a..ed398f4a06d 100644 --- a/app/assets/stylesheets/common/base/header.scss +++ b/app/assets/stylesheets/common/base/header.scss @@ -13,11 +13,6 @@ .contents { margin: 8px 0; - display: -ms-flexbox; - display: flex; - - -ms-flex-align: center; - align-items: center; } .title { @@ -39,11 +34,8 @@ } .panel { + float: right; position: relative; - margin-left: auto; - - -ms-flex-order: 3; - order: 3; } .login-button, button.sign-up-button { diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss index 4ef0c4dba0c..ec590ae39c6 100644 --- a/app/assets/stylesheets/common/base/topic-post.scss +++ b/app/assets/stylesheets/common/base/topic-post.scss @@ -261,12 +261,6 @@ table.md-table { } .small-action { - display: -ms-flexbox; - display: flex; - - -ms-flex-align: center; - align-items: center; - .topic-avatar { padding: 5px 0; border-top: none; @@ -280,7 +274,8 @@ table.md-table { } .small-action-desc { - padding: 0 1.5%; + padding: 0.5em 0 0.5em 4em; + margin-top: 5px; text-transform: uppercase; font-weight: bold; font-size: 0.9em; @@ -292,7 +287,7 @@ table.md-table { font-weight: normal; font-size: 14px; p { - margin: 0; + margin: 5px 0; } } @@ -303,6 +298,7 @@ table.md-table { > p { margin: 0; + padding-top: 4px; } } diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss index a0e036ed041..18701110bc0 100644 --- a/app/assets/stylesheets/common/base/topic.scss +++ b/app/assets/stylesheets/common/base/topic.scss @@ -27,12 +27,11 @@ } .extra-info-wrapper { - -ms-flex-order: 2; - order: 2; - - line-height: 1.5; .badge-wrapper { float: left; + &.bullet { + margin-top: 5px; + } } } diff --git a/app/assets/stylesheets/common/components/badges.css.scss b/app/assets/stylesheets/common/components/badges.css.scss index caa751af5e2..8008d48b210 100644 --- a/app/assets/stylesheets/common/components/badges.css.scss +++ b/app/assets/stylesheets/common/components/badges.css.scss @@ -52,12 +52,8 @@ &.bullet { //bullet category style - display: -ms-inline-flexbox; display: inline-flex; - - -ms-flex-align: center; align-items: baseline; - margin-right: 10px; span.badge-category { diff --git a/app/assets/stylesheets/desktop/header.scss b/app/assets/stylesheets/desktop/header.scss index 66fddf863cb..3caae9f485c 100644 --- a/app/assets/stylesheets/desktop/header.scss +++ b/app/assets/stylesheets/desktop/header.scss @@ -8,7 +8,7 @@ padding-top: 3px; height: 60px; .fa-home { - padding: 0 8px 0 0; + padding:8px; font-size: 2.1em; } } diff --git a/app/assets/stylesheets/mobile/header.scss b/app/assets/stylesheets/mobile/header.scss index e3dd106200f..08bb4dfb175 100644 --- a/app/assets/stylesheets/mobile/header.scss +++ b/app/assets/stylesheets/mobile/header.scss @@ -11,6 +11,7 @@ // some protection for text-only site titles .title { max-width: 130px; + height: 39px; overflow: hidden; padding: 0; text-overflow: clip;