diff --git a/static/css/quay.css b/static/css/quay.css index 0c7a33c1a..1523e8a8c 100644 --- a/static/css/quay.css +++ b/static/css/quay.css @@ -115,7 +115,7 @@ margin-top: -20px; margin-bottom: 0px; - padding-top: 66px; + padding-top: 46px; min-height: 440px; } @@ -137,6 +137,31 @@ margin-left: 0px; } +.signin-buttons { + text-align: center; +} + +.landing-signup-button { + margin-bottom: 10px; +} + +.landing-social-alternate { + color: #777; + font-size: 2em; + margin-left: 43px; + line-height: 1em; +} + +.landing-social-alternate .inner-text { + text-align: center; + position: relative; + color: white; + left: -43px; + top: -9px; + font-weight: bold; + font-size: .4em; +} + form input.ng-invalid.ng-dirty { background-color: #FDD7D9; } @@ -201,7 +226,7 @@ form input.ng-valid.ng-dirty { @media (max-height: 768px) { .landing { padding: 20px; - padding-top: 46px; + padding-top: 20px; } } diff --git a/static/js/app.js b/static/js/app.js index 4edfa3549..e9cca9b46 100644 --- a/static/js/app.js +++ b/static/js/app.js @@ -42,8 +42,10 @@ quayApp = angular.module('quay', ['restangular', 'angularMoment', 'angulartics', if ($location.host() === 'quay.io') { keyService['stripePublishableKey'] = 'pk_live_P5wLU0vGdHnZGyKnXlFG4oiu'; + keyService['githubClientId'] = '5a8c08b06c48d89d4d1e'; } else { keyService['stripePublishableKey'] = 'pk_test_uEDHANKm9CHCvVa2DLcipGRh'; + keyService['githubClientId'] = 'cfbc4aca88e5c1b40679'; } return keyService; diff --git a/static/js/controllers.js b/static/js/controllers.js index d9870ae52..eab1d4530 100644 --- a/static/js/controllers.js +++ b/static/js/controllers.js @@ -130,7 +130,7 @@ function RepoListCtrl($scope, Restangular, UserService) { }); } -function LandingCtrl($scope, $timeout, Restangular, UserService) { +function LandingCtrl($scope, $timeout, Restangular, UserService, KeyService) { $('.form-signup').popover(); $scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) { @@ -141,6 +141,8 @@ function LandingCtrl($scope, $timeout, Restangular, UserService) { $scope.user = currentUser; }, true); + $scope.githubClientId = KeyService.githubClientId; + $scope.awaitingConfirmation = false; $scope.registering = false; diff --git a/static/partials/landing.html b/static/partials/landing.html index bc65e0afc..999e580eb 100644 --- a/static/partials/landing.html +++ b/static/partials/landing.html @@ -41,8 +41,13 @@ -