diff --git a/app/routes/dashboard/repositories.js b/app/routes/dashboard/repositories.js index 66bcdb17..e283ee93 100644 --- a/app/routes/dashboard/repositories.js +++ b/app/routes/dashboard/repositories.js @@ -12,7 +12,7 @@ export default TravisRoute.extend({ model() { var apiEndpoint; apiEndpoint = config.apiEndpoint; - return $.ajax(apiEndpoint + '/v3/repos?repository.active=false&include=repository.default_branch,build.commit', { + return $.ajax(apiEndpoint + '/v3/repos?repository.active=true&include=repository.default_branch,build.commit', { headers: { Authorization: 'token ' + this.auth.token() } diff --git a/app/styles/app/layouts/jobs.sass b/app/styles/app/layouts/jobs.sass index b5b538a2..918a1f7c 100644 --- a/app/styles/app/layouts/jobs.sass +++ b/app/styles/app/layouts/jobs.sass @@ -53,6 +53,10 @@ align-items: center height: 34px + &:hover + a + margin-left: -2px // related to the width given in color jobs + .section-title font-size: 16px color: $cement-grey diff --git a/app/styles/app/layouts/requests.sass b/app/styles/app/layouts/requests.sass index 78715ef0..08c10897 100644 --- a/app/styles/app/layouts/requests.sass +++ b/app/styles/app/layouts/requests.sass @@ -1,6 +1,7 @@ =requestFadeOut($status, $color) @media #{$medium-up} &.#{$status}:hover + padding-left: 0 .status-icon.api svg background-color: $color @@ -19,8 +20,8 @@ margin-bottom: 5px font-size: 15px padding-left: 1em - @include colorJobs($turf-green, 'accepted', 6px, rgba($turf-green, .1)) - @include colorJobs($brick-red, 'rejected', 6px, rgba($brick-red, .1)) + @include colorJobs($turf-green, 'accepted', 3px, rgba($turf-green, .1)) + @include colorJobs($brick-red, 'rejected', 3px, rgba($brick-red, .1)) @include requestFadeOut('accepted',#ECF6EF) @include requestFadeOut('rejected', #FBECEB) @@ -36,9 +37,9 @@ @media #{$medium-up} display: flex justify-content: space-between - flex-flow: row wrap + flex-flow: row nowrap align-items: center - padding: .3em 0 + padding: .3em 0 .3em 2px white-space: nowrap .row-item:first-of-type diff --git a/app/styles/app/mixins.sass b/app/styles/app/mixins.sass index 844f1dd9..5bced1ad 100644 --- a/app/styles/app/mixins.sass +++ b/app/styles/app/mixins.sass @@ -137,5 +137,3 @@ &:active background-color: $hover border-left: $width solid $color - a - margin-left: - $width + 1px diff --git a/app/styles/app/modules/tooltips.sass b/app/styles/app/modules/tooltips.sass index bc6309bf..ffa5e4c4 100644 --- a/app/styles/app/modules/tooltips.sass +++ b/app/styles/app/modules/tooltips.sass @@ -82,86 +82,39 @@ &:before left: 2.5em -.tooltip-jobs - display: inline-block - position: relative - vertical-align: middle - @extend %tooltip - .tooltip-bubble - top: -3.8em - left: -.5em - height: 3.2em - padding: .3em .4em - &:before - left: 0.6em - .tooltip-trigger - vertical-align: baseline - -.tooltip.job-os - .tooltip-bubble - top: -2.2em - height: 1.6em - padding: 0.1em .4em - &:before - left: 0 - right: 0 - margin: auto - - -.tooltip--requests - @extend %tooltip - position: absolute - right: 0 - bottom: 0 - .tooltip-trigger - margin: .2em .5em - .tooltip-bubble - top: -3.6em - right: 0 - width: 10em - height: 3em - white-space: normal - &:before - right: .8em - // trying to rewrite $tooltip-spacing: 4em -$tooltip-arrow-width: 1em +$tooltip-arrow-width: .8em [data-tooltip] position: relative - background-color: pink + display: inline-block + vertical-align: middle &:after content: attr(data-tooltip) - display: block - position: absolute - background: $asphalt-grey - padding: 0.5em + padding: 0.2em 0.3em color: white border-radius: 2px bottom: $tooltip-spacing - left: 0 - right: 0 white-space: normal - margin: auto font-size: 12px &:before content: "" - display: block width: $tooltip-arrow-width height: $tooltip-arrow-width transform: rotate(45deg) - position: absolute - left: 0 - right: 0 bottom: $tooltip-spacing - $tooltip-arrow-width - margin: auto - background-color: $asphalt-grey &:after, &:before + display: block + position: absolute + background: $asphalt-grey + left: 0 + right: 0 + margin: auto display: none &:hover, @@ -170,4 +123,20 @@ $tooltip-arrow-width: 1em &:before display: block - +.job-os[data-tooltip] + $tooltip-spacing: 3em + &:after + bottom: $tooltip-spacing + &:before + bottom: $tooltip-spacing - $tooltip-arrow-width + + +.request-item + [data-tooltip] + $tooltip-spacing: 3em + width: 7em + text-align: center + &:after + bottom: $tooltip-spacing + &:before + bottom: $tooltip-spacing - $tooltip-arrow-width diff --git a/app/templates/components/branch-row.hbs b/app/templates/components/branch-row.hbs index 0f783fe5..a3a52dab 100644 --- a/app/templates/components/branch-row.hbs +++ b/app/templates/components/branch-row.hbs @@ -148,7 +148,7 @@ {{#if getLast5Builds.isLoading}} {{loading-indicator center=true}} {{else}} - {{#each getLast5Builds.content as |buildTile|}} + {{#each getLast5Builds.content as |buildTile|}} {{build-tile build=buildTile}} {{/each}} {{/if}} diff --git a/app/templates/components/dashboard-row.hbs b/app/templates/components/dashboard-row.hbs index 92d35b05..f9b8e0d2 100644 --- a/app/templates/components/dashboard-row.hbs +++ b/app/templates/components/dashboard-row.hbs @@ -95,11 +95,11 @@ {{/if}} {{else}}
- {{#unless displayActivateLink}} + {{#if displayActivateLink}} {{else}}

Actiavte repository

- {{/unless}} + {{/if}}
{{/if}} diff --git a/app/templates/components/jobs-item.hbs b/app/templates/components/jobs-item.hbs index 43f0ccc9..c5ad2415 100644 --- a/app/templates/components/jobs-item.hbs +++ b/app/templates/components/jobs-item.hbs @@ -8,10 +8,9 @@ {{job.number}} -
+
{{#if job.config.os}} - {{job.config.os}} - + {{job.config.os}} {{/if}}
diff --git a/app/templates/components/jobs-list.hbs b/app/templates/components/jobs-list.hbs index b8ad3675..9be5870f 100644 --- a/app/templates/components/jobs-list.hbs +++ b/app/templates/components/jobs-list.hbs @@ -4,10 +4,9 @@

Build Jobs

{{else}}

Allowed Failures -
+ -

These are jobs you can allow to fail
without failing your entire build

-
+

{{/if}} diff --git a/app/templates/components/requests-item.hbs b/app/templates/components/requests-item.hbs index a11a600c..83407c06 100644 --- a/app/templates/components/requests-item.hbs +++ b/app/templates/components/requests-item.hbs @@ -37,8 +37,7 @@
{{#if isGHPages}} - - - Read about branch whitelisting + + {{/if}}