change some styles on dashboard
This commit is contained in:
parent
3ef64f0910
commit
a964272df2
|
@ -7,7 +7,7 @@ Route = TravisRoute.extend
|
||||||
filter: { replace: true }
|
filter: { replace: true }
|
||||||
model: ->
|
model: ->
|
||||||
apiEndpoint = config.apiEndpoint
|
apiEndpoint = config.apiEndpoint
|
||||||
$.ajax(apiEndpoint + '/v3/repos?repository.active=true&include=build.commit', {
|
$.ajax(apiEndpoint + '/v3/repos?repository.active=true&include=user.repositories,organization.repositories,build.commit', {
|
||||||
headers: {
|
headers: {
|
||||||
Authorization: 'token ' + @auth.token()
|
Authorization: 'token ' + @auth.token()
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,12 +11,13 @@
|
||||||
margin: auto
|
margin: auto
|
||||||
max-width: 1024px
|
max-width: 1024px
|
||||||
|
|
||||||
.dashboard-active li
|
.dashboard-active
|
||||||
|
|
||||||
padding: 0
|
padding: 0
|
||||||
margin: 0
|
margin: 3rem 0 5rem
|
||||||
list-style-type: none
|
list-style-type: none
|
||||||
|
|
||||||
|
.dashboard-active li
|
||||||
|
|
||||||
border: 1px solid $cream-dark
|
border: 1px solid $cream-dark
|
||||||
font-size: 16px
|
font-size: 16px
|
||||||
text-align: left
|
text-align: left
|
||||||
|
@ -39,8 +40,11 @@
|
||||||
font-size: 16px
|
font-size: 16px
|
||||||
|
|
||||||
h2
|
h2
|
||||||
padding-left: 1.5em
|
|
||||||
font-size: 18px
|
font-size: 18px
|
||||||
|
.one-line
|
||||||
|
margin-left: 2em
|
||||||
|
.two-line
|
||||||
|
padding: .1em 0
|
||||||
|
|
||||||
.row-item
|
.row-item
|
||||||
margin: .2em
|
margin: .2em
|
||||||
|
@ -71,6 +75,16 @@
|
||||||
& > div:nth-of-type(5)
|
& > div:nth-of-type(5)
|
||||||
width: 10%
|
width: 10%
|
||||||
|
|
||||||
|
h2
|
||||||
|
padding-left: 1.5em
|
||||||
|
.one-line
|
||||||
|
margin-left: 0
|
||||||
|
|
||||||
|
.dropup--blue
|
||||||
|
li
|
||||||
|
border: none
|
||||||
|
transform: translate(-19%, -170%)
|
||||||
|
|
||||||
|
|
||||||
@include statusColors($green-dark, 'passed')
|
@include statusColors($green-dark, 'passed')
|
||||||
@include statusColors($red-dark, 'failed')
|
@include statusColors($red-dark, 'failed')
|
||||||
|
|
|
@ -55,6 +55,8 @@ $dropdown-border: #C3D9DB
|
||||||
.filter-current
|
.filter-current
|
||||||
padding: .9em 0
|
padding: .9em 0
|
||||||
cursor: pointer
|
cursor: pointer
|
||||||
|
a
|
||||||
|
color: $teal-dark
|
||||||
|
|
||||||
.filter-dropdown
|
.filter-dropdown
|
||||||
@include resetul
|
@include resetul
|
||||||
|
@ -62,9 +64,10 @@ $dropdown-border: #C3D9DB
|
||||||
top: 3em
|
top: 3em
|
||||||
min-width: 14em
|
min-width: 14em
|
||||||
background-color: $white
|
background-color: $white
|
||||||
border-radius: 4px
|
border-radius: 2px
|
||||||
overflow: hidden
|
overflow: hidden
|
||||||
box-shadow: 2px 1px 4px 0px rgba(148,145,138,0.4)
|
border: 1px solid $cream-dark
|
||||||
|
border-top: none
|
||||||
z-index: 40
|
z-index: 40
|
||||||
display: none
|
display: none
|
||||||
li
|
li
|
||||||
|
@ -75,7 +78,7 @@ $dropdown-border: #C3D9DB
|
||||||
padding: 10px 10px 10px 20px
|
padding: 10px 10px 10px 20px
|
||||||
&:hover
|
&:hover
|
||||||
color: $white
|
color: $white
|
||||||
background : #5e869a
|
background : $teal-dark
|
||||||
.is-selected
|
.is-selected
|
||||||
a
|
a
|
||||||
font-weight: 600
|
font-weight: 600
|
||||||
|
|
|
@ -217,7 +217,7 @@
|
||||||
margin-left : 5px
|
margin-left : 5px
|
||||||
border-left : 5px solid transparent
|
border-left : 5px solid transparent
|
||||||
border-right : 5px solid transparent
|
border-right : 5px solid transparent
|
||||||
border-top : 5px solid $dashboard-text-color
|
border-top : 5px solid $teal-dark
|
||||||
|
|
||||||
.icon-flag
|
.icon-flag
|
||||||
background-image: inline-image('svg/notice-flag.svg')
|
background-image: inline-image('svg/notice-flag.svg')
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
|
|
||||||
<div class="two-line">
|
<div class="two-line">
|
||||||
<div class="row-name row-item">
|
<div class="row-name row-item">
|
||||||
<h3>{{status-icon status=repo.last_build.state}} {{repo.owner.login}}</h3>
|
<h3>{{status-icon status=repo.default_branch.last_build.state}} {{repo.owner.login}}</h3>
|
||||||
<h2><span class="label-align">{{repo.name}}</span></h2>
|
<h2><span class="label-align">{{repo.name}}</span></h2>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -9,10 +9,8 @@
|
||||||
<div class="one-line">
|
<div class="one-line">
|
||||||
<div class="row-request">
|
<div class="row-request">
|
||||||
<div class="row-item">
|
<div class="row-item">
|
||||||
{{!-- {{#link-to "build" repo.slug repo.default_branch.last_build.id}} --}}
|
{{request-icon build=repo.default_branch.last_build}}
|
||||||
{{request-icon build=repo.last_build}}
|
<span class="label-align">#{{repo.default_branch.last_build.number}} {{repo.default_branch.last_build.state}} on {{repo.default_branch.name}}</span>
|
||||||
#{{repo.last_build.number}} {{repo.last_build.state}} on {{repo.default_branch.name}}
|
|
||||||
{{!-- {{/link-to}} --}}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -47,7 +45,9 @@
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
</span>
|
</span>
|
||||||
{{format-sha repo.last_build.commit.sha}}
|
<span class="label-align">
|
||||||
|
{{format-sha repo.default_branch.last_build.commit.sha}}
|
||||||
|
</span>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -55,7 +55,7 @@
|
||||||
|
|
||||||
<div class="one-line">
|
<div class="one-line">
|
||||||
<div class="row-calendar">
|
<div class="row-calendar">
|
||||||
<div class="row-item" title="{{repo.last_build.finished_at}}">
|
<div class="row-item" title="{{repo.default_branch.last_build.finished_at}}">
|
||||||
<span class="icon">
|
<span class="icon">
|
||||||
<svg viewBox="0 0 20 20">
|
<svg viewBox="0 0 20 20">
|
||||||
<g id="Cal">
|
<g id="Cal">
|
||||||
|
@ -73,8 +73,8 @@
|
||||||
</svg>
|
</svg>
|
||||||
</span>
|
</span>
|
||||||
<span class="label-align">
|
<span class="label-align">
|
||||||
{{#if repo.last_build}}
|
{{#if repo.default_branch.last_build}}
|
||||||
{{format-time repo.last_build.finished_at}}
|
{{format-time repo.default_branch.last_build.finished_at}}
|
||||||
{{else}}
|
{{else}}
|
||||||
-
|
-
|
||||||
{{/if}}</span>
|
{{/if}}</span>
|
||||||
|
@ -98,21 +98,19 @@
|
||||||
</svg>
|
</svg>
|
||||||
</span></a></div>
|
</span></a></div>
|
||||||
</div>
|
</div>
|
||||||
{{!-- <div class="dropup--blue">
|
<div class="dropup--blue">
|
||||||
<ul>
|
<ul>
|
||||||
<li><a {{action 'deactivateRepo'}}>
|
<li><a {{action 'deactivateRepo'}}>
|
||||||
<span class="icon icon-eye">
|
<span class="icon icon-eye">
|
||||||
<svg x="0px" y="0px" viewBox="0 0 20 20" xml:space="preserve">
|
<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="View">
|
<g id="Failed">
|
||||||
<path fill="#A7AEAE" d="M17.4,9.6c-0.1-0.2-3.3-4.1-7.4-4.1s-7.3,4-7.4,4.1c-0.2,0.2-0.2,0.6,0,0.8c0.1,0.2,3.3,4.1,7.4,4.1
|
<path fill="#A7AEAE" d="M10.9,10l3.9-3.9c0.2-0.2,0.2-0.6,0-0.9c-0.2-0.2-0.6-0.2-0.9,0L10,9.1L6.1,5.2c-0.2-0.2-0.6-0.2-0.9,0
|
||||||
s7.3-4,7.4-4.1C17.6,10.2,17.6,9.8,17.4,9.6z M10,13.2c-2.8,0-5.2-2.3-6.1-3.2C4.8,9.1,7.2,6.8,10,6.8c2.8,0,5.2,2.3,6.1,3.2
|
c-0.2,0.2-0.2,0.6,0,0.9L9.1,10l-3.9,3.9c-0.2,0.2-0.2,0.6,0,0.9C5.3,14.9,5.5,15,5.6,15s0.3-0.1,0.4-0.2l3.9-3.9l3.9,3.9
|
||||||
C15.2,10.9,12.8,13.2,10,13.2z"/>
|
c0.1,0.1,0.3,0.2,0.4,0.2c0.2,0,0.3-0.1,0.4-0.2c0.2-0.2,0.2-0.6,0-0.9L10.9,10z"/>
|
||||||
<path fill="#A7AEAE" d="M10,7c-1.5,0-2.6,1.3-2.6,3s1.2,3,2.6,3s2.6-1.3,2.6-3S11.5,7,10,7z M10,11.7c-0.7,0-1.3-0.7-1.3-1.7
|
|
||||||
S9.3,8.3,10,8.3s1.3,0.7,1.3,1.7S10.7,11.7,10,11.7z"/>
|
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
</span>
|
</span>
|
||||||
<span class="dropup-item">Deactivate repository</span></a>
|
<span class="dropup-item">Deactivate</span></a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
{{#if hasTriggered}}
|
{{#if hasTriggered}}
|
||||||
|
@ -147,5 +145,5 @@
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div> --}}
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
{{dashboard-row repo=repo}}
|
{{dashboard-row repo=repo}}
|
||||||
{{/each}}
|
{{/each}}
|
||||||
</ul>
|
</ul>
|
||||||
<hr>
|
{{!-- <hr> --}}
|
||||||
|
|
||||||
<ul class="dashboard-inactive">
|
<ul class="dashboard-inactive">
|
||||||
</ul>
|
</ul>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user