From 139f950861eef24a66f28ede34051d052ad9c5e0 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Fri, 23 Jan 2015 13:47:58 +0100 Subject: [PATCH] put links in dashboard and change some styles --- assets/scripts/app/routes/dashboard.coffee | 1 + assets/scripts/app/templates/dashboard.hbs | 4 +- assets/scripts/app/templates/main/loading.hbs | 2 +- assets/styles/dashboard/dashboard.scss | 39 +++++++++++++------ 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/assets/scripts/app/routes/dashboard.coffee b/assets/scripts/app/routes/dashboard.coffee index ef307bc9..8baeb457 100644 --- a/assets/scripts/app/routes/dashboard.coffee +++ b/assets/scripts/app/routes/dashboard.coffee @@ -12,6 +12,7 @@ Route = TravisRoute.extend @get('stylesheetsManager').disable('dashboard') model: -> + return new Ember.RSVP.Promise(->) apiEndpoint = @get('config').api_endpoint $.ajax(apiEndpoint + '/repos?member=lislis', { beforeSend: (xhr) -> diff --git a/assets/scripts/app/templates/dashboard.hbs b/assets/scripts/app/templates/dashboard.hbs index 01ffb61b..48f7c74a 100644 --- a/assets/scripts/app/templates/dashboard.hbs +++ b/assets/scripts/app/templates/dashboard.hbs @@ -7,10 +7,10 @@

{{repo.owner}}

-

{{repo.name}}

+

{{#link-to "repo" repo.owner repo.name }}{{repo.name}}{{/link-to}}

{{formatDuration repo.last_build_duration}}
{{formatTime repo.last_build_finished_at}}
-

#{{repo.last_build_number}} {{repo.last_build_state}}

+

{{#link-to "build" repo.owner repo.name repo.last_build_id}}#{{repo.last_build_number}} {{repo.last_build_state}}{{/link-to}}

diff --git a/assets/scripts/app/templates/main/loading.hbs b/assets/scripts/app/templates/main/loading.hbs index 0277cf2e..f2bddfc5 100644 --- a/assets/scripts/app/templates/main/loading.hbs +++ b/assets/scripts/app/templates/main/loading.hbs @@ -1 +1 @@ -
Loading
+
Loading main
diff --git a/assets/styles/dashboard/dashboard.scss b/assets/styles/dashboard/dashboard.scss index c38ea2f6..5cf487a6 100644 --- a/assets/styles/dashboard/dashboard.scss +++ b/assets/styles/dashboard/dashboard.scss @@ -298,8 +298,6 @@ a { opacity : 0; visibility : hidden; box-shadow : 2px 1px 4px 0px rgba(148,145,138,0.4); - -webkit-box-shadow : 2px 1px 4px 0px rgba(148,145,138,0.4); - -moz-box-shadow : 2px 1px 4px 0px rgba(148,145,138,0.4); } #views ul li ul li { @@ -402,6 +400,10 @@ a { width : 33px; border-radius : 4px 0 0 4px; } +// .repo a:hover, +// .build-status a:hover { +// text-decoration: underline; +// } .passed { .build-bar { @@ -411,11 +413,14 @@ a { } } .org, - .repo, - .build-status { + .repo a, + .build-status a { color: #3ba85d; } - + .repo a:focus, + .build-status a:focus { + outline: 1px dotted #3ba85d; + } } .failed { @@ -426,10 +431,14 @@ a { } } .org, - .repo, - .build-status { + .repo a, + .build-status a { color: #d04729; } + .repo a:focus, + .build-status a:focus { + outline: 1px dotted #d04729; + } } .started { @@ -440,10 +449,14 @@ a { } } .org, - .repo, - .build-status { + .repo a, + .build-status a { color: #848032; } + .repo a:focus, + .build-status a:focus { + outline: 1px dotted #848032; + } } .errored { @@ -454,10 +467,14 @@ a { } } .org, - .repo, - .build-status { + .repo a, + .build-status a { color: #999999; } + .repo a:focus, + .build-status a:focus { + outline: 1px dotted #999999; + } } .tile .build-information {