diff --git a/app/components/show-more-button.coffee b/app/components/show-more-button.coffee index 392824fe..744110ae 100644 --- a/app/components/show-more-button.coffee +++ b/app/components/show-more-button.coffee @@ -2,7 +2,7 @@ ShowMoreButtonComponent = Ember.Component.extend tagName: 'button' - classNames: ['button button--grey button--showmore'] + classNames: ['showmore-button'] classNameBindings: ['isLoading', 'showMore'] showMore: true attributeBindings: ['disabled'] diff --git a/app/styles/app/layouts/pull-requests.sass b/app/styles/app/layouts/pull-requests.sass index 46613c5c..7e168c43 100644 --- a/app/styles/app/layouts/pull-requests.sass +++ b/app/styles/app/layouts/pull-requests.sass @@ -8,6 +8,7 @@ display: flex justify-content: space-between flex-flow: row wrap + align-items: center .two-line padding: 0 @@ -18,6 +19,9 @@ .row-committer padding-left: 1.6em + .row-message + margin-bottom: .5em + .two-line:first-of-type flex: 0 0 55% padding-left: .5em diff --git a/app/styles/app/modules/buttons.sass b/app/styles/app/modules/buttons.sass index 0970f434..e85a0967 100644 --- a/app/styles/app/modules/buttons.sass +++ b/app/styles/app/modules/buttons.sass @@ -35,19 +35,6 @@ $button-border-color: #d4d4d4 border-bottom-color: #2356c4 background-color: #40454f -.show-more - background-color: #F2F2EB - display: inline-block - color: #666 - padding: 6px 15px - text-decoration: none - border: 1px solid #DDD -.show-more:hover - background-color: #40454F - color: $white - border: 1px solid #40454F - cursor: pointer - .button--signin, .button--signingin display: inline-block @@ -122,15 +109,6 @@ $button-border-color: #d4d4d4 &:focus background-color: #696867 -.button--showmore - height: auto - padding: 0.3em 0.7em - font-size: $font-size-m - .icon - width: 1.1em - height: 0.7em - margin-right: .5em - .button--delete @extend .button border-radius: 2px @@ -245,3 +223,13 @@ $button-border-color: #d4d4d4 .button-cancel @include buttons(#A0A8A8) +.showmore-button + padding-left: 2em + background: + repeat: no-repeat + size: auto 20px + position: 4px 1px + cursor: pointer + @extend .button--grey + @extend %icon-line-eye + diff --git a/app/styles/app/modules/icons.sass b/app/styles/app/modules/icons.sass index 1dc2d8c3..001d6d54 100644 --- a/app/styles/app/modules/icons.sass +++ b/app/styles/app/modules/icons.sass @@ -91,6 +91,9 @@ @extend %icon-line-commit +%icon-line-eye + background-image: url('data:image/svg+xml;utf8,') + %icon-line-question background-image: url('data:image/svg+xml;utf8,') %icon-line-question-teal diff --git a/app/templates/components/builds-item.hbs b/app/templates/components/builds-item.hbs index 4af52137..706eccb2 100644 --- a/app/templates/components/builds-item.hbs +++ b/app/templates/components/builds-item.hbs @@ -8,12 +8,16 @@ {{/link-to}} {{else}} {{#link-to "build" build.repo build}} - {{build.commit.branch}} - {{{format-message build.commit.message short="true" repoBinding=build.repo}}} + {{build.commit.branch}} {{/link-to}} {{/if}}
+ {{#unless build.isPullRequest}} +
+ {{{format-message build.commit.message short="true" repoBinding=build.repo}}} +
+ {{/unless}} {{build.commit.committerName}} avatar {{build.commit.committerName}} committed
diff --git a/app/templates/components/show-more-button.hbs b/app/templates/components/show-more-button.hbs index 0bb41de2..ffaa3e9b 100644 --- a/app/templates/components/show-more-button.hbs +++ b/app/templates/components/show-more-button.hbs @@ -1 +1 @@ -{{buttonLabel}} +{{buttonLabel}} diff --git a/public/images/line-icons/icon-view.svg b/public/images/line-icons/icon-view.svg index 198c0ab6..dfd50eef 100644 --- a/public/images/line-icons/icon-view.svg +++ b/public/images/line-icons/icon-view.svg @@ -1,9 +1,16 @@ - - + + + + + + + +