diff --git a/app/models/job.coffee b/app/models/job.coffee index 37f08934..151eda76 100644 --- a/app/models/job.coffee +++ b/app/models/job.coffee @@ -143,4 +143,9 @@ Job = Model.extend DurationCalculations, "#{@get('repo.slug')} ##{@get('number')}" ).property() + isLegacyInfrastructure: (-> + if @get('queue') == 'builds.linux' + true + ).property('queue') + `export default Job` diff --git a/app/styles/app.scss b/app/styles/app.scss index dffd6596..3fc4fcbe 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -38,6 +38,7 @@ @import "app/modules/media"; @import "app/modules/switch"; @import "app/modules/memberlist"; +@import "app/modules/notice"; @import "app/layout"; @import "app/layouts/dashboard"; diff --git a/app/styles/app/layouts/profile.sass b/app/styles/app/layouts/profile.sass index 49df720b..2cec16ca 100644 --- a/app/styles/app/layouts/profile.sass +++ b/app/styles/app/layouts/profile.sass @@ -3,6 +3,13 @@ font-weight: 400 .profile-main + padding: 0 $column-gutter/2 + + @media #{$medium-up} + width: grid-calc(8, 12) + float: right + padding: 0 0 0 $column-gutter/2 + header h1 margin: 0 1.7rem 0 0 @@ -55,7 +62,10 @@ figcaption width: 90% margin: auto - padding: 0 0 0 2.8em + padding: 0 1em 0 2.8em + text-align: center + @media #{$medium-up} + text-align: left img display: block margin: 0 auto 1em @@ -125,17 +135,18 @@ p.profile-user-last .profile-hooklist @include resetul font-size: $font-size-m - color: #7a7a7a li clear: both margin-bottom: .8em - overflow: auto + // overflow: auto .profile-hooks width: grid-calc(10, 24) + display: inline-block + vertical-align: middle @media #{$medium-up} - width: grid-calc(7, 24) + width: grid-calc(5, 24) - 1% @media #{$large-up} - width: grid-calc(5, 24) + width: grid-calc(5, 24) - 1% .switch display: inline-block vertical-align: middle @@ -158,7 +169,8 @@ p.profile-user-last .profile-repo @extend %border-radius-4px position: relative - width: grid-calc(14, 24) + display: inline-block + width: grid-calc(13, 24) padding: .25em .5em .3em white-space: nowrap overflow: hidden @@ -182,7 +194,7 @@ p.profile-user-last content: "" @include fadeOut(right, -90deg, #e2eee2) @media #{$medium-up} - width: grid-calc(17, 24) + width: grid-calc(18, 24) height: 30px &:hover span diff --git a/app/styles/app/modules/icons.sass b/app/styles/app/modules/icons.sass index f10322c2..ec27b927 100644 --- a/app/styles/app/modules/icons.sass +++ b/app/styles/app/modules/icons.sass @@ -192,3 +192,6 @@ border-left : 5px solid transparent border-right : 5px solid transparent border-top : 5px solid $dashboard-text-color + +.icon-flag + background-image: inline-image('svg/notice-flag.svg') diff --git a/app/styles/app/modules/notice.sass b/app/styles/app/modules/notice.sass new file mode 100644 index 00000000..0bb6b34f --- /dev/null +++ b/app/styles/app/modules/notice.sass @@ -0,0 +1,16 @@ +.notice + padding: 0.3em 0.5em 0.2em + margin-bottom: .5em + background-color: #F9F3D3 + color: #AF9112 + border-radius: 4px + a + color: #AF9112 + text-decoration: underline + + .icon-flag + @extend %icon + width: 1.3em + height: 1.5em + margin: 0 .6em 0 .2em + vertical-align: middle \ No newline at end of file diff --git a/app/templates/components/hooks-list-item.hbs b/app/templates/components/hooks-list-item.hbs index 55f94915..dbf0bb1c 100644 --- a/app/templates/components/hooks-list-item.hbs +++ b/app/templates/components/hooks-list-item.hbs @@ -1,4 +1,4 @@ -
+
{{hook-switch hook=hook onToggleError="handleToggleError" onToggle="resetErrors"}} {{#if hook.isSaving}} {{loading-indicator}} @@ -6,7 +6,7 @@ {{#link-to "settings" hook.ownerName hook.name class="profile-settings" title="Repository settings"}}{{/link-to}} {{/if}}
- + {{hook.slug}} {{hook.description}} diff --git a/app/templates/jobs/pre.hbs b/app/templates/jobs/pre.hbs index e60f99c4..4308e3b4 100644 --- a/app/templates/jobs/pre.hbs +++ b/app/templates/jobs/pre.hbs @@ -4,6 +4,19 @@ {{#if view.job.notStarted}}
Hang tight, the log cannot be shown until the build has started.
{{/if}} + + + {{#if view.job.isLegacyInfrastructure}} + {{#if view.job.isFinished}} +

+ This job ran on our legacy infrastructure. Please read our docs on how to upgrade

+ {{else}} +

+ This job is running on our legacy infrastructure. Please read our docs on how to upgrade

+ {{/if}} + {{/if}} + +
{{#if view.canRemoveLog}} diff --git a/app/templates/profile/show.hbs b/app/templates/profile/show.hbs index e14bec3b..e772d428 100644 --- a/app/templates/profile/show.hbs +++ b/app/templates/profile/show.hbs @@ -1,28 +1,3 @@ -
- -{{!-- {{#if config.billingEndpoint}} -
- {{#if view.subscribed}} - - Subscription active! - - {{else}} - {{#if view.education}} - - Educational account! - - {{else}} - - Sign up this account! - - {{/if}} - {{/if}} -
- {{/if}} --}} - - {{!-- {{view 'profile-tabs'}} --}} - - {{!--
--}} - {{outlet}} - {{!--
--}} +
+ {{outlet}}
diff --git a/app/templates/profile/tabs/user.hbs b/app/templates/profile/tabs/user.hbs index 93ee5043..8579dff7 100644 --- a/app/templates/profile/tabs/user.hbs +++ b/app/templates/profile/tabs/user.hbs @@ -1,4 +1,4 @@ - +{{!--
@@ -26,3 +26,4 @@
+ --}} \ No newline at end of file diff --git a/public/images/svg/notice-flag.svg b/public/images/svg/notice-flag.svg new file mode 100644 index 00000000..16ab669c --- /dev/null +++ b/public/images/svg/notice-flag.svg @@ -0,0 +1,7 @@ + + + + +