From 7652f9b5b0d02dca8a8f59a6f47ad790013cef7d Mon Sep 17 00:00:00 2001
From: Lisa Passing <mail@lislis.de>
Date: Tue, 21 Jul 2015 18:51:30 +0200
Subject: [PATCH] some styles for switches

---
 app/components/loading-indicator.coffee          |  2 +-
 app/controllers/settings.coffee                  |  2 +-
 app/styles/app.scss                              |  2 +-
 app/styles/app/components/loading-indicator.sass |  3 +++
 app/styles/app/layouts/settings.sass             | 10 ++++++++++
 app/templates/settings.hbs                       |  5 +++--
 6 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/components/loading-indicator.coffee b/app/components/loading-indicator.coffee
index b53ac20a..a5ebb185 100644
--- a/app/components/loading-indicator.coffee
+++ b/app/components/loading-indicator.coffee
@@ -2,7 +2,7 @@
 
 LoadingIndicatorComponent = Ember.Component.extend
   tagName: 'div'
-  classNameBindings: ['center:loading-container']
+  classNameBindings: ['center:loading-container', 'inline:inline']
   center: false
 
 `export default LoadingIndicatorComponent`
diff --git a/app/controllers/settings.coffee b/app/controllers/settings.coffee
index 1f504f8d..4ff4d46f 100644
--- a/app/controllers/settings.coffee
+++ b/app/controllers/settings.coffee
@@ -4,7 +4,7 @@ SettingsController = Ember.Controller.extend
   concurrentBuildsLimitDescription: (->
     description = "Limit concurrent jobs"
     if @get('concurrentBuildsLimit')
-      description += ": "
+      description += "  "
     description
   ).property('concurrentBuildsLimit')
 
diff --git a/app/styles/app.scss b/app/styles/app.scss
index 705d8bf2..21280bee 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -61,6 +61,6 @@
 @import "app/layouts/caches";
 @import "app/layouts/getting-started";
 @import "app/layouts/first-sync";
-@import "app/layouts/settings";
 @import "app/layouts/missing-notice";
+@import "app/layouts/settings";
 
diff --git a/app/styles/app/components/loading-indicator.sass b/app/styles/app/components/loading-indicator.sass
index 165035ba..57660068 100644
--- a/app/styles/app/components/loading-indicator.sass
+++ b/app/styles/app/components/loading-indicator.sass
@@ -16,6 +16,9 @@
     &:nth-child(3)
       animation-delay: 0.6s
 
+.inline
+  display: inline-block
+
 @keyframes bouncedelay
   0%, 80%, 100%
     transform: scale(0)
diff --git a/app/styles/app/layouts/settings.sass b/app/styles/app/layouts/settings.sass
index 76d56e08..13aa6dea 100644
--- a/app/styles/app/layouts/settings.sass
+++ b/app/styles/app/layouts/settings.sass
@@ -16,6 +16,10 @@
   .small-title
     margin-top: 0
 
+  .switch
+    div
+      display: inline-block
+
 %settings-list
   padding: 0
   margin: 0
@@ -44,6 +48,12 @@
     font-size: $font-size-s
     text-align: center
 
+input.settings-concurrent
+  display: inline-block
+  width: 3em
+  margin: 0 .5em
+  text-align: center
+
 %settings-row
   padding: .6em .5em
   border-radius: 4px
diff --git a/app/templates/settings.hbs b/app/templates/settings.hbs
index f7d6c795..dedd4b63 100644
--- a/app/templates/settings.hbs
+++ b/app/templates/settings.hbs
@@ -6,11 +6,12 @@
     <ul class="settings-list--columns">
       <li>{{settings-switch active=model.settings.builds_only_with_travis_yml repo=repo description="Build only if .travis.yml is present" key="builds_only_with_travis_yml"}}</li>
       <li>{{travis-switch active=concurrentBuildsLimit description=concurrentBuildsLimitDescription action="concurrentBuildsLimitChanged"}}
+
         {{#if concurrentBuildsLimit}}
-          {{input pattern="/^[0-9]+$/" value=model.settings.maximum_number_of_builds on="key-up" action="concurrentBuildsLimitValueChanged"}}
+          {{input pattern="/^[0-9]+$/" value=model.settings.maximum_number_of_builds on="key-up" action="concurrentBuildsLimitValueChanged" class="settings-concurrent"}}
         {{/if}}
         {{#if isSaving}}
-          {{loading-indicator}}
+          {{loading-indicator inline=true}}
         {{/if}}
       </li>
       <li>{{settings-switch active=model.settings.build_pushes repo=repo description="Build pushes" key="build_pushes"}}</li>