diff --git a/app/styles/app/base.sass b/app/styles/app/base.sass index 8c80a12e..5e478c82 100644 --- a/app/styles/app/base.sass +++ b/app/styles/app/base.sass @@ -10,6 +10,7 @@ body font-size: 14px background: white color: $asphalt-grey + background-color: $pebble-grey padding: 0 margin: 0 font-weight: 400 diff --git a/app/styles/app/layout.sass b/app/styles/app/layout.sass index 656dcf7f..8eff3a64 100644 --- a/app/styles/app/layout.sass +++ b/app/styles/app/layout.sass @@ -20,7 +20,7 @@ position: relative width: 100% min-height: 100vh - + background-color: white .inner max-width: 1024px margin: auto @@ -40,6 +40,9 @@ .wrapper overflow: hidden + & > .centered + background-color: white + .wrapper.non-centered #main, #left diff --git a/app/styles/app/layouts/footer.sass b/app/styles/app/layouts/footer.sass index 6c97ba13..886a0ec3 100644 --- a/app/styles/app/layouts/footer.sass +++ b/app/styles/app/layouts/footer.sass @@ -1,41 +1,25 @@ -/* - * Footer on the dashboard - */ - -$footer-bg: #e0e0e0 -$blue-grey: #8f9ba2 - .footer position: relative padding : 20px 0 - background-color : $footer-bg + background-color : $pebble-grey font-size : 12px line-height : 22px - color: #404650 + color: $asphalt-grey a display: inline-block vertical-align: middle - color: #404650 + color: $asphalt-grey text-decoration: none &:hover, &:active text-decoration : underline - h3 - font-size : 15px - margin : 0 0 10px 0 - padding-top : 6px - font-weight : 400 - color : $blue-grey - border-top : solid 4px #ccd0d5 - ul padding: 0 margin: 0 list-style: none - .inner display: flex flex-flow: row wrap @@ -53,6 +37,23 @@ $blue-grey: #8f9ba2 flex: 1 1 30% margin-left: 0 +.footer-title + font-size : 15px + margin : 0 0 10px 0 + padding-top : 6px + font-weight : 400 + color : $cement-grey + border-top : solid 4px rgba($cement-grey, 0.15) + +.travis-footer + background: + image: inline-image('travisci-logo.svg') + repeat: no-repeat + width: 100% + height: 3.5rem + background-repeat: no-repeat + opacity: 0.4 + .status-circle display : inline-block height : 11px @@ -62,11 +63,10 @@ $blue-grey: #8f9ba2 border-radius: 100px vertical-align: middle &.none - background: #2fcc66 + background: $turf-green &.degraded - background: #f1c40f + background: $dozer-yellow &.minor - background: #e67e22 + background: mix($brick-red, $dozer-yellow) &.major - background: #e74c3c - + background: $brick-red diff --git a/app/styles/app/pages/landing.sass b/app/styles/app/pages/landing.sass index b65c85a8..8f72749f 100644 --- a/app/styles/app/pages/landing.sass +++ b/app/styles/app/pages/landing.sass @@ -471,3 +471,13 @@ h2 padding-left: .5rem font-size: 18px + + +.landing, +.landing-pro + background-color: white + margin-bottom: 0 + +.landing-pro + .footer + background: white diff --git a/app/templates/components/travis-status.hbs b/app/templates/components/travis-status.hbs index 427d041e..63177c87 100644 --- a/app/templates/components/travis-status.hbs +++ b/app/templates/components/travis-status.hbs @@ -1,5 +1,5 @@ {{#if statusPageStatusUrl}} -