From 8c1e52dd13743844197318fbccb34079708e3643 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 24 Feb 2015 11:51:21 +0100 Subject: [PATCH] prepare log header --- app/styles/app/_mixins/mixins.sass | 14 +++++++++++++- app/styles/app/_mixins/vars.sass | 5 ++++- app/styles/app/main/log.sass | 13 ++++++++++++- app/templates/jobs/pre.hbs | 10 +++++++--- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/app/styles/app/_mixins/mixins.sass b/app/styles/app/_mixins/mixins.sass index f84b3b0e..0e44cb0b 100644 --- a/app/styles/app/_mixins/mixins.sass +++ b/app/styles/app/_mixins/mixins.sass @@ -24,4 +24,16 @@ @mixin border-bottom-radius($radius) border-bottom-left-radius: $radius - border-bottom-right-radius: $radius \ No newline at end of file + border-bottom-right-radius: $radius + +@mixin border-top-radius($radius) + border-top-left-radius: $radius + border-top-right-radius: $radius + +%border-top-4px + border-top-left-radius: 4px + border-top-right-radius: 4px + +%border-bottom-4px + border-bottom-left-radius: 4px + border-bottom-right-radius: 4px \ No newline at end of file diff --git a/app/styles/app/_mixins/vars.sass b/app/styles/app/_mixins/vars.sass index 2c12db49..797d8011 100644 --- a/app/styles/app/_mixins/vars.sass +++ b/app/styles/app/_mixins/vars.sass @@ -51,4 +51,7 @@ $error-sand: #dcc682 // tabs $tab-nav-inactive-bg: #f8f8f8 $tab-nav-inactive-bg-hover: $white -$tab-active-bg: $blue-grey-light \ No newline at end of file +$tab-active-bg: $blue-grey-light + +// log +$log-header-bg: #444444 \ No newline at end of file diff --git a/app/styles/app/main/log.sass b/app/styles/app/main/log.sass index 75ebba9b..81e02054 100644 --- a/app/styles/app/main/log.sass +++ b/app/styles/app/main/log.sass @@ -13,7 +13,6 @@ pre#log white-space: pre-wrap word-wrap: break-word background-color: #2a2a2a - border-radius: 4px counter-reset: line-numbering .cut @@ -166,3 +165,15 @@ pre#log text-align: right color: #999 background: inline-image('ui/workers-close.svg') no-repeat right 6px + + +.log + +.log-header + background-color: $log-header-bg + height: 40px + @extend %border-top-4px + +.log-body + @extend %border-bottom-4px + margin: 0 diff --git a/app/templates/jobs/pre.hbs b/app/templates/jobs/pre.hbs index ff9e1293..6ff2a2aa 100644 --- a/app/templates/jobs/pre.hbs +++ b/app/templates/jobs/pre.hbs @@ -1,4 +1,8 @@ -
+
+ + + + @@ -10,7 +14,7 @@ {{/if}} -

+  

 
   {{#if view.log.hasContent}}
     Top
@@ -22,4 +26,4 @@
       build or download the raw log.
     

{{/if}} -
+