some styles for switches

This commit is contained in:
Lisa Passing 2015-07-21 18:51:30 +02:00
parent 271724f994
commit 7652f9b5b0
6 changed files with 19 additions and 5 deletions

View File

@ -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`

View File

@ -4,7 +4,7 @@ SettingsController = Ember.Controller.extend
concurrentBuildsLimitDescription: (->
description = "Limit concurrent jobs"
if @get('concurrentBuildsLimit')
description += ": "
description += " "
description
).property('concurrentBuildsLimit')

View File

@ -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";

View File

@ -16,6 +16,9 @@
&:nth-child(3)
animation-delay: 0.6s
.inline
display: inline-block
@keyframes bouncedelay
0%, 80%, 100%
transform: scale(0)

View File

@ -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

View File

@ -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>