Merge branch 'master' into stable

stable
David Barragán Merino 2016-04-29 12:04:39 +02:00
commit d0dbb8b3e1
3 changed files with 15 additions and 22 deletions

View File

@ -0,0 +1,13 @@
.doom-line {
align-items: center;
background: $red-light;
display: flex;
justify-content: center;
margin: .5rem 0;
padding: .25rem 0;
span {
@include font-size(small);
@include font-type(text);
color: $white;
}
}

View File

@ -243,21 +243,6 @@
}
}
}
.doom-line {
background: $red;
margin: .2rem 0;
padding: .6rem 0;
position: relative;
width: 100%;
span {
@include font-size(small);
@include font-type(text);
color: $white;
position: absolute;
right: .5rem;
top: -3px;
}
}
.us-settings {
flex-shrink: 0;
margin-left: 2rem;

View File

@ -88,6 +88,7 @@
margin-top: 5px;
}
.sprint-summary {
align-items: flex-end;
display: flex;
justify-content: space-between;
}
@ -95,18 +96,12 @@
@include font-size(small);
@include font-type(text);
color: $gray-light;
flex-flow: 1;
flex: 1;
}
ul {
margin: 0;
text-align: right;
}
li {
display: inline-block;
&:first-child {
margin-right: 3px;
}
}
}
.compact-sprint {
transform: rotate(0);