try two-line /builds
fix white ghosting on api icon check requests for existing branch tweak cc icon tweak settings fields try hover over settigns menu
This commit is contained in:
Lisa P
parent
0b1bd7d090
commit
9baadcfd9e
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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%
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,25 +1,27 @@
|
|||
<div class="two-line fade-out">
|
||||
<h2 class="row-item {{build.state}}">
|
||||
{{status-icon status=build.state}}
|
||||
{{#if build.isPullRequest}}
|
||||
{{#link-to "build" build.repo build}}
|
||||
<small>PR #{{build.pullRequestNumber}}</small>
|
||||
{{{format-message build.pullRequestTitle short="true" repoBinding=build.repo}}}
|
||||
{{/link-to}}
|
||||
{{else}}
|
||||
{{#link-to "build" build.repo build}}
|
||||
{{build.commit.branch}}
|
||||
{{/link-to}}
|
||||
{{/if}}
|
||||
</h2>
|
||||
<div class="row-item row-committer">
|
||||
<div class="row-item build-info">
|
||||
<h2 class="row-branch {{build.state}}">
|
||||
{{status-icon status=build.state}}
|
||||
{{#if build.isPullRequest}}
|
||||
{{#link-to "build" build.repo build}}
|
||||
<small>PR #{{build.pullRequestNumber}}</small>
|
||||
{{{format-message build.pullRequestTitle short="true" repoBinding=build.repo}}}
|
||||
{{/link-to}}
|
||||
{{else}}
|
||||
{{#link-to "build" build.repo build}}
|
||||
{{build.commit.branch}}
|
||||
{{/link-to}}
|
||||
{{/if}}
|
||||
</h2>
|
||||
{{#unless build.isPullRequest}}
|
||||
<div class="row-message">
|
||||
{{{format-message build.commit.message short="true" repoBinding=build.repo}}}
|
||||
</div>
|
||||
{{/unless}}
|
||||
</div>
|
||||
<div class="row-item row-committer">
|
||||
<img class="avatar" src={{urlAuthorGravatarImage}} alt="{{build.commit.committerName}} avatar">
|
||||
<span class="label-align">{{build.commit.committerName}} committed</span>
|
||||
<span class="label-align">{{build.commit.committerName}}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<a href="#" {{action "menu"}} class="settings-button" type="" title="Open settings menu">Settings</a>
|
||||
<a {{action "menu"}} class="settings-button" type="" title="Open settings menu">Settings</a>
|
||||
<ul class="settings-dropdown">
|
||||
{{#if displaySettingsLink}}
|
||||
<li>
|
||||
|
|
|
|||
|
|
@ -1,52 +1,15 @@
|
|||
{{#if isEmpty}}
|
||||
<svg version="1.1" id="Layer_1" x="0px" y="0px"
|
||||
viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">
|
||||
<g id="Push">
|
||||
<path fill="#A7AEAE" d="M16.9,9.4h-3.5c-0.3-1.6-1.7-2.8-3.4-2.8S6.9,7.8,6.6,9.4H3.1c-0.3,0-0.6,0.3-0.6,0.6s0.3,0.6,0.6,0.6h3.5
|
||||
c0.3,1.6,1.7,2.8,3.4,2.8s3.1-1.2,3.4-2.8h3.5c0.3,0,0.6-0.3,0.6-0.6S17.2,9.4,16.9,9.4z M10,12.2c-1.2,0-2.2-1-2.2-2.2
|
||||
c0-1.2,1-2.2,2.2-2.2c1.2,0,2.2,1,2.2,2.2c0,0,0,0,0,0c0,0,0,0,0,0C12.2,11.2,11.2,12.2,10,12.2z"/>
|
||||
</g>
|
||||
</svg>
|
||||
<svg viewBox="0 0 20 20"><path fill="#A7AEAE" d="M16.9 9.4h-3.5c-.3-1.6-1.7-2.8-3.4-2.8S6.9 7.8 6.6 9.4H3.1c-.3 0-.6.3-.6.6s.3.6.6.6h3.5c.3 1.6 1.7 2.8 3.4 2.8s3.1-1.2 3.4-2.8h3.5c.3 0 .6-.3.6-.6s-.3-.6-.6-.6zM10 12.2c-1.2 0-2.2-1-2.2-2.2 0-1.2 1-2.2 2.2-2.2 1.2 0 2.2 1 2.2 2.2 0 1.2-1 2.2-2.2 2.2z"/></svg>
|
||||
{{else}}
|
||||
{{#if isPush}}
|
||||
<svg version="1.1" id="Layer_1" x="0px" y="0px"
|
||||
viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">
|
||||
<g id="Push">
|
||||
<path fill="#A7AEAE" d="M16.9,9.4h-3.5c-0.3-1.6-1.7-2.8-3.4-2.8S6.9,7.8,6.6,9.4H3.1c-0.3,0-0.6,0.3-0.6,0.6s0.3,0.6,0.6,0.6h3.5
|
||||
c0.3,1.6,1.7,2.8,3.4,2.8s3.1-1.2,3.4-2.8h3.5c0.3,0,0.6-0.3,0.6-0.6S17.2,9.4,16.9,9.4z M10,12.2c-1.2,0-2.2-1-2.2-2.2
|
||||
c0-1.2,1-2.2,2.2-2.2c1.2,0,2.2,1,2.2,2.2c0,0,0,0,0,0c0,0,0,0,0,0C12.2,11.2,11.2,12.2,10,12.2z"/>
|
||||
</g>
|
||||
</svg>
|
||||
<svg viewBox="0 0 20 20"><path fill="#A7AEAE" d="M16.9 9.4h-3.5c-.3-1.6-1.7-2.8-3.4-2.8S6.9 7.8 6.6 9.4H3.1c-.3 0-.6.3-.6.6s.3.6.6.6h3.5c.3 1.6 1.7 2.8 3.4 2.8s3.1-1.2 3.4-2.8h3.5c.3 0 .6-.3.6-.6s-.3-.6-.6-.6zM10 12.2c-1.2 0-2.2-1-2.2-2.2 0-1.2 1-2.2 2.2-2.2 1.2 0 2.2 1 2.2 2.2 0 1.2-1 2.2-2.2 2.2z"/></svg>
|
||||
{{/if}}
|
||||
|
||||
{{#if isPR}}
|
||||
<svg version="1.1" id="Layer_1" x="0px" y="0px"
|
||||
viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">
|
||||
<g id="Pull">
|
||||
<path fill="#A7AEAE" d="M8,4.5C8,3.1,6.9,2,5.5,2S3,3.1,3,4.5c0,1.1,0.8,2.1,1.8,2.4v6.5c-1,0.3-1.8,1.2-1.8,2.4
|
||||
c0,1.4,1.1,2.5,2.5,2.5S8,17,8,15.7c0-1.1-0.8-2.1-1.8-2.4V6.8C7.2,6.6,8,5.6,8,4.5z M4.3,4.5c0-0.6,0.5-1.2,1.2-1.2
|
||||
s1.2,0.5,1.2,1.2S6.1,5.6,5.5,5.6S4.3,5.1,4.3,4.5z M6.7,15.7c0,0.6-0.5,1.2-1.2,1.2s-1.2-0.5-1.2-1.2s0.5-1.2,1.2-1.2
|
||||
S6.7,15,6.7,15.7z"/>
|
||||
<path fill="#A7AEAE" d="M15.1,13.3v-6c0-1-0.3-1.9-0.9-2.4c-1-0.9-2.4-0.8-2.4-0.8h-1c0.3-0.3,0.7-0.7,1-1c0.3-0.3,0.3-0.7,0-0.9
|
||||
s-0.7-0.3-0.9,0c-1.2,1.2-1.7,1.7-2,2C8.8,4.2,8.7,4.3,8.6,4.4c0,0.1,0,0.1,0,0.2c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
|
||||
c0,0,0,0,0,0c0,0.1,0,0.1,0,0.2c0,0.1,0.1,0.2,0.2,0.3c0.3,0.3,0.8,0.9,2,2c0.1,0.1,0.3,0.2,0.5,0.2s0.3-0.1,0.5-0.2
|
||||
c0.3-0.3,0.3-0.7,0-0.9c-0.3-0.3-0.7-0.7-1-1l1,0c0,0,0.9,0,1.5,0.5c0.3,0.3,0.5,0.8,0.5,1.5v6.1c-1,0.3-1.8,1.2-1.8,2.4
|
||||
c0,1.4,1.1,2.5,2.5,2.5S17,17,17,15.7C17,14.5,16.2,13.6,15.1,13.3z M14.5,16.8c-0.6,0-1.2-0.5-1.2-1.2s0.5-1.2,1.2-1.2
|
||||
s1.2,0.5,1.2,1.2S15.1,16.8,14.5,16.8z"/>
|
||||
</g>
|
||||
</svg>
|
||||
<svg viewBox="0 0 20 20"><g fill="#A7AEAE"><path d="M8 4.5C8 3.1 6.9 2 5.5 2S3 3.1 3 4.5c0 1.1.8 2.1 1.8 2.4v6.5c-1 .3-1.8 1.2-1.8 2.4 0 1.4 1.1 2.5 2.5 2.5S8 17 8 15.7c0-1.1-.8-2.1-1.8-2.4V6.8C7.2 6.6 8 5.6 8 4.5zm-3.7 0c0-.6.5-1.2 1.2-1.2s1.2.5 1.2 1.2-.6 1.1-1.2 1.1-1.2-.5-1.2-1.1zm2.4 11.2c0 .6-.5 1.2-1.2 1.2s-1.2-.5-1.2-1.2.5-1.2 1.2-1.2 1.2.5 1.2 1.2zM15.1 13.3v-6c0-1-.3-1.9-.9-2.4-1-.9-2.4-.8-2.4-.8h-1l1-1c.3-.3.3-.7 0-.9s-.7-.3-.9 0l-2 2c-.1 0-.2.1-.3.2v.4c0 .1.1.2.2.3.3.3.8.9 2 2 .1.1.3.2.5.2s.3-.1.5-.2c.3-.3.3-.7 0-.9l-1-1h1s.9 0 1.5.5c.3.3.5.8.5 1.5v6.1c-1 .3-1.8 1.2-1.8 2.4 0 1.4 1.1 2.5 2.5 2.5S17 17 17 15.7c0-1.2-.8-2.1-1.9-2.4zm-.6 3.5c-.6 0-1.2-.5-1.2-1.2s.5-1.2 1.2-1.2 1.2.5 1.2 1.2-.6 1.2-1.2 1.2z"/></g></svg>
|
||||
{{/if}}
|
||||
|
||||
{{#if isAPI}}
|
||||
<svg version="1.1" id="Layer_1" x="0px" y="0px"
|
||||
viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">
|
||||
<g id="API">
|
||||
<path fill="#A7AEAE" d="M16.2,15.6H3.8c-0.8,0-1.5-0.7-1.5-1.6V8.5c0-0.8,0.7-1.6,1.5-1.6h0.3v-1c0-0.8,0.7-1.6,1.5-1.6h2.5
|
||||
c0.8,0,1.5,0.7,1.5,1.6v1h0.6v-1c0-0.8,0.7-1.6,1.5-1.6h2.6c0.8,0,1.5,0.7,1.5,1.6v1h0.5c0.8,0,1.5,0.7,1.5,1.6v5.6
|
||||
C17.6,14.9,17,15.6,16.2,15.6z M3.8,8.2c0,0-0.2,0.1-0.2,0.3v5.6c0,0,0,0.3,0.2,0.3h12.4c0,0,0.2-0.1,0.2-0.3V8.5
|
||||
c0,0,0-0.3-0.2-0.3H15c-0.4,0-0.6-0.3-0.6-0.6V5.9c0,0,0-0.3-0.2-0.3h-2.6c0,0-0.2,0.1-0.2,0.3v1.6c0,0.4-0.3,0.6-0.6,0.6H8.9
|
||||
c-0.4,0-0.6-0.3-0.6-0.6V5.9c0,0,0-0.3-0.2-0.3H5.6c0,0-0.2,0.1-0.2,0.3v1.6c0,0.4-0.3,0.6-0.6,0.6H3.8z"/>
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 170.08 170.08"><path fill="#A7AEAE" d="M137.765 132.663H32.315c-6.803 0-12.756-5.953-12.756-13.607V72.284c0-6.803 5.952-13.606 12.755-13.606h2.55v-8.504c0-6.803 5.954-13.606 12.757-13.606h21.26c6.803 0 12.756 5.953 12.756 13.606v8.504h5.103v-8.504c0-6.803 5.954-13.606 12.757-13.606h22.11c6.804 0 12.756 5.953 12.756 13.606v8.504h4.252c6.804 0 12.756 5.953 12.756 13.606v47.622c-1.7 6.804-6.803 12.757-13.605 12.757zm-105.45-62.93s-1.7.85-1.7 2.55v47.623s0 2.552 1.7 2.552h105.45s1.7-.85 1.7-2.552V72.284s0-2.55-1.7-2.55H127.56c-3.4 0-5.102-2.552-5.102-5.104V50.174s0-2.55-1.7-2.55h-22.11s-1.7.85-1.7 2.55V63.78c0 3.4-2.553 5.102-5.105 5.102H75.686c-3.4 0-5.103-2.55-5.103-5.102V50.174s0-2.55-1.7-2.55h-21.26s-1.702.85-1.702 2.55V63.78c0 3.4-2.55 5.102-5.1 5.102h-8.505v.85z"/></svg>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,9 @@
|
|||
{{#if request.isPullRequest}}
|
||||
<strong class="label-align">#{{request.pullRequestNumber}}</strong>
|
||||
{{else}}
|
||||
<strong class="label-align">{{request.branchName}}</strong>
|
||||
{{#if hasBranchName}}
|
||||
<strong class="label-align">{{request.branchName}}</strong>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
<span class="label-align">{{github-commit-link request.repo.slug request.commit.sha}}</span>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,16 @@
|
|||
<svg version="1.1" id="Layer_1" x="0px" y="0px"
|
||||
viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">
|
||||
<g id="API">
|
||||
<path fill="#A7AEAE" d="M16.2,15.6H3.8c-0.8,0-1.5-0.7-1.5-1.6V8.5c0-0.8,0.7-1.6,1.5-1.6h0.3v-1c0-0.8,0.7-1.6,1.5-1.6h2.5
|
||||
c0.8,0,1.5,0.7,1.5,1.6v1h0.6v-1c0-0.8,0.7-1.6,1.5-1.6h2.6c0.8,0,1.5,0.7,1.5,1.6v1h0.5c0.8,0,1.5,0.7,1.5,1.6v5.6
|
||||
C17.6,14.9,17,15.6,16.2,15.6z M3.8,8.2c0,0-0.2,0.1-0.2,0.3v5.6c0,0,0,0.3,0.2,0.3h12.4c0,0,0.2-0.1,0.2-0.3V8.5
|
||||
c0,0,0-0.3-0.2-0.3H15c-0.4,0-0.6-0.3-0.6-0.6V5.9c0,0,0-0.3-0.2-0.3h-2.6c0,0-0.2,0.1-0.2,0.3v1.6c0,0.4-0.3,0.6-0.6,0.6H8.9
|
||||
c-0.4,0-0.6-0.3-0.6-0.6V5.9c0,0,0-0.3-0.2-0.3H5.6c0,0-0.2,0.1-0.2,0.3v1.6c0,0.4-0.3,0.6-0.6,0.6H3.8z"/>
|
||||
</g>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
width="170.08px" height="170.08px" viewBox="0 0 170.08 170.08" enable-background="new 0 0 170.08 170.08" xml:space="preserve">
|
||||
<g id="API">
|
||||
<path fill="#A7AEAE" d="M137.765,132.663H32.315c-6.803,0-12.756-5.953-12.756-13.607V72.284c0-6.803,5.953-13.606,12.756-13.606
|
||||
h2.551v-8.504c0-6.803,5.953-13.606,12.756-13.606h21.26c6.803,0,12.756,5.953,12.756,13.606v8.504h5.103v-8.504
|
||||
c0-6.803,5.953-13.606,12.756-13.606h22.11c6.804,0,12.756,5.953,12.756,13.606v8.504h4.252c6.804,0,12.756,5.953,12.756,13.606
|
||||
v47.622C149.671,126.71,144.567,132.663,137.765,132.663z M32.315,69.733c0,0-1.701,0.85-1.701,2.551v47.622
|
||||
c0,0,0,2.552,1.701,2.552h105.449c0,0,1.701-0.851,1.701-2.552V72.284c0,0,0-2.551-1.701-2.551H127.56
|
||||
c-3.4,0-5.102-2.551-5.102-5.103V50.174c0,0,0-2.551-1.701-2.551h-22.11c0,0-1.7,0.85-1.7,2.551V63.78
|
||||
c0,3.401-2.552,5.102-5.104,5.102H75.686c-3.401,0-5.103-2.551-5.103-5.102V50.174c0,0,0-2.551-1.701-2.551h-21.26
|
||||
c0,0-1.701,0.85-1.701,2.551V63.78c0,3.401-2.551,5.102-5.102,5.102h-8.504V69.733z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 753 B After Width: | Height: | Size: 1.4 KiB |
Loading…
Reference in New Issue
Block a user