diff --git a/static/css/pages/landing.css b/static/css/pages/landing.css new file mode 100644 index 000000000..5689a967c --- /dev/null +++ b/static/css/pages/landing.css @@ -0,0 +1,316 @@ +.landing-page { + color: #555; +} + +.landing-page #padding-container { + padding: 0px; +} + +.landing-page .main-panel { + padding: 0px; + border: 0px; + padding-bottom: 10px; +} + +.landing.jumbotron { + background: transparent; + position: relative; + color: white; + + margin-bottom: 0px; + min-height: 440px; +} + +.landing.jumbotron p { + font-size: 100%; +} + +.landing.jumbotron h1 { + margin-bottom: 30px; + font-size: 50px; + line-height: 60px; +} + +.landing.jumbotron h2 { + margin-bottom: 60px; + font-size: 26px; + font-weight: 300; + line-height: 36px; +} + +.landing.jumbotron .buttons { + margin-bottom: 70px; +} + +.landing.jumbotron .buttons .btn { + padding: 6px; + padding-left: 40px; + padding-right: 40px; + + border: 1px solid #40B4E5; + border-radius: 6px; + margin-left: 30px; + background-color: transparent; + text-transform: uppercase; + font-size: 26px; + font-weight: 500; + + color: white !important; +} + +.landing.jumbotron .buttons .btn.highlighted { + background-color: rgba(64, 180, 229, 0.4); +} + +.landing.jumbotron .buttons .btn:hover { + background-color: rgba(64, 180, 229, 0.8); +} + +.landing.jumbotron .buttons .btn:first-child { + margin-left: 0px; +} + +.landing-background { + z-index: 0; + + position: absolute; + top: 0px; + bottom: 0px; + left: 0px; + right: 0px; + + background: url('/static/img/quay_pattern.png') left top repeat, linear-gradient(30deg, #2277ad, #144768) no-repeat left top fixed; + background-color: #2277ad; + background-size: 100% 100%; +} + +.landing-content { + z-index: 4; + padding-left: 20px; + padding-right: 20px; + position: relative; +} + +.landing-content { + text-align: center; +} + +.landing-content .works-with img { + max-height: 28px; + margin-left: 30px; +} + +.landing-content .works-with .supports { + vertical-align: middle; + margin-left: 30px; + font-size: 12px; + line-height: 16px; + max-width: 400px; + display: inline-block; + padding-left: 30px; + border-left: 1px solid white; + height: 42px; + text-align: left; + padding-top: 4px; +} + + +.landing-section { + padding: 20px; + padding-bottom: 40px; + border-top: 1px solid #ddd; + display: block; +} + +.landing-section:nth-child(even) { + background: #f7f7f7; +} + +.landing-section h2 { + text-align: center; + display: block; + margin-bottom: 30px; + font-weight: 200; +} + + +.landing-page .tour-overview { +} + +.landing-page .tour-overview img { + width: 500px; + padding: 10px; + display: inline-block; +} + +.landing-signup-button { + margin-bottom: 10px; +} + +.landing-page .twitter-tweet { + width: 100%; + margin: 0px; + border: 0px; +} + +.landing-page .twitter-tweet p { + display: block; + text-align: center; + font-size: 20px; +} + +.landing-page .twitter-tweet .attribute { + display: block; + text-align: center; + margin-bottom: 20px; + position: relative; + margin-top: 20px; +} + +.landing-page .twitter-tweet .info-wrap { + display: inline-block; + padding-left: 70px; +} + +.landing-page .twitter-tweet .twitter-avatar img { + border-radius: 4px; + border: 2px solid rgb(70, 70, 70); + width: 50px; + float: left; +} + +.landing-page .twitter-tweet .info { + display: inline-block; + margin-left: 10px; + text-align: left; + margin-top: 4px; +} + +.landing-page .twitter-tweet .reference { + display: block; +} + +.landing-page .twitter-tweet .author { + display: block; +} + +.landing-page .shoutout { + font-size: 14px; + text-align: center; + line-height: normal; + padding-top: 30px; + margin-bottom: 20px; +} + +.landing-page .shoutout > i { + font-size: 50px; + display: inline-block; + width: 100px; + height: 92px; + text-align: center; + line-height: 92px; + background-image: url(/static/img/landing-icon-background.svg); + color: #337ab7; +} + +.landing-page .shoutout .shoutout-link { + font-size: 20px; + display: block; + line-height: 31px; + margin-top: 20px; + margin-bottom: 20px; +} + +.landing-page .shoutout .shoutout-expand { + font-family: Source Sans Pro; + font-size: 12px; + line-height: 16px; + color: #717273; +} + +.landing-page .feature-shoutout { + margin-bottom: 20px; +} + +.landing-page .feature-shoutout > a { + font-size: 22px; + display: block; + line-height: 31px; + padding-top: 10px; + padding-bottom: 10px; + text-align: center; +} + +.landing-page .feature-shoutout .img-responsive { + border: 2px solid #eee; + padding: 6px; +} + +.landing-page .landing-action { + text-align: center; +} + +.landing-page .landing-action .btn { + font-size: 26px; +} + +.landing-page .enterprise-logo { + display: inline-block; + background: white; + + border: 1px solid transparent; + padding: 30px; + -webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.4); + -moz-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.4); + -ms-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.4); + -o-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.4); + box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.4); +} + +.landing-page .enterprise-logo img { + max-height: 50px; +} + +@media (max-width: 989px) { + .landing-content .works-with .supports { + display: block; + margin: 0px; + margin-top: 20px; + padding: 0px; + border: 0px; + text-align: center; + max-width: 989px; + } +} + +@media (max-width: 767px) { + .landing-page .buttons { + text-align: center; + } + + .landing-page .btn { + margin: 0px !important; + display: block; + } + + .landing-page .btn:last-child { + margin-top: 20px !important; + } + + .landing-content .works-with { + text-align: center; + } + + .landing-content .works-with .text { + display: block; + } + + .landing-content .works-with .works-logo { + display: block; + } + + .landing-content .works-with img { + margin-left: 0px; + margin-top: 10px; + } +} diff --git a/static/css/quay.css b/static/css/quay.css index fb1691fcd..0da2be3ca 100644 --- a/static/css/quay.css +++ b/static/css/quay.css @@ -1148,221 +1148,6 @@ i.toggle-icon:hover { padding: 20px; } -.jumbotron { - background: transparent; -} - -.jumbotron p { - font-size: 100%; -} - -.jumbotron .disclaimer-link { - font-size: .3em; - vertical-align: 23px; -} - -.jumbotron .disclaimer-link:hover { - text-decoration: none; -} - -.landing-page .help-block { - color: #C9C9C9; -} - -.landing-page { - color: #555; -} - -.landing-page #padding-container { - padding: 0px; -} - -.landing-page .main-panel { - padding: 0px; - border: 0px; - padding-bottom: 10px; -} - -.landing-page.signedin .main-panel { - background: transparent; - box-shadow: none; -} - -.landing { - position: relative; -} - -.landing .popover { - font-size: 14px; -} - -.landing-background { - z-index: 0; - - position: absolute; - top: 0px; - bottom: 0px; - left: 0px; - right: 0px; - - background: url('/static/img/network-tile.png') left top repeat, linear-gradient(30deg, #2277ad, #144768) no-repeat left top fixed; - background-color: #2277ad; - background-size: auto, 100% 100%; -} - -.landing-page.signedin .landing-background { - background: transparent; -} - -.landing-filter { - z-index: 0; - - position: absolute; - top: 0px; - bottom: 0px; - left: 0px; - right: 0px; -} - -.landing-content { - z-index: 2; - padding-left: 20px; - padding-right: 20px; -} - -.landing .call-to-action i.fa { - margin-left: 10px; -} - -.landing .call-to-action { - font-size: 18px; - padding-left: 14px; - padding-right: 14px; - padding-top: 2px; - padding-bottom: 2px; - - background: rgba(15, 131, 203, 0.6); - display: inline-block; - margin-top: 20px; -} - -.landing { - color: white; - - margin-bottom: 0px; - padding-top: 40px; - min-height: 440px; -} - -.landing a:not(.btn) { - color: #BEE1FF; -} - -.landing .logo { - position: absolute; - top: 20px; - left: 16px; -} - -.landing .product-name { - position: absolute; - top: 22px; - left: 131px; - color: white; - font-size: 40px; -} - -.landing .messages h1 { - font-size: 48px; -} - -.landing-section { - padding: 20px; - padding-bottom: 40px; - border-top: 1px solid #ddd; - display: block; -} - -.landing-section:nth-child(even) { - background: #f7f7f7; -} - -.landing-section h2 { - text-align: center; - display: block; - margin-bottom: 30px; - font-weight: 200; -} - -.landing-page .tour-overview { -} - -.landing-page .tour-overview img { - width: 500px; - padding: 10px; - display: inline-block; -} - -.form-signup input { - margin: 12px; - margin-left: 0px; -} - -.signin-buttons { - text-align: center; -} - -.landing-signup-button { - margin-bottom: 10px; -} - -.landing-page .twitter-tweet { - width: 100%; - margin: 0px; - border: 0px; -} - -.landing-page .twitter-tweet p { - display: block; - text-align: center; - font-size: 20px; -} - -.landing-page .twitter-tweet .attribute { - display: block; - text-align: center; - margin-bottom: 20px; - position: relative; - margin-top: 20px; -} - -.landing-page .twitter-tweet .info-wrap { - display: inline-block; - padding-left: 70px; -} - -.landing-page .twitter-tweet .twitter-avatar img { - border-radius: 4px; - border: 2px solid rgb(70, 70, 70); - width: 50px; - float: left; -} - -.landing-page .twitter-tweet .info { - display: inline-block; - margin-left: 10px; - text-align: left; - margin-top: 4px; -} - -.landing-page .twitter-tweet .reference { - display: block; -} - -.landing-page .twitter-tweet .author { - display: block; -} - .follow-button { text-align: center; } @@ -1415,68 +1200,13 @@ form input.ng-valid.ng-dirty, border-top: 4px solid #ccc; } -.landing .popover-content { - color: black; +.form-signup input { + margin: 12px; + margin-left: 0px; } -.landing-page .shoutout > i { - font-size: 50px; - display: inline-block; - width: 120px; - height: 120px; - background: #eee; +.signin-buttons { text-align: center; - border-radius: 50%; - line-height: 120px; -} - -.landing-page .shoutout > b { - font-size: 22px; - display: block; - line-height: 31px; - margin-top: 10px; - margin-bottom: 10px; -} - -.landing-page .shoutout { - font-size: 14px; - text-align: center; - line-height: normal; - padding-top: 30px; - margin-bottom: 15px; -} - -.landing-page .shoutout .shoutout-link { - display: block; - margin-top: 16px; - font-size: 18px; - text-align: center; -} - -.landing-page .feature-shoutout { - margin-bottom: 20px; -} - -.landing-page .feature-shoutout > a { - font-size: 22px; - display: block; - line-height: 31px; - padding-top: 10px; - padding-bottom: 10px; - text-align: center; -} - -.landing-page .feature-shoutout .img-responsive { - border: 2px solid #eee; - padding: 6px; -} - -.landing-page .landing-action { - text-align: center; -} - -.landing-page .landing-action a { - font-size: 26px; } .footer-container, .push { diff --git a/static/img/apple-touch-icon-114x114.png b/static/img/apple-touch-icon-114x114.png deleted file mode 100644 index 2c58782bd..000000000 Binary files a/static/img/apple-touch-icon-114x114.png and /dev/null differ diff --git a/static/img/apple-touch-icon-120x120.png b/static/img/apple-touch-icon-120x120.png deleted file mode 100644 index 3c86dfb4c..000000000 Binary files a/static/img/apple-touch-icon-120x120.png and /dev/null differ diff --git a/static/img/apple-touch-icon-144x144.png b/static/img/apple-touch-icon-144x144.png deleted file mode 100644 index ee4100f3a..000000000 Binary files a/static/img/apple-touch-icon-144x144.png and /dev/null differ diff --git a/static/img/apple-touch-icon-152x152.png b/static/img/apple-touch-icon-152x152.png deleted file mode 100644 index 5299d0854..000000000 Binary files a/static/img/apple-touch-icon-152x152.png and /dev/null differ diff --git a/static/img/apple-touch-icon-57x57.png b/static/img/apple-touch-icon-57x57.png deleted file mode 100644 index a7ae199c1..000000000 Binary files a/static/img/apple-touch-icon-57x57.png and /dev/null differ diff --git a/static/img/apple-touch-icon-60x60.png b/static/img/apple-touch-icon-60x60.png deleted file mode 100644 index 98f3fc6ee..000000000 Binary files a/static/img/apple-touch-icon-60x60.png and /dev/null differ diff --git a/static/img/apple-touch-icon-72x72.png b/static/img/apple-touch-icon-72x72.png deleted file mode 100644 index d29d35eb8..000000000 Binary files a/static/img/apple-touch-icon-72x72.png and /dev/null differ diff --git a/static/img/apple-touch-icon-76x76.png b/static/img/apple-touch-icon-76x76.png deleted file mode 100644 index d219bd709..000000000 Binary files a/static/img/apple-touch-icon-76x76.png and /dev/null differ diff --git a/static/img/apple-touch-icon.png b/static/img/apple-touch-icon.png deleted file mode 100644 index a7ae199c1..000000000 Binary files a/static/img/apple-touch-icon.png and /dev/null differ diff --git a/static/img/black-horizontal.svg b/static/img/black-horizontal.svg deleted file mode 100644 index b299889ce..000000000 --- a/static/img/black-horizontal.svg +++ /dev/null @@ -1,48 +0,0 @@ - - - - diff --git a/static/img/box-logo.png b/static/img/box-logo.png deleted file mode 100644 index 7e2ce7b4d..000000000 Binary files a/static/img/box-logo.png and /dev/null differ diff --git a/static/img/containers-back-black.jpg b/static/img/containers-back-black.jpg deleted file mode 100644 index 46d154d0f..000000000 Binary files a/static/img/containers-back-black.jpg and /dev/null differ diff --git a/static/img/containers.jpg b/static/img/containers.jpg deleted file mode 100644 index 8cbeaaa4b..000000000 Binary files a/static/img/containers.jpg and /dev/null differ diff --git a/static/img/docker-white-custom.png b/static/img/docker-white-custom.png new file mode 100644 index 000000000..afa44237c Binary files /dev/null and b/static/img/docker-white-custom.png differ diff --git a/static/img/dt-logo.png b/static/img/dt-logo.png deleted file mode 100644 index cb813b4d5..000000000 Binary files a/static/img/dt-logo.png and /dev/null differ diff --git a/static/img/landing-back copy.jpg b/static/img/landing-back copy.jpg deleted file mode 100644 index 73b278980..000000000 Binary files a/static/img/landing-back copy.jpg and /dev/null differ diff --git a/static/img/landing-back-opt.jpg b/static/img/landing-back-opt.jpg deleted file mode 100644 index 12454f43f..000000000 Binary files a/static/img/landing-back-opt.jpg and /dev/null differ diff --git a/static/img/landing-back-pattern-fast.jpg b/static/img/landing-back-pattern-fast.jpg deleted file mode 100644 index 6db12c79b..000000000 Binary files a/static/img/landing-back-pattern-fast.jpg and /dev/null differ diff --git a/static/img/landing-back-pattern.jpg b/static/img/landing-back-pattern.jpg deleted file mode 100644 index 102a9d30d..000000000 Binary files a/static/img/landing-back-pattern.jpg and /dev/null differ diff --git a/static/img/landing-back.jpg b/static/img/landing-back.jpg deleted file mode 100644 index 8cbc70f24..000000000 Binary files a/static/img/landing-back.jpg and /dev/null differ diff --git a/static/img/landing-icon-background.svg b/static/img/landing-icon-background.svg new file mode 100644 index 000000000..b3a59639d --- /dev/null +++ b/static/img/landing-icon-background.svg @@ -0,0 +1,8 @@ + + + diff --git a/static/img/quay-logo-inverted-old.png b/static/img/quay-logo-inverted-old.png deleted file mode 100644 index 727d28b23..000000000 Binary files a/static/img/quay-logo-inverted-old.png and /dev/null differ diff --git a/static/img/quay-logo-old.png b/static/img/quay-logo-old.png deleted file mode 100644 index c6792d74b..000000000 Binary files a/static/img/quay-logo-old.png and /dev/null differ diff --git a/static/img/quay_pattern.png b/static/img/quay_pattern.png new file mode 100644 index 000000000..2f7cc1492 Binary files /dev/null and b/static/img/quay_pattern.png differ diff --git a/static/img/quay_pattern2x.png b/static/img/quay_pattern2x.png new file mode 100644 index 000000000..b5f9f753d Binary files /dev/null and b/static/img/quay_pattern2x.png differ diff --git a/static/img/rkt-horizontal-white.svg b/static/img/rkt-horizontal-white.svg new file mode 100644 index 000000000..3ecaa2848 --- /dev/null +++ b/static/img/rkt-horizontal-white.svg @@ -0,0 +1,28 @@ + + + + diff --git a/static/js/directives/ui/header-bar.js b/static/js/directives/ui/header-bar.js index 8088cb84f..7fde5851d 100644 --- a/static/js/directives/ui/header-bar.js +++ b/static/js/directives/ui/header-bar.js @@ -160,7 +160,11 @@ angular.module('quay').directive('headerBar', function () { $scope.getEnterpriseLogo = function() { if (!Config.ENTERPRISE_LOGO_URL) { - return '/static/img/QuayByCoreOS_horizontal_color.svg'; + if (Features.BILLING) { + return '/static/img/QuayByCoreOS_horizontal_color.svg'; + } else { + return '/static/img/QuayEnterprise_horizontal_color.svg' + } } return Config.ENTERPRISE_LOGO_URL; diff --git a/static/js/pages/landing.js b/static/js/pages/landing.js index e0f2c4d45..3408c7fd6 100644 --- a/static/js/pages/landing.js +++ b/static/js/pages/landing.js @@ -84,7 +84,7 @@ $scope.getEnterpriseLogo = function() { if (!Config.ENTERPRISE_LOGO_URL) { - return '/static/img/quay-logo.png'; + return '/static/img/QuayEnterprise_horizontal_color.svg'; } return Config.ENTERPRISE_LOGO_URL; diff --git a/static/partials/landing-login.html b/static/partials/landing-login.html index 638b809d2..571f571df 100644 --- a/static/partials/landing-login.html +++ b/static/partials/landing-login.html @@ -1,14 +1,12 @@