From b897e81fd2ba49c6e6b08588aaf000c696be7594 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Fri, 26 Sep 2014 12:12:28 -0400 Subject: [PATCH 01/59] updated build status bg colors --- assets/styles/main/summary.sass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index 760b665a..5d111d66 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -1,20 +1,20 @@ @import "_mixins/all" .green .build-status - background-color: #0d8136 + background-color: #549e54 .yellow .build-status - background-color: #e7d700 + background-color: #bcaf39 .red .build-status - background-color: #e10000 + background-color: #b54223 .gray .build-status background-color: #a8a8a9 #new-summary @include clearfix - @include border-radius(5px) + @include border-radius(4px) background-color: #fafafa min-height: 30px padding: 2px 11px From e9b8183ead997892e9451a52c6ddc213061fdd92 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Fri, 10 Oct 2014 12:14:49 -0400 Subject: [PATCH 02/59] fixing what was lost this morning --- assets/images/icons/state-errored-white.svg | 9 ++++ assets/images/icons/state-failed-white.svg | 9 ++++ assets/images/icons/state-passed-white.svg | 8 +++ assets/scripts/app/templates/builds/show.hbs | 32 +++++++----- assets/styles/main/summary.sass | 54 ++++++++++---------- 5 files changed, 74 insertions(+), 38 deletions(-) create mode 100644 assets/images/icons/state-errored-white.svg create mode 100644 assets/images/icons/state-failed-white.svg create mode 100644 assets/images/icons/state-passed-white.svg diff --git a/assets/images/icons/state-errored-white.svg b/assets/images/icons/state-errored-white.svg new file mode 100644 index 00000000..37f854b5 --- /dev/null +++ b/assets/images/icons/state-errored-white.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/assets/images/icons/state-failed-white.svg b/assets/images/icons/state-failed-white.svg new file mode 100644 index 00000000..08c0e0fd --- /dev/null +++ b/assets/images/icons/state-failed-white.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/assets/images/icons/state-passed-white.svg b/assets/images/icons/state-passed-white.svg new file mode 100644 index 00000000..b89db066 --- /dev/null +++ b/assets/images/icons/state-passed-white.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs index eadc1042..622a5996 100644 --- a/assets/scripts/app/templates/builds/show.hbs +++ b/assets/scripts/app/templates/builds/show.hbs @@ -4,16 +4,35 @@
+ {{#link-to "build" repo build}}#{{build.number}} {{build.state}}{{/link-to}}
+ {{#if build.isFinished}}ran{{else}}running{{/if}} for {{formatDuration build.duration}}
+ {{formatTime build.finishedAt}}
+ +
+ +
Commit {{formatSha commit.sha}}
+
+
+ {{#if build.pullRequest}} + +
#{{build.pullRequestNumber}}: {{build.pullRequestTitle}}
+ {{else}} + {{#if build.commit.compareUrl}} + +
Compare {{shortCompareShas build.commit.compareUrl}}
+ {{/if}} + {{/if}} +
@@ -39,17 +58,6 @@ {{/if}} {{/unless}}
- -
-
Commit {{formatSha commit.sha}}
- {{#if build.pullRequest}} -
#{{build.pullRequestNumber}}: {{build.pullRequestTitle}}
- {{else}} - {{#if build.commit.compareUrl}} -
Compare {{shortCompareShas build.commit.compareUrl}}
- {{/if}} - {{/if}} -
@@ -63,4 +71,4 @@ {{else}} {{view Travis.LogView jobBinding="build.jobs.firstObject"}} {{/if}} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index 5d111d66..52876851 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -53,13 +53,8 @@ .build-status @include border-radius(4px) - float: right - min-height: 30px - min-width: 90px color: white - padding-top: 5px - padding-left: 10px - padding-right: 10px + padding: 8px 0 font-size: 16px text-align: center @@ -71,16 +66,39 @@ font-size: 13px display: block width: 100% - text-align: right - line-height: 15px + text-align: left + line-height: 25px margin-top: 5px + img + height: 13px + width: 13px + .finished float: right font-size: 13px width: 100% - text-align: right - line-height: 20px + text-align: left + line-height: 25px + + img + height: 13px + width: 13px + + .commit-changes + text-align: left + width: inherit + margin-top: 0px + float: right + + img + margin-right: 2px + height: 13px + width: 13px + + div + display: inline + clear: none .right margin-top: 10px @@ -101,22 +119,6 @@ position: relative top: 2px - .commit-changes - text-align: right - width: inherit - margin-top: 0px - float: right - - div - display: inline - clear: none - - img - margin-right: 2px - margin-left: 4px - height: 16px - width: 16px - .author float: left From 5b5362863442e190e9ef482210acf4e8739be808 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Tue, 21 Oct 2014 13:08:48 +0200 Subject: [PATCH 03/59] latest for piotr review --- assets/images/icons/code-climate-icon.svg | 14 +++++++++----- assets/images/icons/logs.svg | 18 ++++++++++++++---- assets/images/icons/off.svg | 19 +++++++++++++++---- assets/images/icons/repeat.svg | 19 +++++++++++++++---- assets/images/icons/settings.svg | 21 +++++++++++++++++++++ assets/styles/main/summary.sass | 18 +++++++++++++++--- assets/styles/main/tools.sass | 19 ++++++++++--------- 7 files changed, 99 insertions(+), 29 deletions(-) create mode 100644 assets/images/icons/settings.svg diff --git a/assets/images/icons/code-climate-icon.svg b/assets/images/icons/code-climate-icon.svg index 90e36dc6..685516b6 100644 --- a/assets/images/icons/code-climate-icon.svg +++ b/assets/images/icons/code-climate-icon.svg @@ -1,5 +1,9 @@ - - - - - + + + + + + + diff --git a/assets/images/icons/logs.svg b/assets/images/icons/logs.svg index a7c3ad5f..2dbd3507 100644 --- a/assets/images/icons/logs.svg +++ b/assets/images/icons/logs.svg @@ -1,4 +1,14 @@ - - - - + + + + + + diff --git a/assets/images/icons/off.svg b/assets/images/icons/off.svg index 8e822a68..afc44783 100644 --- a/assets/images/icons/off.svg +++ b/assets/images/icons/off.svg @@ -1,4 +1,15 @@ - - - - + + + + + + diff --git a/assets/images/icons/repeat.svg b/assets/images/icons/repeat.svg index 8b981450..6afd1b5a 100644 --- a/assets/images/icons/repeat.svg +++ b/assets/images/icons/repeat.svg @@ -1,4 +1,15 @@ - - - - + + + + + + diff --git a/assets/images/icons/settings.svg b/assets/images/icons/settings.svg new file mode 100644 index 00000000..e37d316e --- /dev/null +++ b/assets/images/icons/settings.svg @@ -0,0 +1,21 @@ + + + + + + + + diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index 52876851..31ce98ee 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -2,6 +2,7 @@ .green .build-status background-color: #549e54 + background-image: inline-image('icons/state-passed-white.svg') no-repeat .yellow .build-status background-color: #bcaf39 @@ -23,6 +24,7 @@ .branch font-weight: bold + color: #81817d font-size: 16px max-width: 300px display: inline-block @@ -33,6 +35,7 @@ .subject display: inline-block font-size: 15px + color: #81817d margin-top: 10px overflow: hidden margin-right: 2px @@ -56,7 +59,8 @@ color: white padding: 8px 0 font-size: 16px - text-align: center + text-align: left + padding-left: 10px a color: white @@ -73,6 +77,7 @@ img height: 13px width: 13px + opacity: 0.5 .finished float: right @@ -84,17 +89,21 @@ img height: 13px width: 13px + opacity: 0.5 .commit-changes text-align: left + text-decoration: underline width: inherit + font-size: 13px margin-top: 0px - float: right + overflow: hidden img margin-right: 2px height: 13px width: 13px + opacity: 0.5 div display: inline @@ -103,15 +112,17 @@ .right margin-top: 10px float: right - width: 150px + width: 200px font-size: 11px .footer a + color: #818181 text-decoration: underline img vertical-align: middle + border-radius: 100px .text line-height: 15px @@ -125,6 +136,7 @@ div display: inline clear: none + color: #818181 img height: 16px diff --git a/assets/styles/main/tools.sass b/assets/styles/main/tools.sass index bcfdce4e..f1883c82 100644 --- a/assets/styles/main/tools.sass +++ b/assets/styles/main/tools.sass @@ -11,7 +11,8 @@ width: 39px height: 21px margin-top: -27px - background: inline-image('ui/tools-button.png') no-repeat + background-image: #000000 inline-image('icons/settings.svg') no-repeat + cursor: pointer float: right @@ -62,34 +63,34 @@ li.icon span.loading display: inline-block - height: 20px + height: 25px position: relative top: 1px cursor: pointer - color: #fef4e9 - border: solid 1px #d6d6d6 - background-color: #f4f4f4 + color: #ffffff + background-color: #5e869a text-align: center + border-radius: 100px margin-left: 5px background-position: center center a display: inline-block width: 25px - height: 20px + height: 25px position: relative top: -2px cursor: pointer color: #fef4e9 - border: solid 1px #d6d6d6 - background: #f4f4f4 + border-radius: 100px + background: #5e869a text-align: center margin-left: 5px img width: 15px height: 15px - margin-top: 3px + margin-top: 5px margin-left: 0px &:hover From 82983b1c02c86918f57ecece37221b408e1d5326 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Tue, 21 Oct 2014 15:30:07 +0200 Subject: [PATCH 04/59] fixed bg image sizes and settings dropdown color --- assets/images/icons/state-pending-white.svg | 8 ++++++++ assets/styles/main/summary.sass | 13 ++++++++++++- assets/styles/main/tools.sass | 18 +++++++++++------- 3 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 assets/images/icons/state-pending-white.svg diff --git a/assets/images/icons/state-pending-white.svg b/assets/images/icons/state-pending-white.svg new file mode 100644 index 00000000..f805df62 --- /dev/null +++ b/assets/images/icons/state-pending-white.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index 31ce98ee..0f39e8af 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -2,16 +2,27 @@ .green .build-status background-color: #549e54 - background-image: inline-image('icons/state-passed-white.svg') no-repeat + background: url('icons/state-passed-white.svg') no-repeat + background-size: 10px 10px + background-position: 5px 10px .yellow .build-status background-color: #bcaf39 + background: inline-image('icons/state-pending-white.svg') no-repeat + background-size: 10px 10px + background-position: 5px 10px .red .build-status background-color: #b54223 + background: inline-image('icons/state-failed-white.svg') no-repeat + background-size: 10px 10px + background-position: 5px 10px .gray .build-status background-color: #a8a8a9 + background: inline-image('icons/state-errored-white.svg') no-repeat + background-size: 10px 10px + background-position: 5px 10px #new-summary @include clearfix diff --git a/assets/styles/main/tools.sass b/assets/styles/main/tools.sass index f1883c82..a3ddf79c 100644 --- a/assets/styles/main/tools.sass +++ b/assets/styles/main/tools.sass @@ -4,14 +4,18 @@ position: relative float: right top: 2px - width: 300px + width: 600px & > a.menu-popup-button - display: block - width: 39px - height: 21px + display: inline-block + width: 88px + height: 24px + text-align: left margin-top: -27px - background-image: #000000 inline-image('icons/settings.svg') no-repeat + background: #a6adad inline-image('icons/settings.svg') no-repeat + background-size: 14px 14px + background-position: 6px 5px + @include border-radius(4px) cursor: pointer float: right @@ -39,10 +43,10 @@ a#status-image-popup float: right - display: block + display: inline-block opacity: 1.0 margin-top: -26px - margin-right: 45px + margin-right: 100px #code-climate a From d32fbf4565f77bb78bf9116daee32c400f8a8216 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Tue, 21 Oct 2014 16:09:13 +0200 Subject: [PATCH 05/59] small change to right div width for longer messages --- assets/styles/main/summary.sass | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index 0f39e8af..a9e1749c 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -1,8 +1,7 @@ @import "_mixins/all" .green .build-status - background-color: #549e54 - background: url('icons/state-passed-white.svg') no-repeat + background: #549e54 url('icons/state-passed-white.svg') no-repeat background-size: 10px 10px background-position: 5px 10px @@ -77,13 +76,12 @@ color: white .runtime - float: right font-size: 13px display: block width: 100% text-align: left line-height: 25px - margin-top: 5px + margin: 5px 0 0 12px img height: 13px @@ -91,11 +89,11 @@ opacity: 0.5 .finished - float: right font-size: 13px width: 100% text-align: left line-height: 25px + margin-left: 12px img height: 13px @@ -107,7 +105,7 @@ text-decoration: underline width: inherit font-size: 13px - margin-top: 0px + margin-left: 12px overflow: hidden img @@ -123,7 +121,7 @@ .right margin-top: 10px float: right - width: 200px + width: 220px font-size: 11px .footer From 2a3c1424dcd533732db85c2243c5430cdd0a9dfb Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Wed, 22 Oct 2014 13:20:12 +0200 Subject: [PATCH 06/59] for some reason giant svgs --- assets/styles/main/summary.sass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index a9e1749c..29022b9c 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -1,7 +1,8 @@ @import "_mixins/all" .green .build-status - background: #549e54 url('icons/state-passed-white.svg') no-repeat + background-color: #549e54 + background-image: inline-image('images/icons/state-passed-white.svg') no-repeat background-size: 10px 10px background-position: 5px 10px From 844f99155cc1173fe16ef575633c9fa2d284dda5 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Wed, 22 Oct 2014 13:42:42 +0200 Subject: [PATCH 07/59] got bgimg working on build-status --- assets/styles/main/summary.sass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index 29022b9c..2a51c85b 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -1,8 +1,7 @@ @import "_mixins/all" .green .build-status - background-color: #549e54 - background-image: inline-image('images/icons/state-passed-white.svg') no-repeat + background: #549e54 inline-image('icons/state-passed-white.svg') no-repeat background-size: 10px 10px background-position: 5px 10px From e98d4294266bbea138554e7964ff122ee0d8ef90 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Wed, 22 Oct 2014 13:55:49 +0200 Subject: [PATCH 08/59] fixed colors, position on build status --- assets/scripts/app/templates/builds/show.hbs | 1 - assets/styles/main/summary.sass | 26 +++++++++----------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs index 622a5996..e4d2eb00 100644 --- a/assets/scripts/app/templates/builds/show.hbs +++ b/assets/scripts/app/templates/builds/show.hbs @@ -4,7 +4,6 @@
- {{#link-to "build" repo build}}#{{build.number}} {{build.state}}{{/link-to}}
diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index 2a51c85b..fce18ddc 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -2,26 +2,23 @@ .green .build-status background: #549e54 inline-image('icons/state-passed-white.svg') no-repeat - background-size: 10px 10px - background-position: 5px 10px + background-size: 14px 14px + background-position: 12px 12px .yellow .build-status - background-color: #bcaf39 - background: inline-image('icons/state-pending-white.svg') no-repeat - background-size: 10px 10px - background-position: 5px 10px + background: #bcaf39 inline-image('icons/state-pending-white.svg') no-repeat + background-size: 14px 14px + background-position: 12px 12px .red .build-status - background-color: #b54223 - background: inline-image('icons/state-failed-white.svg') no-repeat - background-size: 10px 10px - background-position: 5px 10px + background: #b54223 inline-image('icons/state-failed-white.svg') no-repeat + background-size: 14px 14px + background-position: 12px 12px .gray .build-status - background-color: #a8a8a9 - background: inline-image('icons/state-errored-white.svg') no-repeat - background-size: 10px 10px - background-position: 5px 10px + background: #a8a8a9 inline-image('icons/state-errored-white.svg') no-repeat + background-size: 14px 14px + background-position: 12px 12px #new-summary @include clearfix @@ -74,6 +71,7 @@ a color: white + padding-left: 24px .runtime font-size: 13px From c3a843a8863f93f50c726f2f918cd45c36276922 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 23 Oct 2014 11:32:03 +0200 Subject: [PATCH 09/59] Add button for removing logs --- assets/scripts/app/models/job.coffee | 14 ++++++++++++ .../app/templates/repos/show/actions.hbs | 6 +++++ assets/scripts/app/views/repo/show.coffee | 22 +++++++++++++++++++ assets/scripts/lib/travis/ajax.coffee | 3 +++ 4 files changed, 45 insertions(+) diff --git a/assets/scripts/app/models/job.coffee b/assets/scripts/app/models/job.coffee index 58c5d271..92a711fb 100644 --- a/assets/scripts/app/models/job.coffee +++ b/assets/scripts/app/models/job.coffee @@ -83,6 +83,14 @@ require 'travis/model' Travis.ajax.post "/jobs/#{@get('id')}/cancel" ) + removeLog: -> + Travis.ajax.patch("/jobs/#{@get('id')}/log").then => + @reloadLog() + + reloadLog: -> + @clearLog() + @get('log').fetch() + requeue: -> Travis.ajax.post "/jobs/#{@get('id')}/restart" @@ -125,6 +133,12 @@ require 'travis/model' moment(finishedAt).format('lll') ).property('finishedAt') + canRemoveLog: (-> + # This should somehow get the status of removed log, but unfortunately there is + # no easy way to do that at the moment + true + ).property() + @Travis.Job.reopenClass queued: -> filtered = Ember.FilteredRecordArray.create( diff --git a/assets/scripts/app/templates/repos/show/actions.hbs b/assets/scripts/app/templates/repos/show/actions.hbs index c6626123..bb398840 100644 --- a/assets/scripts/app/templates/repos/show/actions.hbs +++ b/assets/scripts/app/templates/repos/show/actions.hbs @@ -1,5 +1,11 @@
+
+ + {{formatTime build.finishedAt}} +
+
Commit {{formatSha commit.sha}}
diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index fce18ddc..8f73d04b 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -85,6 +85,7 @@ height: 13px width: 13px opacity: 0.5 + padding-right: 4px .finished font-size: 13px @@ -97,6 +98,20 @@ height: 13px width: 13px opacity: 0.5 + padding-right: 4px + + .tags + font-size: 13px + width: 100% + text-align: left + line-height: 25px + margin-left: 12px + + img + height: 13px + width: 13px + opacity: 0.5 + padding-right: 4px .commit-changes text-align: left @@ -104,18 +119,23 @@ width: inherit font-size: 13px margin-left: 12px - overflow: hidden img margin-right: 2px height: 13px width: 13px opacity: 0.5 + padding-right: 4px div display: inline clear: none + a + text-overflow: ellipsis + white-space: nowrap + overflow: hidden + .right margin-top: 10px float: right From 2df958ca1532d5df14ef28be34f9f41b23e202ba Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Thu, 23 Oct 2014 11:47:11 +0200 Subject: [PATCH 11/59] fixed spacing in build status text align --- assets/styles/main/summary.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index 8f73d04b..c71566dc 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -71,7 +71,7 @@ a color: white - padding-left: 24px + padding-left: 21px .runtime font-size: 13px From e7e283ab8fc8585ee8c04a1d88beb86e60dd6953 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Thu, 23 Oct 2014 13:19:48 +0200 Subject: [PATCH 12/59] moved build status img to repo-header --- assets/images/icons/tags.svg | 4 ++-- assets/scripts/app/templates/repos/show.hbs | 4 ++++ assets/scripts/app/templates/repos/show/tools.hbs | 5 +---- assets/styles/main/repository.sass | 4 ++++ assets/styles/main/tools.sass | 10 +++------- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/assets/images/icons/tags.svg b/assets/images/icons/tags.svg index 84463bfd..61e057e0 100644 --- a/assets/images/icons/tags.svg +++ b/assets/images/icons/tags.svg @@ -3,9 +3,9 @@ -
{{view Travis.RepoShowToolsView}} + + + +

{{description}}

diff --git a/assets/scripts/app/templates/repos/show/tools.hbs b/assets/scripts/app/templates/repos/show/tools.hbs index ed110ae6..83cedee0 100644 --- a/assets/scripts/app/templates/repos/show/tools.hbs +++ b/assets/scripts/app/templates/repos/show/tools.hbs @@ -1,5 +1,5 @@
- + Settings
    {{#if view.displayRegenerateKey}} @@ -26,9 +26,6 @@ {{/if}}
- - -
- - {{#if build.isFinished}}ran{{else}}running{{/if}} for {{formatDuration build.duration}} + {{#if build.isFinished}}ran{{else}}running{{/if}} for {{formatDuration build.duration}}
- {{formatTime build.finishedAt}}
-
- - {{formatTime build.finishedAt}} -
+ {{#if build.tagName}} +
+ {{build.tagName}} +
+ {{/if}}
-
Commit {{formatSha commit.sha}}
{{#if build.pullRequest}} -
#{{build.pullRequestNumber}}: {{build.pullRequestTitle}}
{{else}} {{#if build.commit.compareUrl}} -
Compare {{shortCompareShas build.commit.compareUrl}}
{{/if}} {{/if}} @@ -47,9 +43,7 @@ - {{formatMessage build.commit.subject repoBinding=build.repo}}
- 
-{{formatMessage build.commit.body repoBinding=build.repo pre=true}}
-
+ 
{{formatMessage build.commit.body repoBinding=build.repo pre=true}}
@@ -75,4 +69,4 @@ {{else}} {{view Travis.LogView jobBinding="build.jobs.firstObject"}} {{/if}} -{{/if}} \ No newline at end of file +{{/if}} diff --git a/assets/scripts/app/templates/jobs/show.hbs b/assets/scripts/app/templates/jobs/show.hbs index 2158964d..c54d33c4 100644 --- a/assets/scripts/app/templates/jobs/show.hbs +++ b/assets/scripts/app/templates/jobs/show.hbs @@ -7,14 +7,33 @@
- {{#if job.isFinished}}ran{{else}}running{{/if}} for {{formatDuration job.duration}} + {{#if job.isFinished}}ran{{else}}running{{/if}} for {{formatDuration job.duration}}
{{formatTime job.finishedAt}}
+ + {{#if job.tagName}} +
+ {{job.tagName}} +
+ {{/if}} + +
+
Commit {{formatSha job.commit.sha}}
+
+
+ {{#if build.pullRequest}} +
#{{build.pullRequestNumber}}: {{job.build.pullRequestTitle}}
+ {{else}} + {{#if build.commit.compareUrl}} +
Compare {{shortCompareShas job.build.commit.compareUrl}}
+ {{/if}} + {{/if}} +
- +
{{job.commit.branch}}
@@ -23,9 +42,7 @@ - {{formatMessage job.commit.subject repoBinding=job.repo}}
- 
-{{formatMessage job.commit.body repoBinding=job.repo pre=true}}
-
+ 
{{formatMessage job.commit.body repoBinding=job.repo pre=true}}
@@ -38,17 +55,6 @@ {{/if}} {{/unless}}
- -
-
Commit {{formatSha job.commit.sha}}
- {{#if job.build.pullRequest}} -
#{{job.build.pullRequestNumber}}: {{job.build.pullRequestTitle}}
- {{else}} - {{#if job.commit.compareUrl}} -
Compare {{shortCompareShas job.commit.compareUrl}}
- {{/if}} - {{/if}} -
diff --git a/assets/scripts/app/templates/repos/show.hbs b/assets/scripts/app/templates/repos/show.hbs index cc9b0b2a..ec99feb8 100644 --- a/assets/scripts/app/templates/repos/show.hbs +++ b/assets/scripts/app/templates/repos/show.hbs @@ -7,13 +7,14 @@

{{#link-to "repo" this}}{{slug}}{{/link-to}}

- {{view Travis.RepoShowToolsView}}
+ + {{view Travis.RepoShowToolsView}}

{{description}}

diff --git a/assets/styles/main/repository.sass b/assets/styles/main/repository.sass index dff0150c..88f1361a 100644 --- a/assets/styles/main/repository.sass +++ b/assets/styles/main/repository.sass @@ -14,7 +14,8 @@ width: 90px height: 25px display: inline-block - + margin-left: 15px + a#status-image-popup display: inline-block opacity: 1.0 diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index c71566dc..fc3ad1a9 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -24,7 +24,6 @@ @include clearfix @include border-radius(4px) background-color: #fafafa - min-height: 30px padding: 2px 11px margin-bottom: 20px padding-bottom: 10px @@ -51,7 +50,6 @@ .body min-width: 500px display: block - min-height: 30px font-size: 12px font-family: Monaco, 'Liberation Mono', Courier, monospace margin-bottom: 0px @@ -60,7 +58,7 @@ a text-decoration: underline - + .build-status @include border-radius(4px) color: white @@ -74,58 +72,56 @@ padding-left: 21px .runtime + background-image: inline-image('icons/run-time.svg') + + .finished + background-image: inline-image('icons/finished.svg') + + .tags + background-image: inline-image('icons/tags.svg') + + .commit-changes + background-image: inline-image('icons/github.svg') + + .runtime + margin-top: 5px + + .runtime, .finished, .tags, .commit-changes + background-position: left center + background-repeat: no-repeat + background-size: 14px 14px + padding-left: 20px font-size: 13px display: block width: 100% text-align: left - line-height: 25px - margin: 5px 0 0 12px - - img - height: 13px - width: 13px - opacity: 0.5 - padding-right: 4px - - .finished - font-size: 13px - width: 100% - text-align: left - line-height: 25px + line-height: 23px margin-left: 12px - img - height: 13px - width: 13px - opacity: 0.5 - padding-right: 4px - - .tags - font-size: 13px - width: 100% - text-align: left - line-height: 25px - margin-left: 12px - - img - height: 13px - width: 13px - opacity: 0.5 - padding-right: 4px - .commit-changes text-align: left text-decoration: underline width: inherit + + div + display: inline + clear: none + + a + text-overflow: ellipsis + white-space: nowrap + overflow: hidden + + .commit-changes + background: inline-image('icons/github.svg') left center no-repeat + background-size: 13px 13px + text-align: left + text-decoration: underline + width: inherit font-size: 13px margin-left: 12px - - img - margin-right: 2px - height: 13px - width: 13px - opacity: 0.5 - padding-right: 4px + padding-left: 20px + line-height: 20px div display: inline @@ -159,6 +155,7 @@ .author float: left + margin-top: 10px div display: inline @@ -202,7 +199,7 @@ .message white-space: normal min-width: 0 - + pre font-size: 12px display: inline-block From e32e2922ded64855bd7dd95537594d46476d0127 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 28 Oct 2014 14:54:55 +0100 Subject: [PATCH 20/59] Change loading spinner type on icons --- assets/scripts/app/templates/repos/show/actions.hbs | 12 ++++++------ assets/styles/main/tools.sass | 4 +++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/assets/scripts/app/templates/repos/show/actions.hbs b/assets/scripts/app/templates/repos/show/actions.hbs index 2dc8efa6..9a26251e 100644 --- a/assets/scripts/app/templates/repos/show/actions.hbs +++ b/assets/scripts/app/templates/repos/show/actions.hbs @@ -1,11 +1,5 @@
    - {{#if view.displayRemoveLog}} -
  • - -
    • - {{/if}} {{#if view.displayCancelBuild}}
    • + {{#if view.displayRemoveLog}} +
  • + +
    • + {{/if}} {{/if}} {{#if view.displayCodeClimate}}
  • diff --git a/assets/styles/main/tools.sass b/assets/styles/main/tools.sass index 5afee560..3832ffe8 100644 --- a/assets/styles/main/tools.sass +++ b/assets/styles/main/tools.sass @@ -63,10 +63,12 @@ li.icon span.loading + background: inline-image('ui/round-spinner.svg') no-repeat + background-size: 17px 17px display: inline-block height: 25px position: relative - top: 1px + top: -3px cursor: pointer color: #ffffff background-color: #5e869a From cb3f1a4d9fe3946ae3b88658a871e91af32dc99e Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 28 Oct 2014 17:47:17 +0100 Subject: [PATCH 21/59] More fixes for IE --- .../app/templates/repos/show/actions.hbs | 24 +++++++------- .../app/templates/repos/show/tools.hbs | 2 +- assets/styles/main/repository.sass | 3 ++ assets/styles/main/tools.sass | 32 +++++++++++++++---- 4 files changed, 41 insertions(+), 20 deletions(-) diff --git a/assets/scripts/app/templates/repos/show/actions.hbs b/assets/scripts/app/templates/repos/show/actions.hbs index 9a26251e..08abc74c 100644 --- a/assets/scripts/app/templates/repos/show/actions.hbs +++ b/assets/scripts/app/templates/repos/show/actions.hbs @@ -1,47 +1,47 @@
      {{#if view.displayCancelBuild}} -
    • +
    • + {{bind-attr class="view.canCancelBuild::disabled"}}>Cancel build
      • {{/if}} {{#if view.displayCancelJob}} -
    • +
    • + {{bind-attr class="view.canCancelJob::disabled"}}>Cancel job
      • {{/if}} {{#if view.displayRequeueBuild}} -
    • +
    • {{#if view.requeueing}} {{else}} + {{bind-attr class="view.canRequeueBuild::disabled"}}> {{/if}}
      • {{/if}} {{#if view.displayRequeueJob}} -
    • +
    • {{#if view.requeueing}} {{else}} + {{bind-attr class="view.canRequeueJob::disabled"}}> {{/if}}
      • {{/if}} {{!TODO: for some reason showDownloadLog, which just delegates to jobIdForLog does not refresh 'if' properly, need further investigation}} {{#if view.jobIdForLog}} -
    • - +
    • +
      • {{#if view.displayRemoveLog}} -
    • +
    • + {{bind-attr class="view.canRemoveLog::disabled"}}>
      • {{/if}} {{/if}} diff --git a/assets/scripts/app/templates/repos/show/tools.hbs b/assets/scripts/app/templates/repos/show/tools.hbs index 7f772c2f..83cedee0 100644 --- a/assets/scripts/app/templates/repos/show/tools.hbs +++ b/assets/scripts/app/templates/repos/show/tools.hbs @@ -1,5 +1,5 @@
      - Settings + Settings
        {{#if view.displayRegenerateKey}} diff --git a/assets/styles/main/repository.sass b/assets/styles/main/repository.sass index 88f1361a..cb3e4787 100644 --- a/assets/styles/main/repository.sass +++ b/assets/styles/main/repository.sass @@ -20,6 +20,9 @@ display: inline-block opacity: 1.0 + img + border: none + .github-icon width: 21px height: 21px diff --git a/assets/styles/main/tools.sass b/assets/styles/main/tools.sass index 3832ffe8..b2697131 100644 --- a/assets/styles/main/tools.sass +++ b/assets/styles/main/tools.sass @@ -12,10 +12,12 @@ margin-top: -27px color: #fff font-size: 13px - padding: 3px 8px 2px 25px - background: #a6adad inline-image('icons/settings.svg') no-repeat - background-size: 14px 14px - background-position: 6px 6px + padding: 3px 24px 2px 25px + background-image: inline-image('icons/settings.svg'), inline-image('icons/dropdown-arrow-white.svg') + background-size: 14px 14px, 8px 8px + background-position: 6px 6px, right 9px center + background-color: #a6adad + background-repeat: no-repeat @include border-radius(4px) cursor: pointer @@ -61,6 +63,18 @@ float: right text-align: right + li.restart-build a, li.restart-job a + background-image: inline-image('icons/repeat.svg') + + li.cancel-build a, li.cancel-job a + background-image: inline-image('icons/off.svg') + + li.download-log a + background-image: inline-image('icons/download-log.svg') + + li.remove-log a + background-image: inline-image('icons/delete-log.svg') + li.icon span.loading background: inline-image('ui/round-spinner.svg') no-repeat @@ -78,15 +92,19 @@ background-position: center center a + text-indent: -9999px display: inline-block - width: 27px - height: 27px + width: 28px + height: 28px position: relative top: -7px cursor: pointer color: #fef4e9 border-radius: 100px - background: #5e869a + background-color: #5e869a + background-size: 16px 16px + background-position: center center + background-repeat: no-repeat text-align: center margin-left: 5px From 55f6fa30ec4171f85532cb053ea503721b0965bb Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 28 Oct 2014 17:55:18 +0100 Subject: [PATCH 22/59] Fix PR info on jobs/show --- assets/scripts/app/templates/jobs/show.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/scripts/app/templates/jobs/show.hbs b/assets/scripts/app/templates/jobs/show.hbs index c54d33c4..82c9c34a 100644 --- a/assets/scripts/app/templates/jobs/show.hbs +++ b/assets/scripts/app/templates/jobs/show.hbs @@ -24,10 +24,10 @@
        Commit {{formatSha job.commit.sha}}
      - {{#if build.pullRequest}} + {{#if job.build.pullRequest}}
      #{{build.pullRequestNumber}}: {{job.build.pullRequestTitle}}
      {{else}} - {{#if build.commit.compareUrl}} + {{#if job.build.commit.compareUrl}}
      Compare {{shortCompareShas job.build.commit.compareUrl}}
      {{/if}} {{/if}} From 03926ddc70c32dd3d84ee07ababc922ca2ecfae0 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 28 Oct 2014 18:15:17 +0100 Subject: [PATCH 23/59] Text breaks icons position, removing for now --- assets/scripts/app/templates/repos/show/actions.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/scripts/app/templates/repos/show/actions.hbs b/assets/scripts/app/templates/repos/show/actions.hbs index 08abc74c..29b26544 100644 --- a/assets/scripts/app/templates/repos/show/actions.hbs +++ b/assets/scripts/app/templates/repos/show/actions.hbs @@ -3,13 +3,13 @@ {{#if view.displayCancelBuild}}
    • Cancel build + {{bind-attr class="view.canCancelBuild::disabled"}}>
      • {{/if}} {{#if view.displayCancelJob}}
    • Cancel job + {{bind-attr class="view.canCancelJob::disabled"}}>
      • {{/if}} {{#if view.displayRequeueBuild}} From a8bd45eaec5c6c25346b5a97d055542ae7d30094 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 28 Oct 2014 18:15:27 +0100 Subject: [PATCH 24/59] Fix code climate icon --- assets/scripts/app/templates/repos/show/actions.hbs | 6 ++---- assets/styles/main/tools.sass | 3 +++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/assets/scripts/app/templates/repos/show/actions.hbs b/assets/scripts/app/templates/repos/show/actions.hbs index 29b26544..36cda7b3 100644 --- a/assets/scripts/app/templates/repos/show/actions.hbs +++ b/assets/scripts/app/templates/repos/show/actions.hbs @@ -46,12 +46,10 @@ {{/if}} {{/if}} {{#if view.displayCodeClimate}} -
    • +
    • - - + {{bind-attr class=":open-popup"}}>
      • {{/if}} diff --git a/assets/styles/main/tools.sass b/assets/styles/main/tools.sass index b2697131..208f56ad 100644 --- a/assets/styles/main/tools.sass +++ b/assets/styles/main/tools.sass @@ -75,6 +75,9 @@ li.remove-log a background-image: inline-image('icons/delete-log.svg') + li.code-climate a + background-image: inline-image('icons/code-climate-icon.svg') + li.icon span.loading background: inline-image('ui/round-spinner.svg') no-repeat From 11b20aa7dce1e51e6960292c92445051a5d4bbcc Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Wed, 29 Oct 2014 10:09:19 +0100 Subject: [PATCH 25/59] fix to the github icon --- assets/images/icons/github.svg | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/assets/images/icons/github.svg b/assets/images/icons/github.svg index 687b1a67..06c96d7b 100644 --- a/assets/images/icons/github.svg +++ b/assets/images/icons/github.svg @@ -1,4 +1,21 @@ - - - - + + + + + + From 391890f299eca8ef1d1c3014091ae46789ff210d Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Mon, 8 Dec 2014 10:27:45 +0100 Subject: [PATCH 26/59] fixed the build header cut-off on pull requests --- .ruby-version | 1 + assets/images/ui/close-white.png | Bin 1069 -> 0 bytes assets/images/ui/close-white.svg | 9 +++++++++ assets/styles/app/flash.sass | 2 +- assets/styles/main/summary.sass | 4 ++++ 5 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 .ruby-version delete mode 100644 assets/images/ui/close-white.png create mode 100644 assets/images/ui/close-white.svg diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 00000000..eca07e4c --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.1.2 diff --git a/assets/images/ui/close-white.png b/assets/images/ui/close-white.png deleted file mode 100644 index 1348122d566fcab9d4c78397857c55a7fad23be5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1069 zcmaJ=PfXKL9B$AMLnJW~4vIii&_HzS+Ks|01-5l_6H0Jf0umD}?SnPYzS2I}AgBrP zASOnmhzB%6^e_^FH=|+#2QFMRo-`he2aY5pa`9lIudodd&Zg~q@0aiUet+L=Pxqzr zveRV*L6pa$VjQn0obOmE{@3pPmho~5h5Jwf4xzMc0V1HnK|scIc^JfjtWJ(?fmVVz zQm-ZZP@mMrD^PdK4#u6)P0S{U*7l4kD3W_(Q?$6O#;55v+P{BkbF$2W02+f3#j3VXBEAwDifa=!3Mpi&5#JWZ$5 zX?NP|hSo66`2BuIgJoS9;j$+UBxhWPU6)r7fvs4Yi8N@Cj-osW$B{tcNDorb&4R39 z=gNc&MrUM`X51bpr94oQ{twml0@_A#a2W4Dh3({|3FtVm;kc#X#tqduu1r2;0U1Fn z3E^nIiajZapq+vy8A@(RY0%D>-VGXyYseHua3xxbFUN(U1 z%!IuGF&J)P0->;v4ROI1HqRBIGOhyy<+*ka4>FO_w>bH3H%D`NOxBo%;mFatlnuk9dJKIi1*Z0nE5S7^*3k!F- PW# + + + + + diff --git a/assets/styles/app/flash.sass b/assets/styles/app/flash.sass index 071695ee..677502e0 100644 --- a/assets/styles/app/flash.sass +++ b/assets/styles/app/flash.sass @@ -35,6 +35,6 @@ right: 30px width: 16px height: 16px - background: inline-image('ui/close-white.png') no-repeat 0 0 + background: inline-image('ui/close-white.svg') no-repeat 0 0 cursor: pointer diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index fc3ad1a9..f89deb78 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -111,6 +111,8 @@ text-overflow: ellipsis white-space: nowrap overflow: hidden + display: inline-block + max-width: 175px .commit-changes background: inline-image('icons/github.svg') left center no-repeat @@ -131,6 +133,8 @@ text-overflow: ellipsis white-space: nowrap overflow: hidden + display: inline-block + max-width: 175px .right margin-top: 10px From 2f2d05689e6a2a7cda00306da98d1d01ef2f9514 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Mon, 8 Dec 2014 12:00:35 +0100 Subject: [PATCH 27/59] fixed the restart build loading icon bug --- assets/styles/main/tools.sass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/assets/styles/main/tools.sass b/assets/styles/main/tools.sass index 208f56ad..8d991d54 100644 --- a/assets/styles/main/tools.sass +++ b/assets/styles/main/tools.sass @@ -83,9 +83,10 @@ background: inline-image('ui/round-spinner.svg') no-repeat background-size: 17px 17px display: inline-block - height: 25px + height: 28px + width: 4px position: relative - top: -3px + top: -7px cursor: pointer color: #ffffff background-color: #5e869a From ae00085f88b587ca6254e7d60354b24b59dad8a2 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Mon, 8 Dec 2014 21:39:38 +0100 Subject: [PATCH 28/59] added pull request and push icons and pushed author to baseline of new-summary div --- assets/images/icons/pull-request.svg | 15 +++++++++++ assets/images/icons/push.svg | 11 ++++++++ assets/scripts/app/templates/builds/show.hbs | 5 ++++ assets/styles/main/log.sass | 1 + assets/styles/main/summary.sass | 27 +++++++++++++++++--- 5 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 assets/images/icons/pull-request.svg create mode 100644 assets/images/icons/push.svg diff --git a/assets/images/icons/pull-request.svg b/assets/images/icons/pull-request.svg new file mode 100644 index 00000000..dae09224 --- /dev/null +++ b/assets/images/icons/pull-request.svg @@ -0,0 +1,15 @@ + + + + + + + diff --git a/assets/images/icons/push.svg b/assets/images/icons/push.svg new file mode 100644 index 00000000..1d6f4b1d --- /dev/null +++ b/assets/images/icons/push.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs index d9ba5756..02d33aba 100644 --- a/assets/scripts/app/templates/builds/show.hbs +++ b/assets/scripts/app/templates/builds/show.hbs @@ -2,6 +2,11 @@ Loading {{else}}
      +
      +
      + +
      +
      {{#link-to "build" repo build}}#{{build.number}} {{build.state}}{{/link-to}} diff --git a/assets/styles/main/log.sass b/assets/styles/main/log.sass index 8f310425..1694d326 100644 --- a/assets/styles/main/log.sass +++ b/assets/styles/main/log.sass @@ -102,6 +102,7 @@ pre#log #log-container position: relative + margin-top: 20px #log-container #tail diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index f89deb78..bb9565ad 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -24,9 +24,8 @@ @include clearfix @include border-radius(4px) background-color: #fafafa - padding: 2px 11px - margin-bottom: 20px - padding-bottom: 10px + padding: 0 11px 0 0 + position: relative .branch font-weight: bold @@ -49,12 +48,15 @@ .body min-width: 500px + max-height: 63px display: block font-size: 12px font-family: Monaco, 'Liberation Mono', Courier, monospace margin-bottom: 0px margin-top: 10px - white-space: pre-wrap + text-overflow: ellipsis + white-space: nowrap + overflow: hidden a text-decoration: underline @@ -142,6 +144,20 @@ width: 220px font-size: 11px + .request-kind + background-color: #e8e9ea + opacity: 0.6 + float: left + position: relative + display: block + width: 40px + height: 145px + margin-right: 10px + + .kind-icon + padding-top: 13px + padding-left: 9px + .footer a color: #818181 @@ -160,6 +176,9 @@ .author float: left margin-top: 10px + position: absolute + bottom: 7px + left: 65px div display: inline From ce3ef8f7d293e84bb159f9cbb218cedc8345326f Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Tue, 9 Dec 2014 09:49:59 +0100 Subject: [PATCH 29/59] fixed line-height issue in Chrome and Firefox --- assets/scripts/app/templates/builds/show.hbs | 6 ++-- assets/styles/main/summary.sass | 33 +++----------------- 2 files changed, 8 insertions(+), 31 deletions(-) diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs index 02d33aba..21e3a2be 100644 --- a/assets/scripts/app/templates/builds/show.hbs +++ b/assets/scripts/app/templates/builds/show.hbs @@ -27,14 +27,14 @@ {{/if}}
      -
      Commit {{formatSha commit.sha}}
      + Commit {{formatSha commit.sha}}
      {{#if build.pullRequest}} -
      #{{build.pullRequestNumber}}: {{build.pullRequestTitle}}
      + #{{build.pullRequestNumber}}: {{build.pullRequestTitle}} {{else}} {{#if build.commit.compareUrl}} -
      Compare {{shortCompareShas build.commit.compareUrl}}
      + Compare {{shortCompareShas build.commit.compareUrl}} {{/if}} {{/if}}
      diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index bb9565ad..7274e491 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -96,40 +96,16 @@ font-size: 13px display: block width: 100% + height: 20px text-align: left - line-height: 23px - margin-left: 12px - - .commit-changes - text-align: left - text-decoration: underline - width: inherit - - div - display: inline - clear: none - - a - text-overflow: ellipsis - white-space: nowrap - overflow: hidden - display: inline-block - max-width: 175px - - .commit-changes - background: inline-image('icons/github.svg') left center no-repeat - background-size: 13px 13px - text-align: left - text-decoration: underline - width: inherit - font-size: 13px - margin-left: 12px - padding-left: 20px line-height: 20px + margin-left: 12px + .commit-changes div display: inline clear: none + height: 20px a text-overflow: ellipsis @@ -137,6 +113,7 @@ overflow: hidden display: inline-block max-width: 175px + line-height: 20px .right margin-top: 10px From b4da069990902e13c3b78c6ace8b2f24a33dfde8 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Tue, 9 Dec 2014 10:03:08 +0100 Subject: [PATCH 30/59] fixed regenerate key line for settings --- assets/styles/main/tools.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/styles/main/tools.sass b/assets/styles/main/tools.sass index 8d991d54..a4f60282 100644 --- a/assets/styles/main/tools.sass +++ b/assets/styles/main/tools.sass @@ -32,7 +32,7 @@ position: absolute right: 0 top: -3px - width: 135px + width: 140px background-color: #a6adad @include border-bottom-radius(4px) a From 7e54228386b8db1a679f30ffaa8dc21a8c410dc8 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Tue, 9 Dec 2014 10:21:58 +0100 Subject: [PATCH 31/59] removed min-wid from body for beter responsive display --- assets/styles/main/summary.sass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index 7274e491..59adb5ea 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -47,7 +47,6 @@ line-height: 20px .body - min-width: 500px max-height: 63px display: block font-size: 12px @@ -155,7 +154,7 @@ margin-top: 10px position: absolute bottom: 7px - left: 65px + left: 48px div display: inline From 1e793575e09d4a3db9811305387ecaca8c70157d Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Tue, 9 Dec 2014 14:18:45 +0100 Subject: [PATCH 32/59] began altering tabs appearance --- assets/styles/tabs.sass | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/assets/styles/tabs.sass b/assets/styles/tabs.sass index d62aac2e..12031cd2 100644 --- a/assets/styles/tabs.sass +++ b/assets/styles/tabs.sass @@ -1,25 +1,24 @@ @import "_mixins/all" .tabs - height: 29px - border-bottom: 1px solid #ccc + height: 30px + border-bottom: 2px solid #f5f5f6 li display: inline-block - height: 28px - margin-right: 10px + height: 30px + padding-right: 10px vertical-align: top - background-color: $color-bg-tab - border: 1px solid $color-border-light + background-color: #f5f5f6 white-space: nowrap cursor: pointer &:hover - background-color: $color-bg-tab-hover + background-color: #e1e8eb .active - background-color: $color-bg-tab-active - border-bottom-color: $color-bg-tab-active + background-color: #d8e2e6 + border-bottom-color: #d8e2e6 h5 margin: 0 From 4d0bd26d65ca6fe8e82ffe66e9b20a3eea0ad7e2 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Tue, 9 Dec 2014 15:10:21 +0100 Subject: [PATCH 33/59] added new default avatar and changed tab appearances between #left and #main --- assets/images/ui/default-avatar.svg | 8 +++++++ assets/scripts/travis.coffee | 2 +- assets/styles/main/summary.sass | 8 +++---- assets/styles/tabs.sass | 33 ++++++++++++++++++++--------- 4 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 assets/images/ui/default-avatar.svg diff --git a/assets/images/ui/default-avatar.svg b/assets/images/ui/default-avatar.svg new file mode 100644 index 00000000..8abbd37d --- /dev/null +++ b/assets/images/ui/default-avatar.svg @@ -0,0 +1,8 @@ + + + + + + + diff --git a/assets/scripts/travis.coffee b/assets/scripts/travis.coffee index 41a93ef0..aa4ab505 100644 --- a/assets/scripts/travis.coffee +++ b/assets/scripts/travis.coffee @@ -87,7 +87,7 @@ $.extend Travis, code_climate_url: $('meta[name="travis.code_climate_url"]').attr('value') caches_enabled: $('meta[name="travis.caches_enabled"]').attr('value') == 'true' show_repos_hint: 'private' - avatar_default_url: 'https://travis-ci.org/images/mailer/mascot-avatar-40px.png' + avatar_default_url: 'https://travis-ci.org/images/ui/default-avatar.svg' pusher_log_fallback: $('meta[name="travis.pusher_log_fallback"]').attr('value') == 'true' CONFIG_KEYS_MAP: { diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index 59adb5ea..dd73f73c 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -95,16 +95,16 @@ font-size: 13px display: block width: 100% - height: 20px + height: 24px text-align: left - line-height: 20px + line-height: 24px margin-left: 12px .commit-changes div display: inline clear: none - height: 20px + height: 24px a text-overflow: ellipsis @@ -112,7 +112,7 @@ overflow: hidden display: inline-block max-width: 175px - line-height: 20px + line-height: 24px .right margin-top: 10px diff --git a/assets/styles/tabs.sass b/assets/styles/tabs.sass index 12031cd2..19dbf98c 100644 --- a/assets/styles/tabs.sass +++ b/assets/styles/tabs.sass @@ -1,24 +1,25 @@ @import "_mixins/all" .tabs - height: 30px - border-bottom: 2px solid #f5f5f6 + height: 29px li display: inline-block - height: 30px - padding-right: 10px + height: 28px + margin-right: 10px vertical-align: top - background-color: #f5f5f6 + background-color: #f8f8f8 + border-top-right-radius: 4px + border-top-left-radius: 4px white-space: nowrap cursor: pointer &:hover - background-color: #e1e8eb + background-color: $color-bg-tab-hover .active - background-color: #d8e2e6 - border-bottom-color: #d8e2e6 + background-color: $color-bg-tab-active + border-bottom-color: $color-bg-tab-active h5 margin: 0 @@ -34,7 +35,7 @@ #left .tabs padding-left: 20px - margin-top: -29px + margin-top: -28px #tab_search:not(.active) display: none @@ -47,6 +48,7 @@ display: none height: 25px width: 26px + margin-top: 3px float: right h5 @@ -57,12 +59,23 @@ #main .tabs - margin-top: 35px + li + height: 30px + padding-right: 10px + background-color: #f5f5f6 + + &:hover + background-color: #e1e8eb + h5 min-width: 65px a text-decoration: none + .active + background-color: #d8e2e6 + border-bottom-color: #d8e2e6 + .tab margin-top: 20px From e7ed51e20f2e977ba7e0cd2e315884efe4fe7c8e Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Tue, 9 Dec 2014 16:05:56 +0100 Subject: [PATCH 34/59] cleaned up more tab and repo header styles --- assets/styles/main/log.sass | 6 ++--- assets/styles/main/repository.sass | 4 ++++ assets/styles/tabs.sass | 35 ++++++++++++++++++------------ 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/assets/styles/main/log.sass b/assets/styles/main/log.sass index 1694d326..d55c80ac 100644 --- a/assets/styles/main/log.sass +++ b/assets/styles/main/log.sass @@ -13,8 +13,8 @@ pre#log line-height: $line-height-log white-space: pre-wrap word-wrap: break-word - background-color: $color-bg-log - border: 1px solid $color-border-log + background-color: #2a2a2a + border-radius: 4px counter-reset: line-numbering .cut @@ -102,7 +102,7 @@ pre#log #log-container position: relative - margin-top: 20px + margin-top: 35px #log-container #tail diff --git a/assets/styles/main/repository.sass b/assets/styles/main/repository.sass index cb3e4787..10f02358 100644 --- a/assets/styles/main/repository.sass +++ b/assets/styles/main/repository.sass @@ -43,6 +43,10 @@ color: #666a72 font-size: 15px + .description + margin: 10px 0 35px 0 + color: #9ca0a7 + .language display: none padding-right: 5px diff --git a/assets/styles/tabs.sass b/assets/styles/tabs.sass index 19dbf98c..57e399c6 100644 --- a/assets/styles/tabs.sass +++ b/assets/styles/tabs.sass @@ -6,11 +6,11 @@ li display: inline-block height: 28px - margin-right: 10px vertical-align: top background-color: #f8f8f8 - border-top-right-radius: 4px - border-top-left-radius: 4px + border-radius: 4px 4px 0px 0px + padding: 0 12px 0 12px + margin-right: 10px white-space: nowrap cursor: pointer @@ -21,6 +21,10 @@ background-color: $color-bg-tab-active border-bottom-color: $color-bg-tab-active + a + color: #666666 + font-weight: 600 + h5 margin: 0 font-size: $font-size-small @@ -30,12 +34,12 @@ a display: block - padding: 0 10px + color: #a8a9ab + #left .tabs - padding-left: 20px - margin-top: -28px + margin: -28px 20px 0 15px #tab_search:not(.active) display: none @@ -50,6 +54,8 @@ width: 26px margin-top: 3px float: right + margin-right: 0 + padding: 0 5px 0 5px h5 line-height: 25px @@ -61,14 +67,12 @@ .tabs li height: 30px - padding-right: 10px background-color: #f5f5f6 + margin-right: 0 &:hover background-color: #e1e8eb - h5 - min-width: 65px a text-decoration: none @@ -76,19 +80,23 @@ background-color: #d8e2e6 border-bottom-color: #d8e2e6 + &:hover + background-color: #d8e2e6 + + a + color: #6c878e + .tab - margin-top: 20px + margin-top: 15px ul.navigation margin: -18px 0 20px 0 height: 40px line-height: 40px border-bottom: 1px solid #EAEAEA - padding-left: 10px li display: inline-block - padding-right: 10px a color: #ACACAC @@ -129,7 +137,6 @@ margin-right: 0px h5 min-width: 0px - a - padding: 0px 2px + #tab_branches display: none From 8647880cc7e107f8f7df8586f4d5c114fb376716 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Tue, 9 Dec 2014 17:59:53 +0100 Subject: [PATCH 35/59] more work on tabs --- assets/styles/tabs.sass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/styles/tabs.sass b/assets/styles/tabs.sass index 57e399c6..1f13e92e 100644 --- a/assets/styles/tabs.sass +++ b/assets/styles/tabs.sass @@ -65,6 +65,8 @@ #main .tabs + border-bottom: 3px solid #f5f5f6 + li height: 30px background-color: #f5f5f6 From 4035c3c435f5ea8bf01f3ab6289d0fe6bc0fa3a7 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Wed, 10 Dec 2014 10:51:06 +0100 Subject: [PATCH 36/59] wip fixing duration labels on #left --- assets/styles/layout.sass | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/assets/styles/layout.sass b/assets/styles/layout.sass index 22f46eac..b6921921 100644 --- a/assets/styles/layout.sass +++ b/assets/styles/layout.sass @@ -43,6 +43,15 @@ html, body background-color: #fbfbfa border-right: 1px solid $color-border-normal +.duration_label + display: inline-block + height: 14px + line-height: 16px + margin-right: 1px + overflow: hidden + background: inline-image('ui/clock.svg') no-repeat 0px 3px + background-size: contain + @media screen and (max-width: 980px) #left @@ -75,7 +84,7 @@ html, body width: 11px height: 14px margin-right: 1px - text-indent: -200px + text-indent: 10px overflow: hidden background: inline-image('ui/clock.svg') no-repeat 0px 3px background-size: contain From 541273a33b9569911a2df12f5a26a8a106ad79e0 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Wed, 10 Dec 2014 12:40:42 +0100 Subject: [PATCH 37/59] fixed duration icons --- assets/styles/layout.sass | 15 ++++++++------- assets/styles/main/summary.sass | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/assets/styles/layout.sass b/assets/styles/layout.sass index b6921921..8cc53d30 100644 --- a/assets/styles/layout.sass +++ b/assets/styles/layout.sass @@ -45,11 +45,12 @@ html, body .duration_label display: inline-block - height: 14px - line-height: 16px + height: 11px + line-height: 13px + text-indent: 14px margin-right: 1px overflow: hidden - background: inline-image('ui/clock.svg') no-repeat 0px 3px + background: inline-image('ui/clock.svg') no-repeat 0px 0px background-size: contain @@ -82,18 +83,18 @@ html, body #left .duration_label display: inline-block width: 11px - height: 14px + height: 11px margin-right: 1px text-indent: 10px overflow: hidden - background: inline-image('ui/clock.svg') no-repeat 0px 3px + background: inline-image('ui/clock.svg') no-repeat 0px 0px background-size: contain -@media screen and (max-width: 1310px) +@media screen and (max-width: 1400px) #left .finished_at_label display: none -@media screen and (max-width: 1310px) +@media screen and (max-width: 1400px) table#builds .committer display: none diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index dd73f73c..ae44fe3e 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -29,7 +29,7 @@ .branch font-weight: bold - color: #81817d + color: #6c878e font-size: 16px max-width: 300px display: inline-block @@ -40,7 +40,7 @@ .subject display: inline-block font-size: 15px - color: #81817d + color: #6c878e margin-top: 10px overflow: hidden margin-right: 2px From 776e3e9c3be320ab6e984d87c97cf15dda52bcf4 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Wed, 10 Dec 2014 15:13:30 +0100 Subject: [PATCH 38/59] set the build request type class from build.eventType --- assets/scripts/app/models/build.coffee | 7 +++++++ assets/scripts/app/templates/builds/show.hbs | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/assets/scripts/app/models/build.coffee b/assets/scripts/app/models/build.coffee index 974d5a9a..8ef9218c 100644 --- a/assets/scripts/app/models/build.coffee +++ b/assets/scripts/app/models/build.coffee @@ -15,6 +15,8 @@ require 'travis/model' pullRequest: Ember.attr('boolean') pullRequestTitle: Ember.attr('string') pullRequestNumber: Ember.attr(Number) + # TODO add eventType to the api for api build requests + # eventType: Ember.attr('string') repo: Ember.belongsTo('Travis.Repo', key: 'repository_id') commit: Ember.belongsTo('Travis.Commit') @@ -24,6 +26,11 @@ require 'travis/model' Travis.Helpers.compact(@get('_config')) ).property('_config') + # TODO add eventType to the api for api build requests + eventType: (-> + if @get('pullRequest') then 'pull_request' else 'push' + ).property('pull_request') + isPullRequest: (-> @get('eventType') == 'pull_request' || @get('pullRequest') ).property('eventType') diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs index 21e3a2be..30df6cc4 100644 --- a/assets/scripts/app/templates/builds/show.hbs +++ b/assets/scripts/app/templates/builds/show.hbs @@ -3,7 +3,7 @@ {{else}}
      -
      +
      From 8a3c05fe3602eda833cdbfb05a326d6488a55735 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Wed, 10 Dec 2014 15:23:09 +0100 Subject: [PATCH 39/59] fix repo settings menu to not display the "regenerate key" item when user does not have admin access --- assets/scripts/app/views/repo/show.coffee | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/assets/scripts/app/views/repo/show.coffee b/assets/scripts/app/views/repo/show.coffee index 125a6e42..34fec3e0 100644 --- a/assets/scripts/app/views/repo/show.coffee +++ b/assets/scripts/app/views/repo/show.coffee @@ -141,10 +141,8 @@ Travis.reopen error: -> Travis.lookup('controller:flash').loadFlashes([{ error: 'Travis encountered an error while trying to regenerate the key, please try again.'}]) - displayRegenerateKey: true - canRegenerateKey: (-> - @get('displayRegenerateKey') && @get('hasAdminPermission') + @get('hasAdminPermission') ).property('hasAdminPermission') hasPermission: (-> @@ -162,6 +160,10 @@ Travis.reopen permissions.contains parseInt(@get('repo.id')) ).property('currentUser.adminPermissions.length', 'repo.id') + displayRegenerateKey: (-> + @get('canRegenerateKey') + ).property('canRegenerateKey') + displaySettingsLink: (-> @get('hasPushPermission') ).property('hasPushPermission') From 69ef9f147f2d46e2c8605d42111f2de3ec49e7f6 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Wed, 10 Dec 2014 18:31:49 +0100 Subject: [PATCH 40/59] Increased height on #new-summary --- assets/styles/main/summary.sass | 4 ++-- assets/styles/top.sass | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index ae44fe3e..b6536d12 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -127,7 +127,7 @@ position: relative display: block width: 40px - height: 145px + height: 155px margin-right: 10px .kind-icon @@ -153,7 +153,7 @@ float: left margin-top: 10px position: absolute - bottom: 7px + bottom: 9px left: 48px div diff --git a/assets/styles/top.sass b/assets/styles/top.sass index da4b73b4..db007c8e 100644 --- a/assets/styles/top.sass +++ b/assets/styles/top.sass @@ -61,7 +61,6 @@ li display: block - &:last-child a:hover a display: block From a1eac086fdff70c6c384409953ac708e3607fa88 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Wed, 10 Dec 2014 22:04:47 +0100 Subject: [PATCH 41/59] commented out the remove log tool for now --- assets/scripts/app/templates/repos/show/actions.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/scripts/app/templates/repos/show/actions.hbs b/assets/scripts/app/templates/repos/show/actions.hbs index 36cda7b3..0cddaa96 100644 --- a/assets/scripts/app/templates/repos/show/actions.hbs +++ b/assets/scripts/app/templates/repos/show/actions.hbs @@ -38,12 +38,12 @@
      • - {{#if view.displayRemoveLog}} + {{/if}} {{#if view.displayCodeClimate}}
    • From 22aab4a629dd0fd09313b8e2b9b05be338b5f342 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Thu, 11 Dec 2014 11:55:08 +0100 Subject: [PATCH 42/59] created classes for push and pull requests --- assets/scripts/app/templates/builds/show.hbs | 1 - assets/styles/main/summary.sass | 13 ++++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs index 30df6cc4..cf71dc13 100644 --- a/assets/scripts/app/templates/builds/show.hbs +++ b/assets/scripts/app/templates/builds/show.hbs @@ -4,7 +4,6 @@
      -
      diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index b6536d12..e5af0b10 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -129,10 +129,17 @@ width: 40px height: 155px margin-right: 10px + .kind-icon.push + background-image: inline-image('icons/push.svg') no-repeat 13px 9px + background-size: contain + height: 21px + width: 21px - .kind-icon - padding-top: 13px - padding-left: 9px + .kind-icon.pull_request + background-image: inline-image('icons/pull-request.svg') no-repeat 13px 9px + background-size: contain + height: 21px + width: 21px .footer a From edcdb61e319f1ee0bcbc7c157999ff5c5853038d Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Thu, 11 Dec 2014 13:51:07 +0100 Subject: [PATCH 43/59] fixed the background positioning on pull and push icons --- assets/styles/main/summary.sass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index e5af0b10..fe5743f6 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -126,17 +126,18 @@ float: left position: relative display: block - width: 40px - height: 155px + height: 140px margin-right: 10px + padding: 15px 10px 0 10px + .kind-icon.push - background-image: inline-image('icons/push.svg') no-repeat 13px 9px + background: inline-image('icons/push.svg') no-repeat background-size: contain height: 21px width: 21px .kind-icon.pull_request - background-image: inline-image('icons/pull-request.svg') no-repeat 13px 9px + background: inline-image('icons/pull-request.svg') no-repeat 2px background-size: contain height: 21px width: 21px From b8f8383a5ebfa1d4979187424a6f68332db1d3b2 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Thu, 11 Dec 2014 19:10:38 +0100 Subject: [PATCH 44/59] changed svg to png file format --- assets/scripts/travis.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scripts/travis.coffee b/assets/scripts/travis.coffee index aa4ab505..6d5b1410 100644 --- a/assets/scripts/travis.coffee +++ b/assets/scripts/travis.coffee @@ -87,7 +87,7 @@ $.extend Travis, code_climate_url: $('meta[name="travis.code_climate_url"]').attr('value') caches_enabled: $('meta[name="travis.caches_enabled"]').attr('value') == 'true' show_repos_hint: 'private' - avatar_default_url: 'https://travis-ci.org/images/ui/default-avatar.svg' + avatar_default_url: 'https://travis-ci.org/images/ui/default-avatar.png' pusher_log_fallback: $('meta[name="travis.pusher_log_fallback"]').attr('value') == 'true' CONFIG_KEYS_MAP: { From 2d5643f392d0f8092dc6049f1b8ab208cae0dc58 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Thu, 11 Dec 2014 19:31:05 +0100 Subject: [PATCH 45/59] comment out push code --- assets/scripts/app/models/build.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scripts/app/models/build.coffee b/assets/scripts/app/models/build.coffee index 8ef9218c..cb4e2bdf 100644 --- a/assets/scripts/app/models/build.coffee +++ b/assets/scripts/app/models/build.coffee @@ -28,7 +28,7 @@ require 'travis/model' # TODO add eventType to the api for api build requests eventType: (-> - if @get('pullRequest') then 'pull_request' else 'push' + # if @get('pullRequest') then 'pull_request' else 'push' ).property('pull_request') isPullRequest: (-> From 860977347f0bc218374c4dd51c569d0507aadbd2 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Thu, 11 Dec 2014 19:34:56 +0100 Subject: [PATCH 46/59] add push --- assets/scripts/app/models/build.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/scripts/app/models/build.coffee b/assets/scripts/app/models/build.coffee index cb4e2bdf..1ece9342 100644 --- a/assets/scripts/app/models/build.coffee +++ b/assets/scripts/app/models/build.coffee @@ -29,6 +29,7 @@ require 'travis/model' # TODO add eventType to the api for api build requests eventType: (-> # if @get('pullRequest') then 'pull_request' else 'push' + 'push' ).property('pull_request') isPullRequest: (-> From e4a76499a83f26334a849cecaa8dd9a7a3146d6c Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Thu, 11 Dec 2014 19:52:37 +0100 Subject: [PATCH 47/59] trying to fix ember stuffs --- assets/scripts/app/templates/builds/show.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs index cf71dc13..94b2df75 100644 --- a/assets/scripts/app/templates/builds/show.hbs +++ b/assets/scripts/app/templates/builds/show.hbs @@ -3,9 +3,9 @@ {{else}}
      -
      -
      +
      +
      {{#link-to "build" repo build}}#{{build.number}} {{build.state}}{{/link-to}} From b09d26b1e8e14d23090d1bc67b00303c843f4316 Mon Sep 17 00:00:00 2001 From: Josh Kalderimis Date: Thu, 11 Dec 2014 20:14:40 +0100 Subject: [PATCH 48/59] removed some commented out code for now recommended by @rwjblue --- assets/scripts/app/templates/repos/show/actions.hbs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/assets/scripts/app/templates/repos/show/actions.hbs b/assets/scripts/app/templates/repos/show/actions.hbs index 0cddaa96..183ee63c 100644 --- a/assets/scripts/app/templates/repos/show/actions.hbs +++ b/assets/scripts/app/templates/repos/show/actions.hbs @@ -38,12 +38,6 @@
      • - {{/if}} {{#if view.displayCodeClimate}}
    • From a2d44463822aea10784def38cf0ed1762c49aee9 Mon Sep 17 00:00:00 2001 From: Josh Kalderimis Date: Thu, 11 Dec 2014 20:22:33 +0100 Subject: [PATCH 49/59] Revert "comment out push code" This reverts commit 2d5643f392d0f8092dc6049f1b8ab208cae0dc58. Conflicts: assets/scripts/app/models/build.coffee --- assets/scripts/app/models/build.coffee | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/scripts/app/models/build.coffee b/assets/scripts/app/models/build.coffee index 1ece9342..8ef9218c 100644 --- a/assets/scripts/app/models/build.coffee +++ b/assets/scripts/app/models/build.coffee @@ -28,8 +28,7 @@ require 'travis/model' # TODO add eventType to the api for api build requests eventType: (-> - # if @get('pullRequest') then 'pull_request' else 'push' - 'push' + if @get('pullRequest') then 'pull_request' else 'push' ).property('pull_request') isPullRequest: (-> From 354c6a44108ca7751cfeb55d343ae34c2200d94f Mon Sep 17 00:00:00 2001 From: Josh Kalderimis Date: Thu, 11 Dec 2014 20:22:47 +0100 Subject: [PATCH 50/59] Revert "trying to fix ember stuffs" This reverts commit e4a76499a83f26334a849cecaa8dd9a7a3146d6c. --- assets/scripts/app/templates/builds/show.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs index 94b2df75..cf71dc13 100644 --- a/assets/scripts/app/templates/builds/show.hbs +++ b/assets/scripts/app/templates/builds/show.hbs @@ -3,9 +3,9 @@ {{else}}
      -
      +
      +
      -
      {{#link-to "build" repo build}}#{{build.number}} {{build.state}}{{/link-to}} From 806fd899bc88ecaaff4d8105d279196e4663114a Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Fri, 12 Dec 2014 11:36:43 +0100 Subject: [PATCH 51/59] attempting to add job event types to jobs tab --- assets/scripts/app/models/job.coffee | 5 +++++ assets/scripts/app/templates/jobs/show.hbs | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/assets/scripts/app/models/job.coffee b/assets/scripts/app/models/job.coffee index 92a711fb..f6478809 100644 --- a/assets/scripts/app/models/job.coffee +++ b/assets/scripts/app/models/job.coffee @@ -22,6 +22,11 @@ require 'travis/model' _config: Ember.attr('object', key: 'config') + # TODO add eventType to the api for api build requests + eventType: (-> + if @get('pullRequest') then 'pull_request' else 'push' + ).property('pull_request') + log: ( -> @set('isLogAccessed', true) Travis.Log.create(job: this) diff --git a/assets/scripts/app/templates/jobs/show.hbs b/assets/scripts/app/templates/jobs/show.hbs index 82c9c34a..b192d80c 100644 --- a/assets/scripts/app/templates/jobs/show.hbs +++ b/assets/scripts/app/templates/jobs/show.hbs @@ -1,6 +1,10 @@ {{#if job.isLoaded}}
      +
      +
      +
      +
      {{#link-to "job" repo job}}#{{job.number}} {{job.state}}{{/link-to}} From aef53f4554b992e94fabee02a1ef0980715d2b7d Mon Sep 17 00:00:00 2001 From: Mathias Meyer Date: Fri, 12 Dec 2014 11:41:54 +0100 Subject: [PATCH 52/59] Fix event type display on the jobs page. --- assets/scripts/app/models/job.coffee | 5 ----- assets/scripts/app/templates/jobs/show.hbs | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/assets/scripts/app/models/job.coffee b/assets/scripts/app/models/job.coffee index f6478809..92a711fb 100644 --- a/assets/scripts/app/models/job.coffee +++ b/assets/scripts/app/models/job.coffee @@ -22,11 +22,6 @@ require 'travis/model' _config: Ember.attr('object', key: 'config') - # TODO add eventType to the api for api build requests - eventType: (-> - if @get('pullRequest') then 'pull_request' else 'push' - ).property('pull_request') - log: ( -> @set('isLogAccessed', true) Travis.Log.create(job: this) diff --git a/assets/scripts/app/templates/jobs/show.hbs b/assets/scripts/app/templates/jobs/show.hbs index b192d80c..719a4155 100644 --- a/assets/scripts/app/templates/jobs/show.hbs +++ b/assets/scripts/app/templates/jobs/show.hbs @@ -2,7 +2,7 @@
      -
      +
      From 81ffc3d6a724eb60ea0ec162ede83ff96e9e8408 Mon Sep 17 00:00:00 2001 From: Mathias Meyer Date: Fri, 12 Dec 2014 12:06:21 +0100 Subject: [PATCH 53/59] Fix pull request number display. --- assets/scripts/app/templates/jobs/show.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scripts/app/templates/jobs/show.hbs b/assets/scripts/app/templates/jobs/show.hbs index 719a4155..9d54e7d6 100644 --- a/assets/scripts/app/templates/jobs/show.hbs +++ b/assets/scripts/app/templates/jobs/show.hbs @@ -29,7 +29,7 @@
      {{#if job.build.pullRequest}} -
      #{{build.pullRequestNumber}}: {{job.build.pullRequestTitle}}
      +
      #{{job.build.pullRequestNumber}}: {{job.build.pullRequestTitle}}
      {{else}} {{#if job.build.commit.compareUrl}}
      Compare {{shortCompareShas job.build.commit.compareUrl}}
      From a2de29baf52dd6e79c342cad2f9d475c3c5104ea Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Fri, 12 Dec 2014 12:16:14 +0100 Subject: [PATCH 54/59] fixed h3 padding to align #profile tabs with #left tabs --- assets/styles/main.sass | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/styles/main.sass b/assets/styles/main.sass index 76064b22..f7aa3115 100644 --- a/assets/styles/main.sass +++ b/assets/styles/main.sass @@ -3,6 +3,7 @@ #main h3 margin: 15px 60px 0 0 + padding-bottom: 35px font-size: $font-size-huge a color: #50555b From 096e9872a6d10d1ec311e2ebc098c139ab8a3480 Mon Sep 17 00:00:00 2001 From: Mathias Meyer Date: Fri, 12 Dec 2014 12:18:02 +0100 Subject: [PATCH 55/59] Fix eventType for the build. This (somehow) ensures that the job page is properly populated. --- assets/scripts/app/models/build.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scripts/app/models/build.coffee b/assets/scripts/app/models/build.coffee index 8ef9218c..a5fb1809 100644 --- a/assets/scripts/app/models/build.coffee +++ b/assets/scripts/app/models/build.coffee @@ -29,7 +29,7 @@ require 'travis/model' # TODO add eventType to the api for api build requests eventType: (-> if @get('pullRequest') then 'pull_request' else 'push' - ).property('pull_request') + ).property('pullRequest') isPullRequest: (-> @get('eventType') == 'pull_request' || @get('pullRequest') From 8ea9dbf0c887379538dfd02e9f7f551d3dafd9cc Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Fri, 12 Dec 2014 12:23:05 +0100 Subject: [PATCH 56/59] fixed settings secondary tab spacing --- assets/styles/tabs.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/styles/tabs.sass b/assets/styles/tabs.sass index 1f13e92e..198a1a42 100644 --- a/assets/styles/tabs.sass +++ b/assets/styles/tabs.sass @@ -92,13 +92,13 @@ margin-top: 15px ul.navigation - margin: -18px 0 20px 0 height: 40px line-height: 40px border-bottom: 1px solid #EAEAEA li display: inline-block + margin-right: 10px a color: #ACACAC From e44052f299084b8c677016d418a6757b72f29305 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Fri, 12 Dec 2014 12:26:27 +0100 Subject: [PATCH 57/59] reverted previous h3 change and only changed #profile #main h3 --- assets/styles/main.sass | 1 - assets/styles/profile.sass | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/styles/main.sass b/assets/styles/main.sass index f7aa3115..76064b22 100644 --- a/assets/styles/main.sass +++ b/assets/styles/main.sass @@ -3,7 +3,6 @@ #main h3 margin: 15px 60px 0 0 - padding-bottom: 35px font-size: $font-size-huge a color: #50555b diff --git a/assets/styles/profile.sass b/assets/styles/profile.sass index dea6e25f..ff7c488b 100644 --- a/assets/styles/profile.sass +++ b/assets/styles/profile.sass @@ -6,6 +6,7 @@ h3 height: 19px + padding-bottom: 35px line-height: 19px img From 54b666a86a3ecaa067f7371f206ecf61167be687 Mon Sep 17 00:00:00 2001 From: Justine Arreche Date: Fri, 12 Dec 2014 14:55:32 +0100 Subject: [PATCH 58/59] realigned repo-header items --- assets/styles/main/repository.sass | 1 + assets/styles/main/tools.sass | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/styles/main/repository.sass b/assets/styles/main/repository.sass index 10f02358..314857f4 100644 --- a/assets/styles/main/repository.sass +++ b/assets/styles/main/repository.sass @@ -19,6 +19,7 @@ a#status-image-popup display: inline-block opacity: 1.0 + margin-top: 8px img border: none diff --git a/assets/styles/main/tools.sass b/assets/styles/main/tools.sass index a4f60282..4d1b040b 100644 --- a/assets/styles/main/tools.sass +++ b/assets/styles/main/tools.sass @@ -9,7 +9,7 @@ & > a.menu-popup-button display: inline-block text-align: left - margin-top: -27px + margin-top: -31px color: #fff font-size: 13px padding: 3px 24px 2px 25px From b5276ef4a60331be1bbf7e05e32fa3e705f3df35 Mon Sep 17 00:00:00 2001 From: Mathias Meyer Date: Fri, 12 Dec 2014 18:21:46 +0100 Subject: [PATCH 59/59] Hacky fix to make the status images work again. The bindings are a bit odd in this setup. The status images view reaches into the repos/show view to fetch relevant information. --- assets/scripts/app/views/repo/show.coffee | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/scripts/app/views/repo/show.coffee b/assets/scripts/app/views/repo/show.coffee index 34fec3e0..d19abc12 100644 --- a/assets/scripts/app/views/repo/show.coffee +++ b/assets/scripts/app/views/repo/show.coffee @@ -3,6 +3,10 @@ Travis.reopen templateName: 'repos/show' reposBinding: 'controllers.repos' + repoBinding: 'controller.repo' + buildBinding: 'controller.build' + jobBinding: 'controller.job' + tabBinding: 'controller.tab' classNameBindings: ['controller.isLoading:loading']