diff --git a/app/components/requests-item.coffee b/app/components/requests-item.coffee index 39187c7f..c0a4382f 100644 --- a/app/components/requests-item.coffee +++ b/app/components/requests-item.coffee @@ -27,6 +27,10 @@ RequestsItemComponent = Ember.Component.extend 'Rejected' ).property('request.isAccepted') + hasBranchName: (-> + @get('request.branchName') + ).property('request') + message: (-> message = @get('request.message') if config.pro && message == "private repository" diff --git a/app/styles/app/_mixins/mixins.sass b/app/styles/app/_mixins/mixins.sass index 554140b1..f4fe8390 100644 --- a/app/styles/app/_mixins/mixins.sass +++ b/app/styles/app/_mixins/mixins.sass @@ -69,7 +69,7 @@ // @todo simplyfiy coloring mixins =colorStatusIcons($color, $status) .status-icon.#{$status} - svg g > * + svg * fill: $color =statusColors($color, $status, $width, $color2: $color, $building:false) diff --git a/app/styles/app/layouts/pull-requests.sass b/app/styles/app/layouts/pull-requests.sass index c56b92a4..f3197733 100644 --- a/app/styles/app/layouts/pull-requests.sass +++ b/app/styles/app/layouts/pull-requests.sass @@ -13,15 +13,35 @@ .two-line padding: 0 margin: .4em 0 - .row-item + .row-item:not(.build-info) display: block .row-committer padding-left: 1.6em margin-bottom: 0 + .build-info + display: flex + flex-flow: row wrap + align-items: baseline + + .row-branch + flex: 1 0 18% + position: relative + overflow: hidden + &:after + content: "" + +fadeOut(right, -90deg, $white) + &:hover + overflow: visible + &:after + content: none + a + background-color: white + .row-message - margin-bottom: .5em + padding-left: 1.6em + flex: 1 1 50% .two-line:first-of-type flex: 0 0 55% diff --git a/app/styles/app/layouts/repo.sass b/app/styles/app/layouts/repo.sass index 66cfccfb..365ccc13 100644 --- a/app/styles/app/layouts/repo.sass +++ b/app/styles/app/layouts/repo.sass @@ -74,7 +74,8 @@ $dropdown-button-margin: -9px @extend %icon-line-dropdown &:hover, &:active, - .display & + // .display &, + .settings-menu:hover & color: $teal border-color: $teal @extend %icon-line-cog-teal @@ -107,7 +108,12 @@ $dropdown-button-margin: -9px .settings-menu position: relative - &.display - .settings-dropdown - display: block + @media #{$small-only} + &.display + .settings-dropdown + display: block + @media #{$medium-up} + &:hover + .settings-dropdown + display: block diff --git a/app/styles/app/layouts/requests.sass b/app/styles/app/layouts/requests.sass index 30b58eff..d93b85ec 100644 --- a/app/styles/app/layouts/requests.sass +++ b/app/styles/app/layouts/requests.sass @@ -1,6 +1,9 @@ =requestFadeOut($status, $color) @media #{$medium-up} &.#{$status}:hover + .status-icon.api + svg + background-color: $color .fade-out &:after @include fadeOut(right, -90deg, $color) @@ -29,6 +32,8 @@ width: 1.3em height: 1.3em vertical-align: middle + &.api + width: 1.2em !important a:hover, a:active diff --git a/app/styles/app/layouts/settings.sass b/app/styles/app/layouts/settings.sass index 4a4e88f6..11446efa 100644 --- a/app/styles/app/layouts/settings.sass +++ b/app/styles/app/layouts/settings.sass @@ -79,6 +79,7 @@ vertical-align: middle overflow: hidden white-space: nowrap + color: #8e8f8e &:after content: "" @include fadeOut(right, -90deg, #F6F5F5) @@ -133,7 +134,7 @@ input display: inline-block width: 100% - padding: 0.6em 0.5em 0.7em 2.6em + padding: 0.6em 0.5em 0.7em 1.1em border-radius: 4px border: none background-color: #eeedec @@ -146,7 +147,7 @@ .is-public & input background-image: none; - padding: 0.4em 0 0.5em 0.9em; + padding: 0.3em 0 0.4em 0.9em; font-size: 14px; %settings-action-section diff --git a/app/styles/app/modules/buttons.sass b/app/styles/app/modules/buttons.sass index ce748adf..9b51f96b 100644 --- a/app/styles/app/modules/buttons.sass +++ b/app/styles/app/modules/buttons.sass @@ -149,7 +149,7 @@ $button-border-color: #d4d4d4 @extend %icon-line-codeclimate background: repeat: no-repeat - size: auto 10px + size: auto 9px position: 4px 8px &:hover @extend %icon-line-codeclimate-teal diff --git a/app/templates/components/builds-item.hbs b/app/templates/components/builds-item.hbs index 706eccb2..82d7c769 100644 --- a/app/templates/components/builds-item.hbs +++ b/app/templates/components/builds-item.hbs @@ -1,25 +1,27 @@
-

- {{status-icon status=build.state}} - {{#if build.isPullRequest}} - {{#link-to "build" build.repo build}} - PR #{{build.pullRequestNumber}} - {{{format-message build.pullRequestTitle short="true" repoBinding=build.repo}}} - {{/link-to}} - {{else}} - {{#link-to "build" build.repo build}} - {{build.commit.branch}} - {{/link-to}} - {{/if}} -

-
+
+

+ {{status-icon status=build.state}} + {{#if build.isPullRequest}} + {{#link-to "build" build.repo build}} + PR #{{build.pullRequestNumber}} + {{{format-message build.pullRequestTitle short="true" repoBinding=build.repo}}} + {{/link-to}} + {{else}} + {{#link-to "build" build.repo build}} + {{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 + {{build.commit.committerName}}
diff --git a/app/templates/components/repo-show-tools.hbs b/app/templates/components/repo-show-tools.hbs index 0fa0ab27..8e74c33d 100644 --- a/app/templates/components/repo-show-tools.hbs +++ b/app/templates/components/repo-show-tools.hbs @@ -1,4 +1,4 @@ -Settings +Settings
diff --git a/public/images/line-icons/icon-api.svg b/public/images/line-icons/icon-api.svg index b626ff8c..aa1ea2b4 100644 --- a/public/images/line-icons/icon-api.svg +++ b/public/images/line-icons/icon-api.svg @@ -1,10 +1,16 @@ - - - - + + + + + + +