Skip to content

G
gitlab-ce
Commit c590ac01 authored by Jose's avatar Jose
Browse files
Options

Solve mardown and merge_requests stylesheets conflicts

parent ccc00c39
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
app/assets/stylesheets/framework/markdown_area.scss
View file @ c590ac01
...@@ -61,13 +61,10 @@ ...@@ -61,13 +61,10 @@
padding-top: 0; padding-top: 0;
line-height: 19px; line-height: 19px;
<<<<<<< HEAD
&.btn.btn-sm { &.btn.btn-sm {
padding: 2px 5px; padding: 2px 5px;
} }
=======
>>>>>>> upstream/master
&:focus { &:focus {
margin-top: -10px; margin-top: -10px;
padding-top: 10px; padding-top: 10px;
......
app/assets/stylesheets/pages/merge_requests.scss
View file @ c590ac01
...@@ -51,15 +51,12 @@ ...@@ -51,15 +51,12 @@
opacity: 0.3; opacity: 0.3;
} }
<<<<<<< HEAD
&.btn-sm { &.btn-sm {
line-height: 1; line-height: 1;
padding: 5px 10px; padding: 5px 10px;
margin-top: 1px; margin-top: 1px;
} }
=======
>>>>>>> upstream/master
&.dropdown-toggle { &.dropdown-toggle {
.fa { .fa {
color: inherit; color: inherit;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7