From 0efcaabc62f4c2c648dfc26195b1babe7106dbdb Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Wed, 22 Jul 2015 11:30:32 +0200 Subject: [PATCH] push some pixels on settings --- app/components/limit-concurrent-builds.coffee | 3 +++ app/components/loading-indicator.coffee | 2 +- app/styles/app/components/loading-indicator.sass | 5 ++--- app/styles/app/layouts/settings.sass | 14 +++++++++----- .../components/limit-concurrent-builds.hbs | 2 +- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/app/components/limit-concurrent-builds.coffee b/app/components/limit-concurrent-builds.coffee index 07fcdea8..e4eff2d8 100644 --- a/app/components/limit-concurrent-builds.coffee +++ b/app/components/limit-concurrent-builds.coffee @@ -1,6 +1,9 @@ `import Ember from 'ember'` LimitConcurrentBuildsComponent = Ember.Component.extend + + classNames: ['limit-concurrent-builds'] + description: (-> description = "Limit concurrent jobs" if @get('enabled') diff --git a/app/components/loading-indicator.coffee b/app/components/loading-indicator.coffee index a5ebb185..a076ae52 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', 'inline:inline'] + classNameBindings: ['center:loading-container', 'inline:inline-block'] center: false `export default LoadingIndicatorComponent` diff --git a/app/styles/app/components/loading-indicator.sass b/app/styles/app/components/loading-indicator.sass index 57660068..80729325 100644 --- a/app/styles/app/components/loading-indicator.sass +++ b/app/styles/app/components/loading-indicator.sass @@ -16,9 +16,6 @@ &:nth-child(3) animation-delay: 0.6s -.inline - display: inline-block - @keyframes bouncedelay 0%, 80%, 100% transform: scale(0) @@ -29,6 +26,8 @@ text-align: center padding: 1.5em 1em +.inline-block + display: inline-block .loading-indicator--white @extend .loading-indicator diff --git a/app/styles/app/layouts/settings.sass b/app/styles/app/layouts/settings.sass index 13aa6dea..b03a6017 100644 --- a/app/styles/app/layouts/settings.sass +++ b/app/styles/app/layouts/settings.sass @@ -48,16 +48,20 @@ font-size: $font-size-s text-align: center -input.settings-concurrent - display: inline-block - width: 3em - margin: 0 .5em - text-align: center +.limit-concurrent-builds + input + display: inline-block + width: 3em + height: 30px + margin: 0 .5em + text-align: center %settings-row padding: .6em .5em border-radius: 4px background-color: #F6F5F5 + @media #{$medium-up} + height: 47px .settings-envvar @extend %settings-row diff --git a/app/templates/components/limit-concurrent-builds.hbs b/app/templates/components/limit-concurrent-builds.hbs index 0d4f449e..21f60ea5 100644 --- a/app/templates/components/limit-concurrent-builds.hbs +++ b/app/templates/components/limit-concurrent-builds.hbs @@ -3,5 +3,5 @@ {{input pattern="/^[0-9]+$/" value=value on="key-up" action="limitChanged"}} {{/if}} {{#if isSaving}} - {{loading-indicator}} +{{loading-indicator inline=true}} {{/if}}