Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-05-19 08:46:09 +0300
committerAlfredo Sumaran <alfredo@gitlab.com>2016-06-06 19:59:49 +0300
commit25ee66e88cc6a3a32dea9a38157b3ee5709c5f9e (patch)
treefd00b68cffad6f4952049d75d8c4d65cb9c8761f /app/views/projects/labels
parent499bb9f305e78d0e3488c2eee6328ce76af39920 (diff)
Sorting improvements and styling
Diffstat (limited to 'app/views/projects/labels')
-rw-r--r--app/views/projects/labels/_label.html.haml7
-rw-r--r--app/views/projects/labels/index.html.haml2
2 files changed, 1 insertions, 8 deletions
diff --git a/app/views/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml
index a22dee1a626..a637d64267c 100644
--- a/app/views/projects/labels/_label.html.haml
+++ b/app/views/projects/labels/_label.html.haml
@@ -1,12 +1,5 @@
- label_css_id = dom_id(label)
%li{id: label_css_id, :"data-id" => label.id}
- %a.js-toggle-priority{:href => "#",
- :"data-url" => remove_priority_namespace_project_label_path(@project.namespace, @project, label),
- :"data-dom-id" => "#{label_css_id}" }
- %span.add-priority
- (+)
- %span.remove-priority
- (-)
= render "shared/label_row", label: label
.pull-info-right
%span.append-right-20
diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml
index d71db7545ef..325c50abaf2 100644
--- a/app/views/projects/labels/index.html.haml
+++ b/app/views/projects/labels/index.html.haml
@@ -10,7 +10,7 @@
New label
.labels
- .prioritized-labels
+ .prioritized-labels{ class: ('hide' if params[:page].present?)}
%h5 Prioritized Label
%ul.content-list.manage-labels-list.js-prioritized-labels{ "data-url" => set_sorting_namespace_project_labels_path(@project.namespace, @project) }
- if @prioritized.present?