align all the things

This commit is contained in:
Lisa Passing 2015-03-06 13:20:27 +01:00
parent 08c671daef
commit b02165f0f2
9 changed files with 48 additions and 24 deletions

View File

@ -51,10 +51,3 @@
%inline-block
display: inline-block
@mixin colorTiles($color)
.tile-status
background-color: $color
.repo-header-title a,
.repo-build-status
color: $color

View File

@ -1,3 +1,10 @@
@mixin colorTiles($color)
.tile-status
background-color: $color
.repo-header-title a,
.repo-build-status a
color: $color
.repo
font-size: $font-size-normal
@ -30,15 +37,21 @@
margin: 0
font-weight: 400
font-size: $font-size-xxl
&:hover
text-decoration: underline
.repo-header-icons
line-height: 1
vertical-align: middle
a
@extend %inline-block
height: 1.7em
margin-left: .7em
.icon
width: 1.7em
width: 1.5em
height: 100%
position: relative
top: 0.65em
@media #{$medium-up}
@extend %inline-block
@ -49,9 +62,9 @@
float: right
.tabnav
float: left
margin-bottom: .5em
.tabbody
clear: both
margin-top: 4px
.repo-main-commit
&,
@ -67,6 +80,8 @@
.repo-main-author
img
width: 21px
height: 21px
margin-right: .4em
vertical-align: middle
border-radius: 50%
@ -80,6 +95,11 @@
margin-right: 1.4em
border-right: $cream-dark 1px solid
line-height: 1.8
a
color: $grey
&:hover
text-decoration: underline
.icon
margin-right: .3em
height: 1.3em

View File

@ -86,7 +86,8 @@ $button-border-color: #d4d4d4
position: relative
top: -0.15em
.button
.btn
@extend .button
border-radius: 4px
.button--green
border: none
@ -108,7 +109,6 @@ $button-border-color: #d4d4d4
padding: 0 10px 0 10px
background-color: #696867
color: #f2f2f2
// line-height: 1.45
font-size: $font-size-small
border: none
@extend %border-radius-4px

View File

@ -92,13 +92,19 @@ $dropdown-border: #C3D9DB
width: 10.7rem
.dropdown-button
height: 30px
height: 28px
background-color: $grey
border: none
color: $white
line-height: 1
font-size: $font-size-normal
&:hover
&:hover,
&:focus
background-color: lighten($grey, 10)
.icon--cog
position: relative
top: 0.15em
left: -0.2em
.icon-arrow-down
border-top-color: $white
@ -109,7 +115,7 @@ $dropdown-border: #C3D9DB
@include resetul
@include border-bottom-radius(4px)
position: absolute
top: 31px // height of the button +1
top: 29px // height of the button +1
width: 100%
z-index: 70
overflow: hidden

View File

@ -52,7 +52,10 @@
background-image: inline-image('dashboard/status-pending.svg')
.icon.push
background-image: inline-image('icons/push.svg')
background-image: inline-image('svg/push-icon.svg')
.icon.pull-request
background-image: inline-image('svg/pull-request-icon.svg')
.icon-lock
background-image: inline-image('dashboard/private-icon.svg')

View File

@ -9,9 +9,6 @@
.tile-main
height: 100%
img
width: 16px
height: 16px
// todo refactor
.tile-main
@ -32,9 +29,14 @@
height: 100%
border-top-left-radius: 4px
border-bottom-left-radius: 4px
.icon
.icon-status
display: block
width: 1.1em
height: 1.2em
margin: .5em auto 1.1em
.request-kind
display: block
width: 1.5em
height: 1.1em
margin: .5em auto 1.1em

View File

@ -29,7 +29,6 @@
<div class="tile-additional medium-4 columns end">
<ul class="repo-main-info">
<li class="repo-build-status">{{#link-to "build" repo build}}
<span class="icon icon--hash"></span>
{{build.number}} {{humanize-state build.state}}{{/link-to}}

View File

@ -5,13 +5,14 @@
{{else}}
{{#if repo.isLoaded}}
<article id="repo-header" class="repo-header passed">
<article id="repo-header" {{bind-attr class=":repo-header :passed"}}>
<header>
<h1 class="repo-header-title">{{#link-to "repo" repo}}{{repo.slug}}{{/link-to}}</h1>
<div class="repo-header-icons">
<a {{bind-attr href="controller.urlGithub"}}><span class="icon icon--github-circle"></span></a>
<a href="#" id="status-image-popup" name="status-images" class="open-popup" {{action "statusImages" target=view}}>
<img {{bind-attr src="view.statusImageUrl"}} title="Build Status Images"/>
{{!-- <img {{bind-attr src="view.statusImageUrl"}} title="Build Status Images"/> --}}
<img src="https://travis-ci.org/travis-ci/travis-images-specs.svg" alt="">
</a>
</div>
<p class="description">{{description}}</p>

View File

@ -1,5 +1,5 @@
<div class="dropdown dropdown--classic" id="tools">
<a href="#" {{action "menu" target=view}} class="menu-popup-button dropdown-button button" type=""><span class="icon icon--cog"></span> Settings <span class="icon icon-arrow-down"></span></a>
<a href="#" {{action "menu" target=view}} class="menu-popup-button dropdown-button btn" type=""><span class="icon icon--cog"></span> Settings <span class="icon icon-arrow-down"></span></a>
<ul class="dropdown-menu menu">
{{#if view.displaySettingsLink}}
<li>