From a751145fef32a8980f050c371bcf28370d111356 Mon Sep 17 00:00:00 2001 From: Lisa P Date: Tue, 8 Dec 2015 16:31:29 +0100 Subject: [PATCH 01/10] use base64 backgroung svg --- app/styles/app/modules/icons.sass | 72 +++++++++---------- app/styles/app/modules/tabs.sass | 2 +- public/images/line-icons/icon-arrow-down.svg | 12 +--- .../line-icons/icon-arrow-dropdown-teal.svg | 1 + .../images/line-icons/icon-arrow-dropdown.svg | 13 +--- public/images/line-icons/icon-arrow-tabs.svg | 13 +--- public/images/line-icons/icon-cal.svg | 24 +------ public/images/line-icons/icon-clock.svg | 19 +---- .../line-icons/icon-codeclimate-teal.svg | 1 + public/images/line-icons/icon-codeclimate.svg | 21 +----- public/images/line-icons/icon-commit.svg | 32 +-------- public/images/line-icons/icon-downloadlog.svg | 33 +-------- public/images/line-icons/icon-environment.svg | 15 +--- public/images/line-icons/icon-failed-teal.svg | 1 + .../images/line-icons/icon-failed-white.svg | 1 + public/images/line-icons/icon-failed.svg | 11 +-- public/images/line-icons/icon-fingerprint.svg | 23 +----- public/images/line-icons/icon-flag-yellow.svg | 1 + public/images/line-icons/icon-flag.svg | 13 +--- .../images/line-icons/icon-github-outline.svg | 32 +-------- public/images/line-icons/icon-hash.svg | 11 +-- public/images/line-icons/icon-help-teal.svg | 1 + public/images/line-icons/icon-help.svg | 20 +----- public/images/line-icons/icon-key.svg | 12 +--- public/images/line-icons/icon-lang.svg | 23 +----- public/images/line-icons/icon-linux.svg | 33 +-------- public/images/line-icons/icon-mac.svg | 29 +------- public/images/line-icons/icon-removelog.svg | 22 +----- public/images/line-icons/icon-scales.svg | 16 +---- .../images/line-icons/icon-settings-teal.svg | 1 + public/images/line-icons/icon-settings.svg | 25 +------ public/images/line-icons/icon-stopwatch.svg | 28 +------- .../images/line-icons/icon-trash-disabled.svg | 24 +------ public/images/line-icons/icon-trash-red.svg | 1 + public/images/line-icons/icon-trash.svg | 21 +----- .../images/line-icons/icon-trigger-teal.svg | 1 + .../images/line-icons/icon-trigger-white.svg | 1 + public/images/line-icons/icon-trigger.svg | 12 +--- public/images/line-icons/icon-view.svg | 17 +---- 39 files changed, 74 insertions(+), 564 deletions(-) create mode 100644 public/images/line-icons/icon-arrow-dropdown-teal.svg create mode 100644 public/images/line-icons/icon-codeclimate-teal.svg create mode 100644 public/images/line-icons/icon-failed-teal.svg create mode 100644 public/images/line-icons/icon-failed-white.svg create mode 100644 public/images/line-icons/icon-flag-yellow.svg create mode 100644 public/images/line-icons/icon-help-teal.svg create mode 100644 public/images/line-icons/icon-settings-teal.svg create mode 100644 public/images/line-icons/icon-trash-red.svg create mode 100644 public/images/line-icons/icon-trigger-teal.svg create mode 100644 public/images/line-icons/icon-trigger-white.svg diff --git a/app/styles/app/modules/icons.sass b/app/styles/app/modules/icons.sass index 4a9d7d15..5ec193ba 100644 --- a/app/styles/app/modules/icons.sass +++ b/app/styles/app/modules/icons.sass @@ -10,11 +10,11 @@ @extend %icon %icon-download-log - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-downloadlog.svg') %icon-remove-log - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-removelog.svg') %icon-arrow-down - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-arrow-down.svg') .icon--search background-image: inline-image('ui/search.svg') @@ -35,11 +35,11 @@ background-image: inline-image('ui/hooks-off.svg') %icon-line-trashcan - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-trash.svg') %icon-line-trashcan-red - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-trash-red.svg') %icon-line-trashcan-disabled - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-trash-disabled.svg') .icon-delete @extend %icon-line-trashcan @@ -49,7 +49,7 @@ @extend %icon-line-trashcan-disabled %icon-line-key - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-key.svg') .icon-key @extend %icon @extend %icon-line-key @@ -59,7 +59,7 @@ margin-right: .3em %icon-line-fingerprint - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-fingerprint.svg') .icon-fingerprint @extend %icon @extend %icon-line-fingerprint @@ -68,7 +68,7 @@ margin-right: .3em %icon-line-calendar - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-cal.svg') .icon-line-calendar, .icon-cal, .icon-calendar @@ -76,13 +76,13 @@ @extend %icon-line-fingre %icon-line-clock - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-clock.svg') .icon-line-clock @extend %icon @extend %icon-line-clock %icon-line-stopwatch - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-stopwatch.svg') .icon-line-build @extend %icon @@ -96,12 +96,12 @@ %icon-line-eye - background-image: url('data:image/svg+xml;utf8,') + background-image:inline-image('line-icons/icon-view.svg') %icon-line-question - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-help.svg') %icon-line-question-teal - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-help-teal.svg') .icon-question width: 1em @@ -119,20 +119,20 @@ @extend %icon-line-question-teal %icon-line-hash - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-hash.svg') %icon-line-linux - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-linux.svg') %icon-line-mac - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-mac.svg') %icon-line-language - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-lang.svg') %icon-line-environment - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-environment.svg') %icon-line-cog - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-settings.svg') %icon-line-cog-teal - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-settings-teal.svg') .icon-settings @extend %icon-line-cog @@ -145,31 +145,31 @@ @extend %icon-line-cog-teal %icon-line-dropdown - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-arrow-dropdown.svg') %icon-line-dropdown-teal - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-arrow-dropdown-teal.svg') %icon-line-codeclimate - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-codeclimate.svg') %icon-line-codeclimate-teal - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-codeclimate-teal.svg') %icon-line-cross - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-failed.svg') %icon-line-cross-white - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-failed-white.svg') %icon-line-cross-teal - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-failed-teal.svg') %icon-line-trigger - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-trigger.svg') %icon-line-trigger-white - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-trigger-white.svg') %icon-line-trigger-teal - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-trigger-teal.svg') %icon-github - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-commit.svg') .icon-github display: inline-block width: 1.1em @@ -183,7 +183,7 @@ @extend %icon-github %icon-github-circle - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-github-outline.svg') .icon-github-circle display: inline-block width: 1.2em @@ -194,12 +194,12 @@ @extend %icon-github-circle %icon-line-flag-teal - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-flag.svg') %icon-line-flag-yellow - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-flag-yellow.svg') %icon-line-scale - background-image: url('data:image/svg+xml;utf8,') + background-image: inline-image('line-icons/icon-scales.svg') .icon-scale @extend %icon diff --git a/app/styles/app/modules/tabs.sass b/app/styles/app/modules/tabs.sass index a4ae84a4..10ef2268 100644 --- a/app/styles/app/modules/tabs.sass +++ b/app/styles/app/modules/tabs.sass @@ -86,4 +86,4 @@ background: size: auto 100% repeat: no-repeat - image: url('data:image/svg+xml;utf8,') + image: inline-image('line-icons/icon-arrow-tabs.svg') diff --git a/public/images/line-icons/icon-arrow-down.svg b/public/images/line-icons/icon-arrow-down.svg index a4696396..a024b9ac 100644 --- a/public/images/line-icons/icon-arrow-down.svg +++ b/public/images/line-icons/icon-arrow-down.svg @@ -1,11 +1 @@ - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-arrow-dropdown-teal.svg b/public/images/line-icons/icon-arrow-dropdown-teal.svg new file mode 100644 index 00000000..14fb2c96 --- /dev/null +++ b/public/images/line-icons/icon-arrow-dropdown-teal.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/line-icons/icon-arrow-dropdown.svg b/public/images/line-icons/icon-arrow-dropdown.svg index d3a0f072..1704a1e2 100644 --- a/public/images/line-icons/icon-arrow-dropdown.svg +++ b/public/images/line-icons/icon-arrow-dropdown.svg @@ -1,12 +1 @@ - - - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-arrow-tabs.svg b/public/images/line-icons/icon-arrow-tabs.svg index f734cbed..eef0f139 100644 --- a/public/images/line-icons/icon-arrow-tabs.svg +++ b/public/images/line-icons/icon-arrow-tabs.svg @@ -1,12 +1 @@ - - - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-cal.svg b/public/images/line-icons/icon-cal.svg index 96d40ad6..8b3c20e8 100644 --- a/public/images/line-icons/icon-cal.svg +++ b/public/images/line-icons/icon-cal.svg @@ -1,23 +1 @@ - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-clock.svg b/public/images/line-icons/icon-clock.svg index b2834604..b1b08802 100644 --- a/public/images/line-icons/icon-clock.svg +++ b/public/images/line-icons/icon-clock.svg @@ -1,18 +1 @@ - - - - - - - - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-codeclimate-teal.svg b/public/images/line-icons/icon-codeclimate-teal.svg new file mode 100644 index 00000000..7d441948 --- /dev/null +++ b/public/images/line-icons/icon-codeclimate-teal.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/line-icons/icon-codeclimate.svg b/public/images/line-icons/icon-codeclimate.svg index 1955ea51..c09e926a 100644 --- a/public/images/line-icons/icon-codeclimate.svg +++ b/public/images/line-icons/icon-codeclimate.svg @@ -1,20 +1 @@ - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-commit.svg b/public/images/line-icons/icon-commit.svg index 946930c9..f47dc481 100644 --- a/public/images/line-icons/icon-commit.svg +++ b/public/images/line-icons/icon-commit.svg @@ -1,31 +1 @@ - - - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-downloadlog.svg b/public/images/line-icons/icon-downloadlog.svg index 2f8272e4..06b7a7f6 100644 --- a/public/images/line-icons/icon-downloadlog.svg +++ b/public/images/line-icons/icon-downloadlog.svg @@ -1,32 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-environment.svg b/public/images/line-icons/icon-environment.svg index bf3da68e..75021cdc 100644 --- a/public/images/line-icons/icon-environment.svg +++ b/public/images/line-icons/icon-environment.svg @@ -1,14 +1 @@ - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-failed-teal.svg b/public/images/line-icons/icon-failed-teal.svg new file mode 100644 index 00000000..2e2a089b --- /dev/null +++ b/public/images/line-icons/icon-failed-teal.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/line-icons/icon-failed-white.svg b/public/images/line-icons/icon-failed-white.svg new file mode 100644 index 00000000..d0bd5293 --- /dev/null +++ b/public/images/line-icons/icon-failed-white.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/line-icons/icon-failed.svg b/public/images/line-icons/icon-failed.svg index 4ace72b8..d4b09596 100644 --- a/public/images/line-icons/icon-failed.svg +++ b/public/images/line-icons/icon-failed.svg @@ -1,10 +1 @@ - - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-fingerprint.svg b/public/images/line-icons/icon-fingerprint.svg index 799b9c15..f1bcebee 100644 --- a/public/images/line-icons/icon-fingerprint.svg +++ b/public/images/line-icons/icon-fingerprint.svg @@ -1,22 +1 @@ - - - - - - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-flag-yellow.svg b/public/images/line-icons/icon-flag-yellow.svg new file mode 100644 index 00000000..eb4f1254 --- /dev/null +++ b/public/images/line-icons/icon-flag-yellow.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/line-icons/icon-flag.svg b/public/images/line-icons/icon-flag.svg index 51fbaf60..e13c548c 100644 --- a/public/images/line-icons/icon-flag.svg +++ b/public/images/line-icons/icon-flag.svg @@ -1,12 +1 @@ - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-github-outline.svg b/public/images/line-icons/icon-github-outline.svg index 44126149..4add8786 100644 --- a/public/images/line-icons/icon-github-outline.svg +++ b/public/images/line-icons/icon-github-outline.svg @@ -1,31 +1 @@ - - - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-hash.svg b/public/images/line-icons/icon-hash.svg index 6bcd4ad9..2156fbf5 100644 --- a/public/images/line-icons/icon-hash.svg +++ b/public/images/line-icons/icon-hash.svg @@ -1,10 +1 @@ - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-help-teal.svg b/public/images/line-icons/icon-help-teal.svg new file mode 100644 index 00000000..862d8f2e --- /dev/null +++ b/public/images/line-icons/icon-help-teal.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/line-icons/icon-help.svg b/public/images/line-icons/icon-help.svg index f89280b5..d99f9b15 100644 --- a/public/images/line-icons/icon-help.svg +++ b/public/images/line-icons/icon-help.svg @@ -1,19 +1 @@ - - - - - - - - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-key.svg b/public/images/line-icons/icon-key.svg index c7456f17..5a6e808a 100644 --- a/public/images/line-icons/icon-key.svg +++ b/public/images/line-icons/icon-key.svg @@ -1,11 +1 @@ - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-lang.svg b/public/images/line-icons/icon-lang.svg index 358a4321..5121c451 100644 --- a/public/images/line-icons/icon-lang.svg +++ b/public/images/line-icons/icon-lang.svg @@ -1,22 +1 @@ - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-linux.svg b/public/images/line-icons/icon-linux.svg index 7160b093..9f4ffb23 100644 --- a/public/images/line-icons/icon-linux.svg +++ b/public/images/line-icons/icon-linux.svg @@ -1,32 +1 @@ - - - - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-mac.svg b/public/images/line-icons/icon-mac.svg index b94277a3..ae6952f8 100644 --- a/public/images/line-icons/icon-mac.svg +++ b/public/images/line-icons/icon-mac.svg @@ -1,28 +1 @@ - - - - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-removelog.svg b/public/images/line-icons/icon-removelog.svg index 42d3abae..5627073b 100644 --- a/public/images/line-icons/icon-removelog.svg +++ b/public/images/line-icons/icon-removelog.svg @@ -1,21 +1 @@ - - - - - - - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-scales.svg b/public/images/line-icons/icon-scales.svg index cd8a27a5..132b7388 100644 --- a/public/images/line-icons/icon-scales.svg +++ b/public/images/line-icons/icon-scales.svg @@ -1,15 +1 @@ - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-settings-teal.svg b/public/images/line-icons/icon-settings-teal.svg new file mode 100644 index 00000000..d5d2ba76 --- /dev/null +++ b/public/images/line-icons/icon-settings-teal.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/line-icons/icon-settings.svg b/public/images/line-icons/icon-settings.svg index 79e576a9..2ec18fb6 100644 --- a/public/images/line-icons/icon-settings.svg +++ b/public/images/line-icons/icon-settings.svg @@ -1,24 +1 @@ - - - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-stopwatch.svg b/public/images/line-icons/icon-stopwatch.svg index 3d171829..ca427aa6 100644 --- a/public/images/line-icons/icon-stopwatch.svg +++ b/public/images/line-icons/icon-stopwatch.svg @@ -1,27 +1 @@ - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-trash-disabled.svg b/public/images/line-icons/icon-trash-disabled.svg index b73d08d7..1604bfc3 100644 --- a/public/images/line-icons/icon-trash-disabled.svg +++ b/public/images/line-icons/icon-trash-disabled.svg @@ -1,23 +1 @@ - - - - - - - - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-trash-red.svg b/public/images/line-icons/icon-trash-red.svg new file mode 100644 index 00000000..4124e773 --- /dev/null +++ b/public/images/line-icons/icon-trash-red.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/line-icons/icon-trash.svg b/public/images/line-icons/icon-trash.svg index 4de499d3..d404ea86 100644 --- a/public/images/line-icons/icon-trash.svg +++ b/public/images/line-icons/icon-trash.svg @@ -1,20 +1 @@ - - - - - - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-trigger-teal.svg b/public/images/line-icons/icon-trigger-teal.svg new file mode 100644 index 00000000..5afce2cf --- /dev/null +++ b/public/images/line-icons/icon-trigger-teal.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/line-icons/icon-trigger-white.svg b/public/images/line-icons/icon-trigger-white.svg new file mode 100644 index 00000000..b0ef099d --- /dev/null +++ b/public/images/line-icons/icon-trigger-white.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/line-icons/icon-trigger.svg b/public/images/line-icons/icon-trigger.svg index 804aab41..3aa2be9b 100644 --- a/public/images/line-icons/icon-trigger.svg +++ b/public/images/line-icons/icon-trigger.svg @@ -1,11 +1 @@ - - - - - - - + \ No newline at end of file diff --git a/public/images/line-icons/icon-view.svg b/public/images/line-icons/icon-view.svg index dfd50eef..138ffe99 100644 --- a/public/images/line-icons/icon-view.svg +++ b/public/images/line-icons/icon-view.svg @@ -1,16 +1 @@ - - - - - - - - - - - - + \ No newline at end of file From 8cf9be6adcbe476432ae038101d34c32c416d62f Mon Sep 17 00:00:00 2001 From: Lisa P Date: Wed, 9 Dec 2015 15:52:24 +0100 Subject: [PATCH 02/10] refactor some of the icon styles an usages --- app/styles/app/layouts/jobs.sass | 22 ------------- app/styles/app/modules/build-header.sass | 30 ------------------ app/styles/app/modules/icons.sass | 38 +++++++++++++++++------ app/templates/components/build-header.hbs | 22 +++++++++---- 4 files changed, 45 insertions(+), 67 deletions(-) diff --git a/app/styles/app/layouts/jobs.sass b/app/styles/app/layouts/jobs.sass index 5bbbb43e..7ee297b7 100644 --- a/app/styles/app/layouts/jobs.sass +++ b/app/styles/app/layouts/jobs.sass @@ -156,25 +156,3 @@ .job-duration flex: 1 0 14% padding-right: 1em -.icon-clock - display: inline-block - width: 16px - height: 20px - margin-right: .3em - vertical-align: middle - background: - size: auto 20px - position: -2px 0 - @extend %icon-line-clock - -.icon-calendar - display: inline-block - width: 16px - height: 18px - margin-right: .3em - vertical-align: middle - background: - size: auto 18px - position: -1px 0 - @extend %icon-line-calendar - diff --git a/app/styles/app/modules/build-header.sass b/app/styles/app/modules/build-header.sass index 90a14468..16606615 100644 --- a/app/styles/app/modules/build-header.sass +++ b/app/styles/app/modules/build-header.sass @@ -89,35 +89,5 @@ margin: 1rem 0 list-style: none line-height: 1.7 - - .commit-commit, - .commit-compare - @extend %icon-line-commit - padding-left: 1.7em - background: - size: auto 23px - repeat: no-repeat - position: -11px -1px .commit-clock - @extend %icon-line-clock - padding-left: 1.7em margin-bottom: 1rem - background: - size: auto 22px - repeat: no-repeat - position: 0 2px - .commit-calendar - @extend %icon-line-calendar - padding-left: 1.7em - background: - size: auto 20px - repeat: no-repeat - position: 1px 3px - .commit-stopwatch - @extend %icon-line-stopwatch - padding-left: 1.7em - background: - size: auto 18px - repeat: no-repeat - position: 4px 3px - diff --git a/app/styles/app/modules/icons.sass b/app/styles/app/modules/icons.sass index 5ec193ba..573f9071 100644 --- a/app/styles/app/modules/icons.sass +++ b/app/styles/app/modules/icons.sass @@ -1,5 +1,6 @@ %icon display: inline-block + vertical-align: middle background: size: 100% repeat: no-repeat @@ -53,19 +54,19 @@ .icon-key @extend %icon @extend %icon-line-key - width: 1.2em - height: 1.3em + width: 20px + height: 20px background-position: 0 6px - margin-right: .3em + margin-right: .1em %icon-line-fingerprint background-image: inline-image('line-icons/icon-fingerprint.svg') .icon-fingerprint @extend %icon @extend %icon-line-fingerprint - width: 1.3em - height: 1.3em - margin-right: .3em + width: 20px + height: 20px + margin-right: .1em %icon-line-calendar background-image: inline-image('line-icons/icon-cal.svg') @@ -73,16 +74,36 @@ .icon-cal, .icon-calendar @extend %icon - @extend %icon-line-fingre + @extend %icon-line-calendar + width: 20px + height: 18px + margin-right: .1em + background: + size: auto 20px + position: -1px 0 %icon-line-clock background-image: inline-image('line-icons/icon-clock.svg') -.icon-line-clock +.icon-clock @extend %icon @extend %icon-line-clock + width: 20px + height: 20px + margin-right: .1em + background: + size: auto 21px + position: -2px 0 %icon-line-stopwatch background-image: inline-image('line-icons/icon-stopwatch.svg') +.icon-stopwatch + @extend %icon + @extend %icon-line-stopwatch + width: 20px + height: 18px + margin-right: .1em + background-size: auto 18px + background-position: 1px 0 .icon-line-build @extend %icon @@ -94,7 +115,6 @@ @extend %icon @extend %icon-line-commit - %icon-line-eye background-image:inline-image('line-icons/icon-view.svg') diff --git a/app/templates/components/build-header.hbs b/app/templates/components/build-header.hbs index d7897cdf..442eeaed 100644 --- a/app/templates/components/build-header.hbs +++ b/app/templates/components/build-header.hbs @@ -19,15 +19,19 @@

