finish new buttons

add :focus styles

cleanup log styles a bit, remove ids form css

trying to add actions

finish new buttons
This commit is contained in:
Lisa Passing 2015-02-24 15:49:41 +01:00
parent 203302bd63
commit f599723bf2
4 changed files with 8 additions and 22 deletions

View File

@ -84,13 +84,16 @@ $button-border-color: #d4d4d4
display: none display: none
.button--grey .button--grey
height: 24px height: 22px
padding: 0 10px 0 10px padding: 0 10px 0 10px
background-color: #696867 background-color: #696867
color: #f2f2f2 color: #f2f2f2
// line-height: 1.45
font-size: $font-size-small font-size: $font-size-small
border: none border: none
@extend %border-radius-4px @extend %border-radius-4px
&:hover, &:hover,
&:active &:active
background-color: lighten(#696867, 10) background-color: lighten(#696867, 10)
&:focus
background-color: #696867

View File

@ -69,7 +69,7 @@
.log-header .log-header
height: 44px height: 44px
margin: 0 margin: 0
padding: .8em padding: .9em .8em .6em
text-align: right text-align: right
background-color: $log-header-bg background-color: $log-header-bg
@extend %border-top-4px @extend %border-top-4px
@ -79,17 +79,16 @@
size: 100% size: 100%
repeat: no-repeat repeat: no-repeat
width: 1.3em width: 1.3em
height: 1.2em height: 1.1em
margin-right: 6px margin-right: 6px
vertical-align: middle vertical-align: middle
.icon--downloadLog .icon--downloadLog
background-image: inline-image('icons/download-log-icon.svg') background-image: inline-image('icons/download-log-icon.svg')
.icon--removeLog .icon--removeLog
background-image: inline-image('icons/remove-log-icon.svg') background-image: inline-image('icons/remove-log-icon.svg')
button a
margin-left: .4em margin-left: .4em
.log-body .log-body
position: relative position: relative
pre pre

View File

@ -1,7 +1,7 @@
<section id="log-container" class="log"> <section id="log-container" class="log">
<menu class="log-header"> <menu class="log-header">
{{#if view.canRemoveLog}} {{#if view.canRemoveLog}}
<button class="button button--grey open-popup" {{action "removeLogPopup" target=view}}><span class="icon icon--removeLog"></span> Remove Log</button> <a href="#" class="button button--grey open-popup" {{action "removeLogPopup" target=view}}><span class="icon icon--removeLog"></span> Remove Log</a>
{{/if}} {{/if}}
<a class="button button--grey" {{bind-attr href="view.plainTextLogUrl"}}><span class="icon icon--downloadLog"></span> Download Log</a> <a class="button button--grey" {{bind-attr href="view.plainTextLogUrl"}}><span class="icon icon--downloadLog"></span> Download Log</a>
</menu> </menu>

View File

@ -32,22 +32,6 @@
{{/if}} {{/if}}
</li> </li>
{{/if}} {{/if}}
{{#if view.jobIdForLog}}
{{#if view.showDownloadLog}}
<li class="icon download-log" title="Download Log">
<a class="download-log" {{bind-attr href="view.plainTextLogUrl"}}></a>
</li>
{{/if}}
{{/if}}
{{! the next if is a hack for refreshing displayRemoveLog when we change
views, it sometimes doesn't work properly }}
{{#if view.jobIdForLog}}
{{#if view.displayRemoveLog}}
<li class="icon remove-log" title="Remove Log">
<a href="#" name="remove-log-popup" class="open-popup" {{action "removeLogPopup" target=view}}></a>
</li>
{{/if}}
{{/if}}
{{#if view.displayCodeClimate}} {{#if view.displayCodeClimate}}
<li class="icon code-climate" title="Test Coverage with Code Climate"> <li class="icon code-climate" title="Test Coverage with Code Climate">
<a href="#" name="code-climate" <a href="#" name="code-climate"