From f7dae0cdcb70ecb71c1d65f099e9d96b27a4548c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 25 Feb 2020 12:08:48 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/assets/stylesheets/pages/tree.scss | 6 ------ app/assets/stylesheets/utilities.scss | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index db1b8c559e5..81e910f91c2 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -17,12 +17,6 @@ .tree-controls { text-align: right; - > .btn, - .project-action-button > .btn, - .git-clone-holder > .btn { - margin-left: 8px; - } - .control { float: left; margin-left: 10px; diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss index 0fd6aafef0d..e27ec571531 100644 --- a/app/assets/stylesheets/utilities.scss +++ b/app/assets/stylesheets/utilities.scss @@ -45,6 +45,12 @@ .border-bottom-color-default { border-bottom-color: $border-color; } .box-shadow-default { box-shadow: 0 2px 4px 0 $black-transparent; } +.gl-children-ml-sm-3 > * { + @include media-breakpoint-up(sm) { + @include gl-ml-3; + } +} + .mh-50vh { max-height: 50vh; } .font-size-inherit { font-size: inherit; } -- cgit v1.2.1