Commit 132a51ee authored by Simon Knox's avatar Simon Knox

fix some style and padding issues

parent 514a5b25
...@@ -68,14 +68,14 @@ const Api = { ...@@ -68,14 +68,14 @@ const Api = {
}, },
newLabel(namespacePath, projectPath, data, callback) { newLabel(namespacePath, projectPath, data, callback) {
var url = "" let url;
if (projectPath) { if (projectPath) {
url = Api.buildUrl(Api.projectLabelsPath) url = Api.buildUrl(Api.projectLabelsPath)
.replace(':namespace_path', namespacePath) .replace(':namespace_path', namespacePath)
.replace(':project_path', projectPath); .replace(':project_path', projectPath);
} else { } else {
url = Api.buildUrl(Api.groupLabelsPath).replace(':namespace_path', namespacePath) url = Api.buildUrl(Api.groupLabelsPath).replace(':namespace_path', namespacePath);
} }
return $.ajax({ return $.ajax({
......
...@@ -171,7 +171,7 @@ export default { ...@@ -171,7 +171,7 @@ export default {
</div> </div>
<transition name="slide-down"> <transition name="slide-down">
<board-new-issue <board-new-issue
:groupId="groupId" :group-id="groupId"
:list="list" :list="list"
v-if="list.type !== 'closed' && showIssueForm"/> v-if="list.type !== 'closed' && showIssueForm"/>
</transition> </transition>
......
/* global ListIssue */ /* global ListIssue */
import eventHub from '../eventhub'; import eventHub from '../eventhub';
import loadingIcon from '../../vue_shared/components/loading_icon.vue';
import Api from '../../api'; import Api from '../../api';
const Store = gl.issueBoards.BoardsStore; const Store = gl.issueBoards.BoardsStore;
...@@ -25,6 +26,14 @@ export default { ...@@ -25,6 +26,14 @@ export default {
error: false, error: false,
}; };
}, },
components: {
loadingIcon,
},
computed: {
selectedProjectName() {
return this.selectedProject.name || 'Select a project';
},
},
methods: { methods: {
loadProjects() { loadProjects() {
this.loading = true; this.loading = true;
...@@ -126,10 +135,11 @@ export default { ...@@ -126,10 +135,11 @@ export default {
type="button" type="button"
data-toggle="dropdown" data-toggle="dropdown"
aria-expanded="false"> aria-expanded="false">
{{ selectedProject.name || 'Select a project' }} {{ selectedProjectName }}
<i class="fa fa-chevron-down"></i> <i class="fa fa-chevron-down" aria-hidden="true"></i>
</button> </button>
<div class="dropdown-menu dropdown-menu-selectable wide"> <div class="dropdown-menu dropdown-menu-selectable dropdown-menu-full-width">
<loading-icon v-if="loading" />
<ul> <ul>
<li v-for="project in projects"> <li v-for="project in projects">
<a <a
......
...@@ -10,7 +10,6 @@ import eventHub from '../../sidebar/event_hub'; ...@@ -10,7 +10,6 @@ import eventHub from '../../sidebar/event_hub';
import AssigneeTitle from '../../sidebar/components/assignees/assignee_title'; import AssigneeTitle from '../../sidebar/components/assignees/assignee_title';
import Assignees from '../../sidebar/components/assignees/assignees'; import Assignees from '../../sidebar/components/assignees/assignees';
import './sidebar/remove_issue'; import './sidebar/remove_issue';
import UsersSelect from '../../users_select';
const Store = gl.issueBoards.BoardsStore; const Store = gl.issueBoards.BoardsStore;
......
...@@ -146,13 +146,12 @@ ...@@ -146,13 +146,12 @@
} }
.board-title { .board-title {
position: initial;
padding: 0; padding: 0;
border-bottom: 0; border-bottom: 0;
> span { > span {
display: block; display: block;
transform: rotate(90deg) translate(25px, 0); transform: rotate(90deg) translate(35px, 10px);
} }
} }
...@@ -180,21 +179,18 @@ ...@@ -180,21 +179,18 @@
} }
.board-header { .board-header {
border-top-left-radius: $border-radius-default; position: relative;
border-top-right-radius: $border-radius-default;
&.has-border { &.has-border::before {
border-top: 3px solid; border-top: 3px solid;
margin-top: -1px; border-color: inherit;
margin-right: -1px; border-top-left-radius: $border-radius-default;
margin-left: -1px; border-top-right-radius: $border-radius-default;
padding-top: 1px; content: '';
padding-right: 1px; position: absolute;
padding-left: 1px; width: calc(100% + 2px);
top: -1px;
.board-title { left: -1px;
padding-top: ($gl-padding - 3px);
}
} }
} }
...@@ -204,9 +200,8 @@ ...@@ -204,9 +200,8 @@
} }
.board-title { .board-title {
position: relative;
margin: 0; margin: 0;
padding: $gl-padding; padding: 12px $gl-padding;
font-size: 1em; font-size: 1em;
border-bottom: 1px solid $border-color; border-bottom: 1px solid $border-color;
display: flex; display: flex;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
%board-delete{ "inline-template" => true, %board-delete{ "inline-template" => true,
":list" => "list", ":list" => "list",
"v-if" => "!list.preset && list.id" } "v-if" => "!list.preset && list.id" }
%button.board-delete.has-tooltip.btn.btn-transparent.link-highlight{ type: "button", title: "Delete list", "aria-label" => "Delete list", data: { placement: "bottom" }, "@click.stop" => "deleteBoard" } %button.board-delete.has-tooltip.append-right-10{ type: "button", title: "Delete list", "aria-label" => "Delete list", data: { placement: "bottom" }, "@click.stop" => "deleteBoard" }
= icon("trash") = icon("trash")
.issue-count-badge.clearfix{ "v-if" => 'list.type !== "blank"' } .issue-count-badge.clearfix{ "v-if" => 'list.type !== "blank"' }
%span.issue-count-badge-count.pull-left{ ":class" => '{ "has-btn": list.type !== "closed" && !disabled }' } %span.issue-count-badge-count.pull-left{ ":class" => '{ "has-btn": list.type !== "closed" && !disabled }' }
......
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