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

Style improvements to import page

See merge request !1685

app/assets/javascripts/importer_status.js.coffee

@@ -16,20 +16,20 @@ class @ImporterStatus
     $(".js-import-all").click (event) =>
       $(".js-add-to-import").each ->
         $(this).click()
-  
+
   setAutoUpdate: ->
     setInterval (=>
       $.get @jobs_url, (data) =>
         $.each data, (i, job) =>
           job_item = $("#project_" + job.id)
           status_field = job_item.find(".job-status")
-          
+
           if job.import_status == 'finished'
             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'
             status_field.html("<i class='fa fa-spinner fa-spin'></i> started")
           else
             status_field.html(job.import_status)
-          
-    ), 4000
\ No newline at end of file
+
+    ), 4000

app/assets/stylesheets/base/gl_bootstrap.scss

@@ -197,3 +197,50 @@
     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;
+    }
+  }
+}

app/views/import/bitbucket/status.html.haml

@@ -23,7 +23,7 @@
           %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project]
         %td.job-status
           - if project.import_status == 'finished'
-            %span.cgreen
+            %span
               %i.fa.fa-check
               done
           - elsif project.import_status == 'started'

app/views/import/github/status.html.haml

@@ -23,7 +23,7 @@
           %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project]
         %td.job-status
           - if project.import_status == 'finished'
-            %span.cgreen
+            %span
               %i.fa.fa-check
               done
           - elsif project.import_status == 'started'

app/views/import/gitlab/status.html.haml

@@ -23,7 +23,7 @@
           %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project]
         %td.job-status
           - if project.import_status == 'finished'
-            %span.cgreen
+            %span
               %i.fa.fa-check
               done
           - elsif project.import_status == 'started'

app/views/import/gitorious/status.html.haml

@@ -23,7 +23,7 @@
           %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project]
         %td.job-status
           - if project.import_status == 'finished'
-            %span.cgreen
+            %span
               %i.fa.fa-check
               done
           - elsif project.import_status == 'started'