suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #362 from travis-ci/contrast-things

Browse Source 
Contrast things
This commit is contained in:
Lisa P 2015-06-23 12:21:04 +02:00
commit 21a50aa9a5
18 changed files with 61 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/styles/app/_mixins/colors.sass
View File

@ -32,12 +32,6 @@ $gray-light-2: #efefef
$gray-light-3: #f2f2eb $gray-light-3: #f2f2eb
$gray-light-4: #fdfdfd $gray-light-4: #fdfdfd
$cream-light: #FAFAF8
$cream-dark: #EFF0EC
$grey-light: #A1A0A0
$grey-medium: #969496
$grey-dark: #808080
$green-light: #73c78d $green-light: #73c78d
$green-dark: #3FA75F $green-dark: #3FA75F
$red-light: #D7625F $red-light: #D7625F

14
app/styles/app/_mixins/mixins.sass
View File

@ -29,14 +29,6 @@
padding: 0 padding: 0
list-style: none list-style: none
@mixin border-bottom-radius($radius)
border-bottom-left-radius: $radius
border-bottom-right-radius: $radius
@mixin border-top-radius($radius)
border-top-left-radius: $radius
border-top-right-radius: $radius
%border-radius-4px %border-radius-4px
border-radius: 4px border-radius: 4px
@ -61,14 +53,14 @@
%helptext %helptext
font-size: $font-size-m font-size: $font-size-m
color: $grey1 color: $grey-medium
a a
color: $grey3 color: $grey-dark
text-decoration: none text-decoration: none
&:hover &:hover
text-decoration: underline text-decoration: underline
%section-title %section-title
font-size: $font-size-sm font-size: $font-size-sm
color: $grey1 color: $grey-medium
font-weight: 400 font-weight: 400

14
app/styles/app/_mixins/vars.sass
View File

