From 2b2ae4bfe79937ba1ee7143da92e5278abef7557 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Tue, 4 Aug 2015 15:56:05 -0700
Subject: [PATCH] Revert "adding flexbox to header via mixins (all prefixes)"

This reverts commit 5b229316ee4c661836ed1161139692a3e8527444.
---
 .../stylesheets/common/base/header.scss       |  9 ++---
 .../stylesheets/common/base/topic-post.scss   |  9 ++---
 app/assets/stylesheets/common/base/topic.scss |  6 +--
 .../common/components/badges.css.scss         |  6 +--
 .../stylesheets/common/foundation/mixins.scss | 37 -------------------
 5 files changed, 13 insertions(+), 54 deletions(-)

diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index 99c579f2786..ed398f4a06d 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -13,9 +13,10 @@
 
     .contents {
       margin: 8px 0;
+    }
 
-      @include flexbox();
-      @include align-items(center);
+    .title {
+      float: left;
     }
 
     .valign-helper {
@@ -33,10 +34,8 @@
     }
 
     .panel {
+      float: right;
       position: relative;
-      margin-left: auto;
-
-      @include 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 a45cac4c0b0..9727ed3adc2 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -261,9 +261,6 @@ table.md-table {
 }
 
 .small-action {
-  @include flexbox();
-  @include align-items(center);
-
   .topic-avatar {
     padding: 5px 0;
     border-top: none;
@@ -277,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;
@@ -290,7 +288,7 @@ table.md-table {
       font-weight: normal;
       font-size: 14px;
       p {
-        margin: 0;
+        margin: 5px 0;
       }
     }
 
@@ -301,6 +299,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 fc1fee069ed..18701110bc0 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -27,11 +27,11 @@
 }
 
 .extra-info-wrapper {
-  @include 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 fb683d8719f..8008d48b210 100644
--- a/app/assets/stylesheets/common/components/badges.css.scss
+++ b/app/assets/stylesheets/common/components/badges.css.scss
@@ -52,10 +52,8 @@
 
 
   &.bullet { //bullet category style
-    @include inline-flex();
-
-    @include align-items(baseline);
-
+    display: inline-flex;
+    align-items: baseline;
     margin-right: 10px;
 
     span.badge-category {
diff --git a/app/assets/stylesheets/common/foundation/mixins.scss b/app/assets/stylesheets/common/foundation/mixins.scss
index 9eb1a27ca23..60a682ac094 100644
--- a/app/assets/stylesheets/common/foundation/mixins.scss
+++ b/app/assets/stylesheets/common/foundation/mixins.scss
@@ -92,40 +92,3 @@
      -moz-user-select: none;
       -ms-user-select: none;
 }
-
-// ---------------------------------------------------
-
-//Flexbox
-
-@mixin flexbox() {
-  display: -webkit-box;
-  display: -moz-box;
-  display: -ms-flexbox;
-  display: -webkit-flex;
-  display: flex;
-}
-
-@mixin inline-flex() {
-  display: -webkit-inline-box;
-  display: -webkit-inline-flex;
-  display: -moz-inline-box;
-  display: -ms-inline-flexbox;
-  display: inline-flex;
-}
-
-
-@mixin align-items($alignment) {
-    -webkit-box-align: $alignment;
-    -webkit-align-items: $alignment;
-    -ms-flex-align: $alignment;  
-    -ms-align-items: $alignment;
-    align-items:$alignment;
-}
-
-@mixin order($val) {
-  -webkit-box-ordinal-group: $val;
-  -moz-box-ordinal-group: $val;
-  -ms-flex-order: $val;
-  -webkit-order: $val;
-  order: $val;
-}