Skip to content

G
gitlab-ce
Commit aa548f05 authored by Phil Hughes's avatar Phil Hughes
Browse files
Options

Resolved boards.scss conflict

parent afa7c81f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 9 deletions
app/assets/stylesheets/pages/boards.scss
View file @ aa548f05
...@@ -71,19 +71,13 @@ ...@@ -71,19 +71,13 @@
white-space: nowrap; white-space: nowrap;
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
<<<<<<< HEAD
height: 409px; // Needed for PhantomJS height: 409px; // Needed for PhantomJS
height: calc(100vh - 290px); height: calc(100vh - 290px);
min-height: 409px; min-height: 409px;
=======
height: 475px; // Needed for PhantomJS
height: calc(100vh - 220px);
min-height: 475px;
&.is-compact { &.is-compact {
width: calc(100% - 290px); width: calc(100% - 290px);
} }
>>>>>>> 144358e98ee1b25b61854a3471e21e100ace9db5
} }
} }
...@@ -291,7 +285,6 @@ ...@@ -291,7 +285,6 @@
} }
} }
<<<<<<< HEAD
.boards-title-holder { .boards-title-holder {
padding: 25px 13px $gl-padding; padding: 25px 13px $gl-padding;
...@@ -325,7 +318,8 @@ ...@@ -325,7 +318,8 @@
.board-delete-btns { .board-delete-btns {
padding-top: 12px; padding-top: 12px;
border-top: 1px solid $border-color; border-top: 1px solid $border-color;
======= }
.issue-boards-sidebar { .issue-boards-sidebar {
&.right-sidebar { &.right-sidebar {
top: 153px; top: 153px;
...@@ -369,5 +363,4 @@ ...@@ -369,5 +363,4 @@
font-weight: 600; font-weight: 600;
} }
} }
>>>>>>> 144358e98ee1b25b61854a3471e21e100ace9db5
} }
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