@ -67,12 +67,12 @@ $tab-active-bg: $blue-grey-light
// log // log
$log-header-bg: #444444 $log-header-bg: #444444
// new build header
$font-size-xxl: 30px $font-size-xxl: 30px
$grey1: #A6ADAD
$grey2: #969496
$grey3: #808080
$grey4: #e6e8e8
$grey: $grey1
$cream-light: #FAFAF8 $cream-light: #FAFAF8
$cream-dark: lighten(mix(#F7F7F4, $grey), 10) $cream-dark: #EFF0EC
$grey-lighter: #A6ADAD
$grey-light: #8d8d8d
$grey-medium: #8d8d8d
$grey-dark: #808080

4
app/styles/app/layout.sass
View File

@ -8,7 +8,7 @@
padding-left: 0 !important padding-left: 0 !important
padding-right: 0 !important padding-right: 0 !important
padding-top: 30px !important padding-top: 30px !important
overflow-y: auto
.main, .main,
.profile-view .profile-view
@ -43,7 +43,7 @@
#main #main
position: relative position: relative
padding: 2em $column-gutter/2 5em padding: 1.8em $column-gutter/2 5em
.wrapper .wrapper
overflow: hidden overflow: hidden

7
app/styles/app/layouts/build-job.sass
View File

@ -34,7 +34,7 @@
p p
white-space: normal white-space: normal
a a
color: $grey2 color: $grey-medium
.tile-status--job .tile-status--job
width: 2em width: 2em
@ -68,14 +68,12 @@
overflow: hidden overflow: hidden
.job-id .job-id
width: grid-calc(3, 24) width: grid-calc(3, 24)
border-right: solid 1px $grey4 border-right: solid 1px $grey-lighter
// max-width: 82px
.job-os .job-os
width: grid-calc(1, 24) width: grid-calc(1, 24)
text-align: center text-align: center
.job-lang .job-lang
width: grid-calc(6, 24) width: grid-calc(6, 24)
// max-width: 180px
&:after &:after
@include fadeOut(right, -90deg, $cream-light) @include fadeOut(right, -90deg, $cream-light)
.job-anchor .job-anchor
@ -86,7 +84,6 @@
.job-env .job-env
min-width: grid-calc(16, 24) min-width: grid-calc(16, 24)
width: grid-calc(16, 24) width: grid-calc(16, 24)
// max-width: 395px
&:after &:after
@include fadeOut(right, -90deg, $cream-light) @include fadeOut(right, -90deg, $cream-light)
&:hover &:hover

30
app/styles/app/layouts/buildheader.sass
View File

@ -1,11 +1,11 @@
.repo .repo
font-size: $font-size-m font-size: $font-size-m
color: $grey color: $grey-medium
.repo-header .repo-header
header header
margin: .5rem 0 2.4rem margin: .5rem 0 2.6rem
> * > *
vertical-align: middle vertical-align: middle
@ -15,7 +15,7 @@
font-weight: 400 font-weight: 400
font-size: 35px font-size: 35px
a a
color: $grey3 color: $grey-dark
&:hover &:hover
text-decoration: underline text-decoration: underline
@ -56,24 +56,26 @@
margin-top: 2em margin-top: 2em
.build-title .build-title
margin-top: 2.5rem margin-top: 2.5rem
color: $grey1 color: $grey-medium
font-size: $font-size-sm font-size: $font-size-sm
font-weight: 400 font-weight: 400
& span:hover + .tooltip & span:hover + .tooltip
display: block display: block
a:not(.button)
color: $grey-medium
&:hover
color: $grey-medium
.repo-main-commit .repo-main-commit
position: relative position: relative
padding-bottom: 0.5em padding-bottom: 0.5em
font-weight: 400
color: $grey-dark
&, &,
small small
margin: 0 margin: 0
font-weight: 400
font-size: $font-size-m font-size: $font-size-m
color: $grey3
line-height: 1 line-height: 1
a
color: $grey3
small small
margin-right: .3em margin-right: .3em
font-weight: 600 font-weight: 600
@ -84,10 +86,6 @@
@include fadeOut(right, -90deg, $cream-light) @include fadeOut(right, -90deg, $cream-light)
.repo-main-description .repo-main-description
p:not(.body)
color: $grey3
a
color: $grey3
p p
margin: 0 margin: 0
@media #{$medium-up} @media #{$medium-up}
@ -105,7 +103,7 @@
overflow: hidden overflow: hidden
word-break: break-word word-break: break-word
white-space: pre-wrap white-space: pre-wrap
color: $grey2 color: $grey-medium
.repo-main-info .repo-main-info
@include resetul @include resetul
@ -117,8 +115,6 @@
overflow: hidden overflow: hidden
&:after &:after
@include fadeOut(right, -90deg, $cream-light) @include fadeOut(right, -90deg, $cream-light)
a
color: $grey
white-space: nowrap white-space: nowrap
&:hover &:hover
text-decoration: underline text-decoration: underline
@ -134,9 +130,9 @@
display: block display: block
margin-bottom: .5em margin-bottom: .5em
text-align: center text-align: center
background-color: $grey1 background-color: $grey-lighter
&:hover &:hover
background-color: darken($grey, 10) background-color: darken($grey-medium, 10)
.icon .icon
width: .9em width: .9em
height: 1.1em height: 1.1em

2
app/styles/app/layouts/caches.sass
View File

@ -2,7 +2,7 @@
@include resetul @include resetul
margin-top: 1rem margin-top: 1rem
font-size: $font-size-sm font-size: $font-size-sm
color: $grey3 color: $grey-medium
clear: both clear: both
.tile-xs .tile-xs

4
app/styles/app/layouts/dashboard.sass
View File

@ -19,7 +19,7 @@ $db-gray: #C9C9C9
$db-text-color: #ACAAAA $db-text-color: #ACAAAA
.dashboard .dashboard
color: #6D6E70 color: $grey-medium
hr hr
max-width: 1024px max-width: 1024px
margin: auto margin: auto
@ -207,7 +207,7 @@ $db-text-color: #ACAAAA
padding: 0 4em 0 2em padding: 0 4em 0 2em
line-height: 3em line-height: 3em
transform: translateY(26%) transform: translateY(26%)
border-left: 1px solid $grey4 border-left: 1px solid $cream-dark
.db-burger .db-burger
height: 100% height: 100%
.db-status .db-status

2
app/styles/app/layouts/first-sync.sass
View File

@ -15,7 +15,7 @@
margin: 1.5em 0 1em margin: 1.5em 0 1em
font-size: 36px font-size: 36px
font-weight: 400 font-weight: 400
color: $grey3 color: $grey-medium
p p
font-size: $font-size-ml font-size: $font-size-ml

10
app/styles/app/layouts/owner.sass
View File

@ -69,7 +69,7 @@
.tile-single, .tile-single,
.tile-double .tile-double
color: $grey1 color: $grey-medium
padding: .1em 0 padding: .1em 0
font-size: $font-size-m font-size: $font-size-m
.icon .icon
@ -85,9 +85,9 @@
height: .6em height: .6em
margin: 0 margin: 0
a a
color: $grey1 color: $grey-medium
&:hover &:hover
color: $grey1 color: $grey-medium
text-decoration: underline text-decoration: underline
.tile-single .tile-single
@ -104,7 +104,7 @@
& ~ div & ~ div
@media #{$medium-up} @media #{$medium-up}
padding-left: 2em padding-left: 2em
border-left: 1px solid $grey4 border-left: 1px solid $cream-dark
.tabs--owner .tabs--owner
padding : 0 $column-gutter/2 padding : 0 $column-gutter/2
@ -128,4 +128,4 @@
margin-bottom: 1.5rem margin-bottom: 1.5rem
@media #{$medium-up} @media #{$medium-up}
height: 2.2em height: 2.2em
border-bottom: solid 2px $grey4 border-bottom: solid 2px $cream-dark

13
app/styles/app/layouts/profile.sass
View File

@ -12,10 +12,10 @@
line-height: 1.45 line-height: 1.45
p:not(.sync-last) p:not(.sync-last)
font-size: $font-size-sm font-size: $font-size-sm
color: #adaaab color: $grey-light
margin: 2rem 0 1rem 0 margin: 2rem 0 1rem 0
a a
color: #adaaab color: $grey-light
text-decoration: underline text-decoration: underline
@media #{$medium-up} @media #{$medium-up}
.profile-header, .sync-button, .ember-view .profile-header, .sync-button, .ember-view
@ -37,7 +37,7 @@
margin-right: .5em margin-right: .5em
p p
font-size: $font-size-m font-size: $font-size-m
color: #7a7a7a color: $grey-medium
.cta-btn .cta-btn
text-align: right text-align: right
@ -107,7 +107,7 @@
h1 h1
color: #898b8c color: #898b8c
font-size: $font-size-sm font-size: $font-size-sm
border-bottom: solid 2px #f3f2f2 border-bottom: solid 2px $cream-dark
.profile-user .profile-user
margin: 1rem 0 2rem margin: 1rem 0 2rem
@ -165,9 +165,10 @@ p.profile-user-last
vertical-align: middle vertical-align: middle
span:not(.loading-indicator) span:not(.loading-indicator)
display: none display: none
margin-left: 2rem margin-left: 1rem
font-size: $font-size-sm font-size: $font-size-sm
color: #484849 color: darken($grey-dark, 10)
line-height: 1
.sync-spinner .sync-spinner
vertical-align: top vertical-align: top
&:hover &:hover

2
app/styles/app/layouts/requests.sass
View File

@ -34,7 +34,7 @@
.requests-time .requests-time
@media #{$medium-up} @media #{$medium-up}
padding-left: 2em padding-left: 2em
border-left: 1px solid $grey4 border-left: 1px solid $grey-lighter
.tile--jobs .tile--jobs
padding-left: 2.5em padding-left: 2.5em

2
app/styles/app/layouts/sidebar.sass
View File

@ -102,7 +102,7 @@ $sb-font-size: 14px
.sidebar-list .sidebar-list
margin-top: 1.4rem margin-top: 1.4rem
color: $grey1 color: $grey-medium
ul ul
@include resetul @include resetul
border-bottom: .46rem solid #FAF9F7 border-bottom: .46rem solid #FAF9F7

4
app/styles/app/layouts/top.sass
View File

@ -66,7 +66,7 @@ $top-height: 55px
background: none background: none
border: none border: none
line-height: 1 line-height: 1
color: $grey1 color: $grey-medium
outline: none !important outline: none !important
@include clearfix @include clearfix
&:hover &:hover
@ -78,7 +78,7 @@ $top-height: 55px
.topbar .topbar
font-size: $font-size-m font-size: $font-size-m
background-color: #eff0ec background-color: #eff0ec
color: $grey1 color: $grey-medium
.navigation .navigation
padding: 0 $column-gutter/2 padding: 0 $column-gutter/2

9
app/styles/app/modules/buttons.sass
View File

@ -101,22 +101,15 @@ $button-border-color: #d4d4d4
.btn-activated .btn-activated
font-size: $font-size-sm font-size: $font-size-sm
border: none border: none
// padding-right: 2.5em
&:hover &:hover
background-color: $grey2 background-color: $grey-medium
.btn-activated .btn-activated
background-color: #39a85b background-color: #39a85b
color: $white color: $white
// @extend .icon-hook-on
// background:
// repeat: no-repeat
// position: 92% 45%
&:hover &:hover
background-color: darken(#39a85b, 10) background-color: darken(#39a85b, 10)
// temp
#auth #navigation .button--signin, #auth #navigation .button--signin,
#auth #navigation .button--signingin #auth #navigation .button--signingin
display: none display: none

10
app/styles/app/modules/dropdown.sass
View File

@ -93,14 +93,14 @@ $dropdown-border: #C3D9DB
.dropdown-button .dropdown-button
height: 28px height: 28px
background-color: $grey background-color: $grey-lighter
border: none border: none
color: $white color: $white
line-height: 1 line-height: 1
font-size: $font-size-normal font-size: $font-size-normal
&:hover, &:hover,
&:focus &:focus
background-color: lighten($grey, 10) background-color: lighten($grey-medium, 10)
.icon-cog-light .icon-cog-light
position: relative position: relative
top: 0.15em top: 0.15em
@ -113,13 +113,13 @@ $dropdown-border: #C3D9DB
.dropdown-menu .dropdown-menu
@include resetul @include resetul
@include border-bottom-radius(4px) @extend %border-bottom-4px
position: absolute position: absolute
top: 29px // height of the button +1 top: 29px // height of the button +1
width: 100% width: 100%
z-index: 70 z-index: 70
overflow: hidden overflow: hidden
background-color: $grey background-color: $grey-lighter
display: none display: none
a a
@extend %inline-block @extend %inline-block
@ -127,6 +127,6 @@ $dropdown-border: #C3D9DB
padding: .4em 2em padding: .4em 2em
color: $white color: $white
&:hover &:hover
background-color: darken($grey, 10) background-color: darken($grey-lighter, 10)
&.display &.display
display: block display: block

8
app/styles/app/modules/tabs.sass
View File

@ -1,6 +1,6 @@
.tabnav .tabnav
color: $grey2 color: $grey-light
font-size: $font-size-sm font-size: $font-size-sm
ul ul
@include resetul @include resetul
@ -14,7 +14,7 @@
a a
@extend %inline-block @extend %inline-block
width: 100% width: 100%
color: $grey2 color: $grey-light
padding: .2em 0 padding: .2em 0
.active a, .active a,
@ -47,7 +47,7 @@
content: "" content: ""
display: block display: block
position: absolute position: absolute
color: $grey4 color: $grey-lighter
top: 0.4em top: 0.4em
left: -0.7em left: -0.7em
width: .7em width: .7em
@ -65,7 +65,7 @@
@extend %inline-block @extend %inline-block
overflow: visible overflow: visible
a a
color: $grey2 color: $grey-light
padding: .5em 0 padding: .5em 0
.active .active
color: $teal2 color: $teal2

8
app/styles/app/modules/tiles.sass
View File

@ -66,7 +66,7 @@
margin: 0 margin: 0
font-weight: 400 font-weight: 400
font-size: $font-size-m font-size: $font-size-m
color: $grey3 color: $grey-dark
line-height: 1 line-height: 1
small small
margin-right: .3em margin-right: .3em
@ -86,9 +86,9 @@
height: 1.3em height: 1.3em
vertical-align: middle vertical-align: middle
a a
color: $grey1 color: $grey-medium
&:hover &:hover
color: $grey1 color: $grey-medium
text-decoration: underline text-decoration: underline
@media #{$small-only} @media #{$small-only}
margin-top: 1em margin-top: 1em
@ -145,7 +145,7 @@
@media #{$medium-up} @media #{$medium-up}
white-space: nowrap white-space: nowrap
overflow: hidden overflow: hidden
border-right: solid 1px $grey4 border-right: solid 1px $cream-dark
&:after &:after
@include fadeOut(right, -90deg, $cream-light) @include fadeOut(right, -90deg, $cream-light)
@media #{$xlarge-up} @media #{$xlarge-up}