From 029460e25888b3b6241ff0303dbf49f1de9e5f6f Mon Sep 17 00:00:00 2001
From: Ryan Harris <harrisryan1@gmail.com>
Date: Mon, 9 Jan 2017 21:08:45 -0500
Subject: [PATCH] Change the row-content-block menu on the commits page to a
 flexbox container

---
 app/assets/stylesheets/framework/blocks.scss | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index a74a73d7954..c9ab9ba4761 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -22,6 +22,9 @@
 }
 
 .row-content-block {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
   margin-top: 0;
   margin-bottom: -$gl-padding;
   background-color: $gray-light;
@@ -82,8 +85,15 @@
   }
 
   .block-controls {
-    float: right;
-    margin-top: -36px;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-pack: end;
+    -ms-flex-pack: end;
+    justify-content: flex-end;
+    -webkit-box-flex: 1;
+    -ms-flex: 1;
+    flex: 1;
 
     .control {
       float: left;