Commit 12ba855f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'improve-import-page' into 'master'

Style improvements to import page

See merge request !1685
parents cdb64a81 dd78cd1c
...@@ -16,20 +16,20 @@ class @ImporterStatus ...@@ -16,20 +16,20 @@ class @ImporterStatus
$(".js-import-all").click (event) => $(".js-import-all").click (event) =>
$(".js-add-to-import").each -> $(".js-add-to-import").each ->
$(this).click() $(this).click()
setAutoUpdate: -> setAutoUpdate: ->
setInterval (=> setInterval (=>
$.get @jobs_url, (data) => $.get @jobs_url, (data) =>
$.each data, (i, job) => $.each data, (i, job) =>
job_item = $("#project_" + job.id) job_item = $("#project_" + job.id)
status_field = job_item.find(".job-status") status_field = job_item.find(".job-status")
if job.import_status == 'finished' if job.import_status == 'finished'
job_item.removeClass("active").addClass("success") job_item.removeClass("active").addClass("success")
status_field.html('<span class="cgreen"><i class="fa fa-check"></i> done</span>') status_field.html('<span><i class="fa fa-check"></i> done</span>')
else if job.import_status == 'started' else if job.import_status == 'started'
status_field.html("<i class='fa fa-spinner fa-spin'></i> started") status_field.html("<i class='fa fa-spinner fa-spin'></i> started")
else else
status_field.html(job.import_status) status_field.html(job.import_status)
), 4000 ), 4000
\ No newline at end of file
...@@ -197,3 +197,50 @@ ...@@ -197,3 +197,50 @@
text-decoration: underline; text-decoration: underline;
} }
} }
// Typography =================================================================
.text-primary,
.text-primary:hover {
color: $brand-primary;
}
.text-success,
.text-success:hover {
color: $brand-success;
}
.text-danger,
.text-danger:hover {
color: $brand-danger;
}
.text-warning,
.text-warning:hover {
color: $brand-warning;
}
.text-info,
.text-info:hover {
color: $brand-info;
}
// Tables =====================================================================
table.table {
.dropdown-menu a {
text-decoration: none;
}
.success,
.warning,
.danger,
.info {
color: #fff;
a:not(.btn) {
text-decoration: underline;
color: #fff;
}
}
}
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
%strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project] %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project]
%td.job-status %td.job-status
- if project.import_status == 'finished' - if project.import_status == 'finished'
%span.cgreen %span
%i.fa.fa-check %i.fa.fa-check
done done
- elsif project.import_status == 'started' - elsif project.import_status == 'started'
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
%strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project] %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project]
%td.job-status %td.job-status
- if project.import_status == 'finished' - if project.import_status == 'finished'
%span.cgreen %span
%i.fa.fa-check %i.fa.fa-check
done done
- elsif project.import_status == 'started' - elsif project.import_status == 'started'
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
%strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project] %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project]
%td.job-status %td.job-status
- if project.import_status == 'finished' - if project.import_status == 'finished'
%span.cgreen %span
%i.fa.fa-check %i.fa.fa-check
done done
- elsif project.import_status == 'started' - elsif project.import_status == 'started'
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
%strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project] %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project]
%td.job-status %td.job-status
- if project.import_status == 'finished' - if project.import_status == 'finished'
%span.cgreen %span
%i.fa.fa-check %i.fa.fa-check
done done
- elsif project.import_status == 'started' - elsif project.import_status == 'started'
......
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