pipeline fixes

app/styles/components/_pipeline.scss

@@ -135,13 +135,11 @@
     left: 0;
     right: 0;
     margin: auto;
+    z-index: -1;
   }
   >.steps-wrap {
     padding: 4px;
-    // margin-right: 10px;
-    // &.active{
-    // border: 2px dashed $border;
-    // }
+    text-align: center;
   }
   .step-content {
     position: relative;
@@ -291,6 +289,12 @@
   position: relative;
   top: 0;
   height: 36.5px;
+  margin-bottom: 10px;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+
   .label-wrap{
     position: absolute;
     left: 0;

lib/pipeline/addon/components/pipeline-stages/template.hbs

@@ -23,11 +23,11 @@
         dragEndHook=(action "dragEnd")
         }}
             {{#if (eq index 0)}}
-              <div class="stage-name text-muted clip">
+              <div class="stage-name clip">
                 {{index-add index}}. {{item.name}}
               </div>
             {{else}}
-              <div class="stage-name text-muted clip" style="curosor: pointer;" {{action 'editStage' index}}>
+              <div class="stage-name clip" style="curosor: pointer;" {{action 'editStage' index}}>
                 <a href="javascript:void(0);">{{index-add index}}. {{item.name}}</a>
               </div>
             {{/if}}
@@ -69,7 +69,7 @@
   {{else}}
     {{#each pipeline.stages as |item index|}}
     <div class="stage-wrap">
-      <div class="stage-name text-muted clip" {{action 'editStage' index}}>
+      <div class="stage-name clip" {{action 'editStage' index}}>
         {{index-add index}}. {{item.name}}
       </div>
         {{pipeline-steps

lib/pipeline/addon/components/pipeline-steps/template.hbs

@@ -37,11 +37,10 @@
     {{/if}}
     {{#if editable}}
       {{#unless (eq stepMode 'scm')}}
-        <div class="step-add step-content" {{action 'addStep'}}>
-          <a href="javascript:void(0);" class="text-small">
-            {{t 'newPipelineStage.addStep'}}
-          </a>
-        </div>
+        <button class="mt-10 btn bg-link icon-btn p-0" {{action 'addStep'}} style="margin: 0 auto;">
+          <span class="darken"><i class="icon icon-plus text-small"/></span>
+          <span>{{t 'newPipelineStage.addStep'}}</span>
+        </button>
       {{/unless}}
     {{/if}}
   </div>

lib/pipeline/addon/components/pipeline-trigger/template.hbs

@@ -1,16 +1,17 @@
+<hr/>
 <div class="inline-form">
   <label>{{t 'newPipelineStep.stepType.scm.trigger'}}</label>
   <div class="pt-10"></div>
   <div class="inline-form">
     {{input disabled=disabled type="checkbox" id="webhook" checked=pipeline.triggerWebhook}}
-    <label for="webhook">
+    <label class="acc-label" for="webhook">
       {{t 'newPipelineStage.trigger.webhook'}}
     </label>
   </div>
   <div class="pt-10"></div>
   <div class="inline-form">
     {{input disabled=disabled type="checkbox" id="cron" checked=state.setCustomCron}}
-    <label for="cron">
+    <label class="acc-label" for="cron">
       {{t 'newPipelineStage.trigger.cron'}}
     </label>
   </div>

lib/pipeline/addon/components/settings-git/template.hbs

@@ -69,7 +69,7 @@
 
 {{#unless model.githubConfig}}
   <section class="box mt-30">
-    <h3>{{t 'authPage.github.notAuthenticated.headerVariable' GitHub='GitHub'}}</h3>
+    <h3>{{t 'authPage.github.notAuthenticated.headerVariable'}}</h3>
     <hr/>
     <p>
       <ol class="alphalist ml-40">

lib/pipeline/addon/components/step-scm/template.hbs

@@ -4,7 +4,7 @@
   <div class="pt-20"></div>
   <div class="inline-form">
     <label>{{t 'newPipelineStep.stepType.scm.user'}}{{field-required}}</label>
-    <div class="pt-10"></div>
+
     {{#if accountsInfo}}
     <div class="row">
       <div class="col span-12">
@@ -33,8 +33,10 @@
     {{/if}}
   </div>
 
-  <div class="pt-20"></div>
-  <div class="inline-form">
+<hr/>
+
+  <div class="row">
+    <div class="col span-6">
       <label>
         {{t 'pipelineHistories.repository'}}{{field-required}}
         {{#if (not-eq modalOpts.type 'review')}}
@@ -50,7 +52,7 @@
         {{/unless}}
         {{/if}}
       </label>
-    <div class="pt-10"></div>
+
       {{#if (eq modalOpts.type 'review')}}
         {{input class="form-control" value=selectedModel.sourceCodeConfig.url disabled=(if (eq modalOpts.type 'review') true false)}}
       {{else}}
@@ -67,15 +69,15 @@
         {{/if}}
       {{/if}}
     </div>
-  <div class="pt-20"></div>
-  <div class="inline-form">
+
+    <div class="col span-6">
       <label>{{t 'newPipelineStep.stepType.scm.branch'}}{{field-required}}</label>
-    <div class="pt-10"></div>
+
       {{#each branchTypes as |type| }}
         <div class="pipeline-input-group">
           <div class="label-wrap">
             {{radio-button disabled=(if (eq modalOpts.type 'review') true false) id=type.value selection=selectedModel.sourceCodeConfig.branchCondition value=type.value}}
-          <label for={{type.value}}>
+            <label class="acc-label" for={{type.value}}>
               {{type.label}}
             </label>
           </div>
@@ -85,11 +87,10 @@
             </div>
           {{/if}}
           </div>
-      <div class="mb-10"></div>
       {{/each}}
-
     </div>
-  <div class="pt-10"></div>
+  </div>
+
   {{#pipeline-trigger
     selectedModel=selectedModel
     modalOpts=modalOpts

lib/pipeline/addon/models/pipeline.js

@@ -64,8 +64,8 @@ let Pipeline = Resource.extend({
       { label:   'action.viewConfig',     icon: 'icon icon-files',          action: 'viewCode',         enabled: !!l.exportConfig, bulkable: false },
       { label:   'action.exportConfig',   icon: 'icon icon-download',       action: 'exportConfig',     enabled: !!l.exportConfig, bulkable: false },
       { divider: true },
-      { label: 'action.activate', icon: 'icon icon-plus-circle', action: 'activate', enabled: !isActive, bulkable: !isActive},
-      { label: 'action.deactivate', icon: 'icon icon-minus-circle', action: 'deactivate', enabled: isActive, bulkable: isActive},
+      { label: 'action.activate', icon: 'icon icon-play', action: 'activate', enabled: !isActive, bulkable: !isActive},
+      { label: 'action.deactivate', icon: 'icon icon-stop', action: 'deactivate', enabled: isActive, bulkable: isActive},
       { divider: true },
       { label: 'action.remove', icon: 'icon icon-trash', action: 'remove', enabled: true, bulkable: true },
     ];

lib/pipeline/addon/pipelines/template.hbs

@@ -1,11 +1,7 @@
 {{#containers-header tags=tags simpleMode=true showGroup=false}}
-  {{!-- {{#link-to "pipelines.project.import" classNames="btn btn-sm bg-default mr-10"}}{{t 'pipelinesPage.import'}}{{/link-to}} --}}
-  <div class="btn bg-link btn-sm icon-btn p-0">
-  {{#link-to "new-pipeline" class="btn bg-link icon-btn p-0"}}
-    <span class="darken"><i class="icon icon-plus text-small"/></span>
-    <span>{{t 'pipelinesPage.add'}}</span>
+  {{#link-to "new-pipeline" class="btn bg-primary btn-sm"}}
+    {{t 'pipelinesPage.add'}}
   {{/link-to}}
-  </div>
 {{/containers-header}}
 
 <div class="mt-10"></div>

lib/pipeline/translations/en-us.yaml

@@ -200,7 +200,7 @@ authPage:
     enterprise: GitHub Enterprise
     header:
       enabled:
-        label: "{github} is enabled"
+        label: "GitHub is enabled"
         required: |
           {appName} is configured to allow access to {orgs, plural,
             =0 {no organizations}
@@ -241,7 +241,7 @@ authPage:
         disable: Disable access control
     notAuthenticated:
       header: "1. Setup a GitHub Application"
-      headerVariable: "1. Setup a {GitHub} Application"
+      headerVariable: "1. Setup a GitHub Application"
       ul:
         li1:
           text: 'For standard GitHub, <a href="https://github.com/settings/developers" target="_blank">click here</a> to go applications settings in a new window.'