diff options
| -rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 11 | ||||
| -rw-r--r-- | app/views/projects/commits/show.html.haml | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index c9ab9ba4761..b3f5deb59e7 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -22,9 +22,6 @@ } .row-content-block { - display: -webkit-box; - display: -ms-flexbox; - display: flex; margin-top: 0; margin-bottom: -$gl-padding; background-color: $gray-light; @@ -86,13 +83,10 @@ .block-controls { 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 { @@ -293,3 +287,8 @@ } } } + +.flex-container-block { + display: -webkit-box; + display: flex; +} diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml index ab9545bfb0e..d94f23f5a38 100644 --- a/app/views/projects/commits/show.html.haml +++ b/app/views/projects/commits/show.html.haml @@ -9,7 +9,7 @@ = render "head" %div{ class: container_class } - .row-content-block.second-block.content-component-block + .row-content-block.second-block.content-component-block.flex-container-block .tree-ref-holder = render 'shared/ref_switcher', destination: 'commits' |