From febd134f54519b75b4151b39527388d06dc3b5d8 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 18 Dec 2014 16:33:16 +0100 Subject: [PATCH 1/4] Fix subject wrapping --- assets/styles/main/summary.sass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index fe5743f6..695059cf 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -32,19 +32,21 @@ color: #6c878e font-size: 16px max-width: 300px - display: inline-block margin-top: 10px overflow: hidden white-space: nowrap + float: left .subject - display: inline-block font-size: 15px color: #6c878e margin-top: 10px overflow: hidden margin-right: 2px line-height: 20px + word-wrap: break-word + padding-left: 0.55em + text-indent: -0.55em .body max-height: 63px From fc18c185cc01d140d0fc9f89001085fba43e552d Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 18 Dec 2014 21:52:49 +0100 Subject: [PATCH 2/4] Change request-kind background to have flexible height --- assets/scripts/app/templates/builds/show.hbs | 4 +- assets/styles/main/summary.sass | 49 ++++++++++---------- 2 files changed, 25 insertions(+), 28 deletions(-) diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs index cf71dc13..f35ce981 100644 --- a/assets/scripts/app/templates/builds/show.hbs +++ b/assets/scripts/app/templates/builds/show.hbs @@ -2,9 +2,7 @@ Loading {{else}}
-
-
-
+
diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index 695059cf..268561e4 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -23,11 +23,32 @@ #new-summary @include clearfix @include border-radius(4px) - background-color: #fafafa - padding: 0 11px 0 0 + padding: 0 11px 2.5em 51px position: relative + min-height: 143px + + background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mN4/+HDfwAJcAPPMJixRQAAAABJRU5ErkJggg=='), #fafafa + background-size: 41px 100% + background-repeat: no-repeat + + .request-kind + opacity: 0.55 + position: absolute + top: 15px + left: 11px + background-size: contain + background-repeat: no-repeat + height: 21px + width: 21px + + &.push + background-image: inline-image('icons/push.svg') + + &.pull_request + background-image: inline-image('icons/pull-request.svg') .branch + margin-right: 5px font-weight: bold color: #6c878e font-size: 16px @@ -40,7 +61,7 @@ .subject font-size: 15px color: #6c878e - margin-top: 10px + margin-top: 11px overflow: hidden margin-right: 2px line-height: 20px @@ -122,28 +143,6 @@ width: 220px font-size: 11px - .request-kind - background-color: #e8e9ea - opacity: 0.6 - float: left - position: relative - display: block - height: 140px - margin-right: 10px - padding: 15px 10px 0 10px - - .kind-icon.push - background: inline-image('icons/push.svg') no-repeat - background-size: contain - height: 21px - width: 21px - - .kind-icon.pull_request - background: inline-image('icons/pull-request.svg') no-repeat 2px - background-size: contain - height: 21px - width: 21px - .footer a color: #818181 From d421d4f9fec50baa526c9b24e38daa2db0511b36 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 18 Dec 2014 21:53:07 +0100 Subject: [PATCH 3/4] Don't limit commit's body --- assets/styles/main/summary.sass | 3 --- 1 file changed, 3 deletions(-) diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index 268561e4..64fe8522 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -70,14 +70,11 @@ text-indent: -0.55em .body - max-height: 63px display: block font-size: 12px font-family: Monaco, 'Liberation Mono', Courier, monospace margin-bottom: 0px margin-top: 10px - text-overflow: ellipsis - white-space: nowrap overflow: hidden a From 70485132efc4734ddc8773ce8ceab6342f7c1da4 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 18 Dec 2014 22:07:37 +0100 Subject: [PATCH 4/4] A few more improvements to new build header --- assets/styles/main/summary.sass | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/assets/styles/main/summary.sass b/assets/styles/main/summary.sass index 64fe8522..6838c40f 100644 --- a/assets/styles/main/summary.sass +++ b/assets/styles/main/summary.sass @@ -23,9 +23,9 @@ #new-summary @include clearfix @include border-radius(4px) - padding: 0 11px 2.5em 51px + padding: 0 11px 0 51px position: relative - min-height: 143px + min-height: 155px background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mN4/+HDfwAJcAPPMJixRQAAAABJRU5ErkJggg=='), #fafafa background-size: 41px 100% @@ -61,7 +61,7 @@ .subject font-size: 15px color: #6c878e - margin-top: 11px + margin-top: 12px overflow: hidden margin-right: 2px line-height: 20px @@ -73,9 +73,10 @@ display: block font-size: 12px font-family: Monaco, 'Liberation Mono', Courier, monospace - margin-bottom: 0px - margin-top: 10px + margin-bottom: 3.5em + margin-top: 17px overflow: hidden + word-break: break-word a text-decoration: underline