From cd323bf912922bb4acb6bb493f88c8cc9b78a53b Mon Sep 17 00:00:00 2001 From: Lisa P Date: Tue, 15 Mar 2016 13:45:37 +0100 Subject: [PATCH] add permissions mixin to dashboard row import util, coment out dashboard acceptance remove dashboard acceptance completely fix some layout things update logo colors --- app/components/dashboard-row.js | 6 +++++- app/styles/app/layouts/dashboard.sass | 4 ++-- app/styles/app/modules/dropdown.sass | 2 +- app/styles/app/modules/row.sass | 1 + app/templates/components/dashboard-row.hbs | 1 + public/images/ui/travis-ci-logo-hover.svg | 8 ++++---- public/images/ui/travis-ci-logo.svg | 16 ++++++++-------- tests/acceptance/dashboard-view-test.js | 13 ------------- 8 files changed, 22 insertions(+), 29 deletions(-) delete mode 100644 tests/acceptance/dashboard-view-test.js diff --git a/app/components/dashboard-row.js b/app/components/dashboard-row.js index 96e6c625..9d75fb3a 100644 --- a/app/components/dashboard-row.js +++ b/app/components/dashboard-row.js @@ -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'], diff --git a/app/styles/app/layouts/dashboard.sass b/app/styles/app/layouts/dashboard.sass index 772112ed..5c93ad70 100644 --- a/app/styles/app/layouts/dashboard.sass +++ b/app/styles/app/layouts/dashboard.sass @@ -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} diff --git a/app/styles/app/modules/dropdown.sass b/app/styles/app/modules/dropdown.sass index 0dc871f1..1a4e63ca 100644 --- a/app/styles/app/modules/dropdown.sass +++ b/app/styles/app/modules/dropdown.sass @@ -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 diff --git a/app/styles/app/modules/row.sass b/app/styles/app/modules/row.sass index c471d01f..2d48ffac 100644 --- a/app/styles/app/modules/row.sass +++ b/app/styles/app/modules/row.sass @@ -46,6 +46,7 @@ .row-content margin: 0 font-size: 16px + white-space: nowrap a:hover, a:active border-bottom: 1px solid $asphalt-grey diff --git a/app/templates/components/dashboard-row.hbs b/app/templates/components/dashboard-row.hbs index d9c24ba3..d36d3c45 100644 --- a/app/templates/components/dashboard-row.hbs +++ b/app/templates/components/dashboard-row.hbs @@ -61,6 +61,7 @@

+ {{#if displayMenuTofu}}
diff --git a/public/images/ui/travis-ci-logo-hover.svg b/public/images/ui/travis-ci-logo-hover.svg index 65180c03..85068ed5 100644 --- a/public/images/ui/travis-ci-logo-hover.svg +++ b/public/images/ui/travis-ci-logo-hover.svg @@ -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"/> - - - - - - + - - - - - - + diff --git a/tests/acceptance/dashboard-view-test.js b/tests/acceptance/dashboard-view-test.js deleted file mode 100644 index 82c69cd4..00000000 --- a/tests/acceptance/dashboard-view-test.js +++ /dev/null @@ -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'); - }); -});