Skip to content
代码片段 群组 项目
提交 7ccd8915 编辑于 作者: Justin Ho Tuan Duong's avatar Justin Ho Tuan Duong
浏览文件

Merge branch 'btn-sm-side-margin-variable' into 'master'

Remove btn-sm-side-margin misc variable in favor of gitlab ui

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126592



Merged-by: default avatarJustin Ho Tuan Duong <hduong@gitlab.com>
Approved-by: default avatarJustin Ho Tuan Duong <hduong@gitlab.com>
Approved-by: default avatarTomas Bulva <tbulva@gitlab.com>
Reviewed-by: default avatarJustin Ho Tuan Duong <hduong@gitlab.com>
Co-authored-by: default avatarTaurie Davis <taurie@gitlab.com>
No related branches found
No related tags found
无相关合并请求
...@@ -126,16 +126,12 @@ ...@@ -126,16 +126,12 @@
} }
@mixin btn-with-margin { @mixin btn-with-margin {
margin-left: $btn-side-margin; @include gl-ml-3;
float: left; float: left;
&.inline { &.inline {
float: none; float: none;
} }
&.btn-sm {
margin-left: $btn-sm-side-margin;
}
} }
@mixin btn-svg { @mixin btn-svg {
......
...@@ -473,7 +473,6 @@ $border-radius-large: 8px; ...@@ -473,7 +473,6 @@ $border-radius-large: 8px;
$default-icon-size: 16px; $default-icon-size: 16px;
$layout-link-gray: #7e7c7c; $layout-link-gray: #7e7c7c;
$btn-side-margin: $grid-size; $btn-side-margin: $grid-size;
$btn-sm-side-margin: 7px;
$count-arrow-border: #dce0e5; $count-arrow-border: #dce0e5;
$general-hover-transition-duration: 100ms; $general-hover-transition-duration: 100ms;
$general-hover-transition-curve: linear; $general-hover-transition-curve: linear;
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册