From 5a05c6560b0a1bf8df3bf138fbf82c9cdeaf19c5 Mon Sep 17 00:00:00 2001 From: Jimmy Zelinskie Date: Thu, 8 Jan 2015 16:23:43 -0500 Subject: [PATCH 01/32] Always use default twitter image for twitter-view. It was generating a very low resolution (16x16) avatar for the null user and blowing it up to fit. It's much better to just use what would've been the fallback. --- static/directives/twitter-view.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/directives/twitter-view.html b/static/directives/twitter-view.html index 748a68ab5..e78776ea1 100644 --- a/static/directives/twitter-view.html +++ b/static/directives/twitter-view.html @@ -4,7 +4,7 @@

- + {{ authorName }} (@{{authorUser}}) {{ messageDate }} From 42ea3b835ca9a5883dd44cfd8d326cb525e04575 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Mon, 12 Jan 2015 11:42:09 -0500 Subject: [PATCH 02/32] Fix NPE --- auth/permissions.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/auth/permissions.py b/auth/permissions.py index ae398092d..f970450af 100644 --- a/auth/permissions.py +++ b/auth/permissions.py @@ -89,6 +89,8 @@ class QuayDeferredPermissionUser(Identity): if not self._permissions_loaded: logger.debug('Loading user permissions after deferring.') user_object = model.get_user_by_uuid(self.id) + if user_object is None: + return super(QuayDeferredPermissionUser, self).can(permission) # Add the superuser need, if applicable. if (user_object.username is not None and From 5a0277b4654b64f178e76b11aa01ee1cfd7028de Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Mon, 12 Jan 2015 12:17:00 -0500 Subject: [PATCH 03/32] Fix plans table on mobile --- static/css/quay.css | 16 ++++++++++ static/directives/plans-table.html | 50 ++++++++++++++++++++---------- 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/static/css/quay.css b/static/css/quay.css index 4df625503..bc23177df 100644 --- a/static/css/quay.css +++ b/static/css/quay.css @@ -3547,6 +3547,22 @@ p.editable:hover i { font-size: 16px; } +.plans-table ul { + margin-top: 10px; + padding: 0px; +} + + +.plans-table ul li { + padding: 4px; + margin: 0px; +} + +.plans-table ul li .plan-info { + padding: 4px; +} + + .repo-breadcrumb-element .crumb { cursor: pointer; } diff --git a/static/directives/plans-table.html b/static/directives/plans-table.html index 2870a06de..d4badb3c6 100644 --- a/static/directives/plans-table.html +++ b/static/directives/plans-table.html @@ -1,23 +1,41 @@
- - - - - - - +
    +
  • -
- - - - - -
PlanPrivate RepositoriesPrice
{{ plan.title }}{{ plan.privateRepos }}
${{ plan.price / 100 }}
 - {{ currentPlan == plan ? 'Selected' : 'Choose' }} + {{ plan.title }} -
+ +
+ ${{ plan.price / 100 }} / month - + {{ plan.privateRepos }} repositories +
+ + + +
From 2878fd28c69bd58936aa3205617849981b1a8de4 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Mon, 12 Jan 2015 12:26:57 -0500 Subject: [PATCH 04/32] Fix header and some other minor fixes on mobile --- static/css/quay.css | 1 - static/directives/header-bar.html | 15 ++++++++++++++- static/partials/new-organization.html | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/static/css/quay.css b/static/css/quay.css index bc23177df..e0aafa8e8 100644 --- a/static/css/quay.css +++ b/static/css/quay.css @@ -1528,7 +1528,6 @@ i.toggle-icon:hover { } .landing .call-to-action { - height: 40px; font-size: 18px; padding-left: 14px; padding-right: 14px; diff --git a/static/directives/header-bar.html b/static/directives/header-bar.html index 903de59bd..dc82a425a 100644 --- a/static/directives/header-bar.html +++ b/static/directives/header-bar.html @@ -19,8 +19,21 @@
  • Organizations
    • + + -
      + +
    +
    + - - + + From df9a417207df17ad3fe4dcf17d79eae84ac67d1c Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Mon, 12 Jan 2015 12:37:01 -0500 Subject: [PATCH 06/32] Fix NPE --- static/js/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/js/app.js b/static/js/app.js index 43fa2f5d4..69f135538 100644 --- a/static/js/app.js +++ b/static/js/app.js @@ -2645,7 +2645,7 @@ quayApp.directive('focusablePopoverContent', ['$timeout', '$popover', function ( if (!scope) { return; } scope.$apply(function() { - if (!scope) { return; } + if (!scope || !$scope.$hide) { return; } scope.$hide(); }); }; From f268a5d66114724c21bbe0046fb86233431f0373 Mon Sep 17 00:00:00 2001 From: Jimmy Zelinskie Date: Tue, 13 Jan 2015 11:02:08 -0500 Subject: [PATCH 07/32] Fix twitter-view once and for all! One image URL was broken and it was accidentally using the avatar directive, so the class has been changed to 'twitter-avatar' and made explicit. --- static/css/quay.css | 2 +- static/directives/twitter-view.html | 2 +- static/partials/landing-normal.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/static/css/quay.css b/static/css/quay.css index 4df625503..08438df08 100644 --- a/static/css/quay.css +++ b/static/css/quay.css @@ -1667,7 +1667,7 @@ i.toggle-icon:hover { padding-left: 70px; } -.landing-page .twitter-tweet .avatar img { +.landing-page .twitter-tweet .twitter-avatar img { border-radius: 4px; border: 2px solid rgb(70, 70, 70); width: 50px; diff --git a/static/directives/twitter-view.html b/static/directives/twitter-view.html index e78776ea1..68e30f366 100644 --- a/static/directives/twitter-view.html +++ b/static/directives/twitter-view.html @@ -4,7 +4,7 @@

    - + {{ authorName }} (@{{authorUser}}) {{ messageDate }} diff --git a/static/partials/landing-normal.html b/static/partials/landing-normal.html index 0a0dedc3a..274b56ac0 100644 --- a/static/partials/landing-normal.html +++ b/static/partials/landing-normal.html @@ -207,7 +207,7 @@
  • -
    • PlanPrivate RepositoriesPrice + + + $/mo