{{#if commit.authorName}} - {{commit.authorName}} authored{{#if commit.authorIsCommitter}} and committed{{/if}} + {{commit.authorName}} authored{{#if commit.authorIsCommitter}} and committed{{/if}} {{/if}} {{#unless commit.authorIsCommitter}} {{#if commit.committerName}} - {{commit.committerName}} committed + {{commit.committerName}} committed {{/if}} {{/unless}}

diff --git a/app/templates/components/builds-item.hbs b/app/templates/components/builds-item.hbs index 081e190f..7af0d5ea 100644 --- a/app/templates/components/builds-item.hbs +++ b/app/templates/components/builds-item.hbs @@ -20,7 +20,7 @@ {{/unless}}
- {{build.commit.committerName}} avatar + {{build.commit.authorName}} avatar {{build.commit.committerName}}
From 83bb882475cf8f991dd34f6e341570fad1c04d78 Mon Sep 17 00:00:00 2001 From: Jonas Weber Date: Fri, 1 Jan 2016 17:11:17 +0100 Subject: [PATCH 09/10] Show author name and author avatar on builds list --- app/templates/components/builds-item.hbs | 2 +- tests/unit/components/builds-item-test.coffee | 1 - tests/unit/models/commit-test.coffee | 25 +++++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 tests/unit/models/commit-test.coffee diff --git a/app/templates/components/builds-item.hbs b/app/templates/components/builds-item.hbs index 7af0d5ea..629f8127 100644 --- a/app/templates/components/builds-item.hbs +++ b/app/templates/components/builds-item.hbs @@ -21,7 +21,7 @@
{{build.commit.authorName}} avatar - {{build.commit.committerName}} + {{build.commit.authorName}}
diff --git a/tests/unit/components/builds-item-test.coffee b/tests/unit/components/builds-item-test.coffee index eb1bbbee..4c449367 100644 --- a/tests/unit/components/builds-item-test.coffee +++ b/tests/unit/components/builds-item-test.coffee @@ -32,5 +32,4 @@ test 'it renders', (assert) -> ok component.$().hasClass('passed'), 'component has right status class' equal component.$('.row-branch a').text().trim(), 'foobarbranch', 'component renders branch if event is push' - equal component.$('.avatar').attr('src'), 'https://www.gravatar.com/avatar/5c1e6d6e64e12aca17657581a48005d1?s=40&d=https%3A%2F%2Ftravis-ci.org%2Fimages%2Fui%2Fdefault-avatar.png', 'component renders right gravatar image' equal component.$('a[title="See the commit on GitHub"]').attr('href'), 'https://github.com/foo/bar/commit/a5e8093098f9c0fb46856b753fb8943c7fbf26f3', 'component generates right commit link' diff --git a/tests/unit/models/commit-test.coffee b/tests/unit/models/commit-test.coffee new file mode 100644 index 00000000..d22dddee --- /dev/null +++ b/tests/unit/models/commit-test.coffee @@ -0,0 +1,25 @@ +`import { moduleForModel, test } from 'ember-qunit'` + +moduleForModel 'commit', 'Unit | Model | commit', needs: ['model:build'] + +test 'calculation of avatar urls via Gravatar', -> + model = @subject() + Ember.run -> + model.setProperties + authorEmail: 'author@example.com' + committerEmail: 'author@example.com' + authorAvatarUrl: null + committerAvatarUrl: null + equal model.get('authorAvatarUrlOrGravatar'), 'https://www.gravatar.com/avatar/5c1e6d6e64e12aca17657581a48005d1?s=40&d=https%3A%2F%2Ftravis-ci.org%2Fimages%2Fui%2Fdefault-avatar.png', 'correctly sets gravatar image' + equal model.get('committerAvatarUrlOrGravatar'), 'https://www.gravatar.com/avatar/5c1e6d6e64e12aca17657581a48005d1?s=40&d=https%3A%2F%2Ftravis-ci.org%2Fimages%2Fui%2Fdefault-avatar.png', 'correctly sets gravatar image' + +test 'calculation of avatar urls via overriding parameter', -> + model = @subject() + Ember.run -> + model.setProperties + authorEmail: 'author@example.com' + committerEmail: 'author@example.com' + authorAvatarUrl: 'http://example.com/test.jpg' + committerAvatarUrl: 'http://example.com/test2.jpg' + equal model.get('authorAvatarUrlOrGravatar'), 'http://example.com/test.jpg', 'correctly sets avatar' + equal model.get('committerAvatarUrlOrGravatar'), 'http://example.com/test2.jpg', 'correctly sets avatar' From b68ae942a64a029a18a1db4c111034beb947aad1 Mon Sep 17 00:00:00 2001 From: Jonas Weber Date: Fri, 1 Jan 2016 17:27:29 +0100 Subject: [PATCH 10/10] Drop unneeded imports for gravatarImage --- app/components/branch-row.coffee | 1 - app/controllers/branches.coffee | 1 - app/controllers/build.coffee | 1 - app/views/job.coffee | 10 +--------- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/app/components/branch-row.coffee b/app/components/branch-row.coffee index 5a90c21d..bb40ad55 100644 --- a/app/components/branch-row.coffee +++ b/app/components/branch-row.coffee @@ -1,5 +1,4 @@ `import Ember from 'ember'` -`import { gravatarImage } from 'travis/utils/urls'` `import { githubCommit as githubCommitUrl } from 'travis/utils/urls'` `import TravisRoute from 'travis/routes/basic'` `import config from 'travis/config/environment'` diff --git a/app/controllers/branches.coffee b/app/controllers/branches.coffee index e2b73697..528573df 100644 --- a/app/controllers/branches.coffee +++ b/app/controllers/branches.coffee @@ -1,5 +1,4 @@ `import Ember from 'ember'` -`import { gravatarImage } from 'travis/utils/urls'` `import GithubUrlPropertievs from 'travis/mixins/github-url-properties'` BranchesController = Ember.Controller.extend diff --git a/app/controllers/build.coffee b/app/controllers/build.coffee index 433dd49d..fcf82f19 100644 --- a/app/controllers/build.coffee +++ b/app/controllers/build.coffee @@ -1,5 +1,4 @@ `import Ember from 'ember'` -`import { gravatarImage } from 'travis/utils/urls'` `import GithubUrlPropertievs from 'travis/mixins/github-url-properties'` Controller = Ember.Controller.extend GithubUrlPropertievs, diff --git a/app/views/job.coffee b/app/views/job.coffee index f9d93bbd..41cc3c96 100644 --- a/app/views/job.coffee +++ b/app/views/job.coffee @@ -1,6 +1,6 @@ `import Ember from 'ember'` `import { colorForState } from 'travis/utils/helpers'` -`import { githubCommit, gravatarImage } from 'travis/utils/urls'` +`import { githubCommit } from 'travis/utils/urls'` `import Polling from 'travis/mixins/polling'` View = Ember.View.extend Polling, @@ -20,12 +20,4 @@ View = Ember.View.extend Polling, githubCommit(@get('repo.slug'), @get('commit.sha')) ).property('repo.slug', 'commit.sha') - urlCommitterGravatarImage: (-> - gravatarImage(@get('commit.committerEmail'), 40) - ).property('commit.committerEmail') - - urlAuthorGravatarImage: (-> - gravatarImage(@get('commit.authorEmail'), 40) - ).property('commit.authorEmail') - `export default View`