suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add permissions mixin to dashboard row

Browse Source 
import util, coment out dashboard acceptance

remove dashboard acceptance completely

fix some layout things

update logo colors
This commit is contained in:
Lisa P 2016-03-15 13:45:37 +01:00 committed by lislis
parent e8b27dec6b
commit cd323bf912
8 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/components/dashboard-row.js
View File

@ -1,9 +1,13 @@
import Ember from 'ember';
import { githubCommit as githubCommitUrl } from 'travis/utils/urls';
import config from 'travis/config/environment';
<<<<<<< HEAD
import { hasAdminPermission, hasPushPermission } from 'travis/utils/permission';
=======
import Permissions from 'travis/mixins/permissions';
>>>>>>> add permissions mixin to dashboard row
export default Ember.Component.extend({
export default Ember.Component.extend(Permissions, {
tagName: 'li',
classNameBindings: ['repo.default_branch.last_build.state'],
classNames: ['rows', 'rows--dashboard'],

4
app/styles/app/layouts/dashboard.sass
View File

@ -78,7 +78,7 @@
padding: 0 1em
@media #{$medium-up}
display: flex
flex-flow: row wrap
flex-flow: row nowrap
align-items: center
justify-content: space-between
height: 80px
@ -98,7 +98,7 @@
display: flex
order: 4
flex: 0 0 55%
flex-flow: row wrap
flex-flow: row nowrap
justify-content: space-between
@media #{$small-only}

2
app/styles/app/modules/dropdown.sass
View File

@ -178,7 +178,7 @@ $dropdown-button-margin: -9px
@media #{$medium-up}
position: absolute
right: 0
top: -7em
bottom: 5em
margin: 0
background-color: white
border: 1px solid $oxide-blue

1
app/styles/app/modules/row.sass
View File

@ -46,6 +46,7 @@
.row-content
margin: 0
font-size: 16px
white-space: nowrap
a:hover,
a:active
border-bottom: 1px solid $asphalt-grey

1
app/templates/components/dashboard-row.hbs
View File

@ -61,6 +61,7 @@
</p>
</div>
</section>
{{#if displayMenuTofu}}
<div class="dash-menu">
<div class="dropup {{if dropupIsOpen "is-open"}}">

8
public/images/ui/travis-ci-logo-hover.svg
View File

@ -37,18 +37,18 @@
l1.225,4.03l6.557,0.745l2.086-1.459l0.591-4.146c-1.67-0.305-4.111-0.671-7.103-0.9C24.561,21.237,22.299,21.514,22.164,21.523z
M29.298,23.734c0.028,0.368-0.011,0.636-0.103,0.834c0.79-0.094,0.97,0.441,0.979,0.474c-0.573-0.276-1.2,0.073-2.342,0.095
c-0.849,0.031-1.562,0.041-1.609-1.292c-0.047-1.336,0.498-2.441,1.347-2.471C28.419,21.345,29.195,22.402,29.298,23.734z"/>
<path fill="#A0A1A2" d="M26.223,23.845c0.048,1.333,0.761,1.323,1.609,1.292c1.142-0.021,1.769-0.371,2.342-0.095
<path fill="#9d9d9d" d="M26.223,23.845c0.048,1.333,0.761,1.323,1.609,1.292c1.142-0.021,1.769-0.371,2.342-0.095
c-0.009-0.032-0.188-0.567-0.979-0.474c0.092-0.198,0.131-0.466,0.103-0.834c-0.104-1.332-0.879-2.39-1.729-2.36
C26.721,21.403,26.176,22.509,26.223,23.845z M27.489,22.22c0.239-0.005,0.438,0.186,0.441,0.426
c0.005,0.239-0.187,0.438-0.425,0.442c-0.24,0.004-0.438-0.188-0.442-0.428C27.058,22.421,27.25,22.224,27.489,22.22z"/>
<path fill="#A0A1A2" d="M14.581,25.377c0.088,0.002,0.18,0,0.274-0.002c0.082,0,0.164-0.002,0.25-0.005
<path fill="#9d9d9d" d="M14.581,25.377c0.088,0.002,0.18,0,0.274-0.002c0.082,0,0.164-0.002,0.25-0.005
c0.851-0.008,1.556,0.072,1.545-1.262c-0.014-1.334-0.606-2.414-1.457-2.405c-0.849,0.008-1.671,1.102-1.622,2.435
c0.015,0.348,0.066,0.598,0.148,0.779c-0.74,0.187-0.945,0.644-0.957,0.673C13.228,25.339,13.755,25.375,14.581,25.377z
M15.312,22.542c0.24-0.008,0.439,0.182,0.447,0.422c0.006,0.239-0.184,0.439-0.423,0.445c-0.24,0.008-0.44-0.183-0.446-0.422
C14.883,22.748,15.072,22.547,15.312,22.542z"/>
<polygon fill="#A0A1A2" points="17.309,8.327 19.695,8.327 19.695,7.343 20.232,7.343 20.232,11.889 19.421,11.889 19.421,14.432
<polygon fill="#9d9d9d" points="17.309,8.327 19.695,8.327 19.695,7.343 20.232,7.343 20.232,11.889 19.421,11.889 19.421,14.432
23.598,14.432 23.598,11.889 22.786,11.889 22.786,7.343 23.324,7.343 23.324,8.327 25.712,8.327 25.712,4.958 17.309,4.958 "/>
<path fill="#A0A1A2" d="M39.689,14.823c-0.015-0.289-0.043-0.577-0.082-0.861c-0.02-0.144-0.041-0.288-0.071-0.429
<path fill="#9d9d9d" d="M39.689,14.823c-0.015-0.289-0.043-0.577-0.082-0.861c-0.02-0.144-0.041-0.288-0.071-0.429
c-0.028-0.146-0.056-0.281-0.103-0.44l-0.03-0.112l-0.079-0.063c-0.455-0.356-0.944-0.626-1.441-0.864
c-0.411-0.194-0.828-0.363-1.249-0.518c-1.177-3.264-3.197-6.158-5.856-8.173c-2.747-2.084-5.978-3.187-9.342-3.187
c-3.366,0-6.596,1.103-9.344,3.187C9.999,4.949,8.304,7.081,7.103,9.508H7.097c-0.325,0.657-0.617,1.333-0.867,2.028

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

16
public/images/ui/travis-ci-logo.svg
View File

@ -4,25 +4,25 @@
<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="100.266px" height="22px" viewBox="0 0 100.266 22" enable-background="new 0 0 100.266 22" xml:space="preserve">
<g>
<path fill="#A3A3A3" d="M5.759,4.603H0V1.635h15.021v2.967H9.295v16.833H5.759V4.603z"/>
<path fill="#A3A3A3" d="M14.709,6.57h2.894l0.245,2.633h0.123c1.064-1.936,2.649-2.995,4.237-2.995c0.76,0,1.247,0.09,1.705,0.301
<path fill="#9d9d9d" d="M5.759,4.603H0V1.635h15.021v2.967H9.295v16.833H5.759V4.603z"/>
<path fill="#9d9d9d" d="M14.709,6.57h2.894l0.245,2.633h0.123c1.064-1.936,2.649-2.995,4.237-2.995c0.76,0,1.247,0.09,1.705,0.301
l-0.61,3.028c-0.518-0.152-0.914-0.242-1.554-0.242c-1.188,0-2.62,0.817-3.534,3.059v9.082h-3.504V6.57H14.709z"/>
<path fill="#A3A3A3" d="M33.481,11.93c-0.032-1.574-0.702-2.907-2.713-2.907c-1.492,0-2.895,0.665-4.205,1.452l-1.281-2.331
<path fill="#9d9d9d" d="M33.481,11.93c-0.032-1.574-0.702-2.907-2.713-2.907c-1.492,0-2.895,0.665-4.205,1.452l-1.281-2.331
c1.646-1.03,3.748-1.937,6.125-1.937c3.75,0,5.578,2.271,5.578,6.417v8.812H34.12l-0.272-1.634h-0.094
c-1.34,1.12-2.864,1.998-4.631,1.998c-2.622,0-4.45-1.758-4.45-4.36C24.673,14.26,27.355,12.595,33.481,11.93z M30.219,19.075
c1.22,0,2.165-0.605,3.263-1.636v-3.33c-4.056,0.516-5.396,1.574-5.396,3.059C28.085,18.499,28.97,19.075,30.219,19.075z"/>
<path fill="#A3A3A3" d="M37.988,6.57h3.566l2.376,7.721c0.396,1.453,0.854,2.967,1.249,4.48h0.123
<path fill="#9d9d9d" d="M37.988,6.57h3.566l2.376,7.721c0.396,1.453,0.854,2.967,1.249,4.48h0.123
c0.428-1.515,0.853-3.027,1.28-4.48l2.376-7.721h3.384l-5.089,14.866h-4.054L37.988,6.57z"/>
<path fill="#A3A3A3" d="M53.655,1.999C53.655,0.817,54.569,0,55.817,0c1.25,0,2.164,0.817,2.164,1.999
<path fill="#9d9d9d" d="M53.655,1.999C53.655,0.817,54.569,0,55.817,0c1.25,0,2.164,0.817,2.164,1.999
c0,1.15-0.914,1.968-2.164,1.968C54.569,3.966,53.655,3.148,53.655,1.999z M54.051,6.57h3.505v14.866h-3.505V6.57z"/>
<path fill="#A3A3A3" d="M61.21,17.501c1.341,1.026,2.62,1.664,4.144,1.664c1.617,0,2.377-0.757,2.377-1.785
<path fill="#9d9d9d" d="M61.21,17.501c1.341,1.026,2.62,1.664,4.144,1.664c1.617,0,2.377-0.757,2.377-1.785
c0-1.243-1.613-1.789-3.201-2.394c-1.979-0.728-4.202-1.848-4.202-4.327c0-2.607,2.102-4.452,5.454-4.452
c2.071,0,3.75,0.848,4.967,1.786l-1.614,2.119c-1.036-0.756-2.102-1.271-3.291-1.271c-1.495,0-2.194,0.696-2.194,1.634
c0,1.151,1.493,1.636,3.106,2.21c2.044,0.758,4.298,1.728,4.298,4.513c0,2.542-2.042,4.603-5.819,4.603
c-2.041,0-4.207-0.878-5.668-2.061L61.21,17.501z"/>
<path fill="#A3A3A3" d="M88.242,1.272c2.436,0,4.418,1.18,5.667,2.512l-1.95,2.181c-1.036-1-2.162-1.635-3.688-1.635
<path fill="#9d9d9d" d="M88.242,1.272c2.436,0,4.418,1.18,5.667,2.512l-1.95,2.181c-1.036-1-2.162-1.635-3.688-1.635
c-3.263,0-5.607,2.726-5.607,7.176c0,4.512,2.164,7.234,5.483,7.234c1.77,0,3.077-0.725,4.207-1.965l1.949,2.148
c-1.614,1.846-3.685,2.876-6.216,2.876c-5.06,0-9.05-3.636-9.05-10.204C79.038,5.117,83.121,1.272,88.242,1.272z"/>
<path fill="#A3A3A3" d="M96.467,1.635H100v19.801h-3.533V1.635z"/>
<path fill="#9d9d9d" d="M96.467,1.635H100v19.801h-3.533V1.635z"/>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

13
tests/acceptance/dashboard-view-test.js
View File

@ -1,13 +0,0 @@
import { test } from 'qunit';
import moduleForAcceptance from 'travis/tests/helpers/module-for-acceptance';
moduleForAcceptance('Acceptance | dashboard view test');
test('visiting /dashboard-view-test', function(assert) {
visit('/dashboard');
andThen(function() {
assert.equal(currentURL(), '/dashboard');
});
});