summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Harris <harrisryan1@gmail.com>2017-01-09 21:08:45 -0500
committerRyan Harris <harrisryan1@gmail.com>2017-01-24 15:16:36 -0500
commit029460e25888b3b6241ff0303dbf49f1de9e5f6f (patch)
tree5be83347b18cf4dcb1a3612f3cdeb19d3eb42307
parent336d7a79920bd2ebb5b6b2cadd273be1620f9201 (diff)
downloadgitlab-ce-029460e25888b3b6241ff0303dbf49f1de9e5f6f.tar.gz
Change the row-content-block menu on the commits page to a flexbox container
-rw-r--r--app/assets/stylesheets/framework/blocks.scss14
1 files 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;