From 2482dc1869b4ed86b2ce17fec85793ae2c3609d3 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Mon, 8 Aug 2016 00:59:04 +0200 Subject: [PATCH 1/3] Fix missing avatar of inviter in getting started view --- app/assets/stylesheets/getting-started.scss | 4 ++++ app/views/people/_add_contact.haml | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/getting-started.scss b/app/assets/stylesheets/getting-started.scss index 32b416449..206eccd24 100644 --- a/app/assets/stylesheets/getting-started.scss +++ b/app/assets/stylesheets/getting-started.scss @@ -4,6 +4,10 @@ height: 200px; } + .well .avatar { + min-width: 50px; + } + .well .media{ overflow: visible; } diff --git a/app/views/people/_add_contact.haml b/app/views/people/_add_contact.haml index 6c03fcec1..5180ee22a 100644 --- a/app/views/people/_add_contact.haml +++ b/app/views/people/_add_contact.haml @@ -1,5 +1,6 @@ .well - = t('.invited_by') + %strong + = t(".invited_by") .media .pull-right = render partial: "aspect_memberships/aspect_membership_dropdown" From 2639a0fd69390e530d22b8c264343916417a31ea Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Mon, 8 Aug 2016 19:00:31 +0200 Subject: [PATCH 2/3] Fix size of profile image on getting started page --- app/assets/stylesheets/getting-started.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/getting-started.scss b/app/assets/stylesheets/getting-started.scss index 206eccd24..b7aeab7d5 100644 --- a/app/assets/stylesheets/getting-started.scss +++ b/app/assets/stylesheets/getting-started.scss @@ -1,7 +1,7 @@ #hello-there { #profile_photo_upload .avatar { - width: 200px; - height: 200px; + max-height: 200px; + max-width: 200px; } .well .avatar { From bf0fec19b37b26ec140b6734334cd68c12ad03f0 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Mon, 8 Aug 2016 19:00:59 +0200 Subject: [PATCH 3/3] Fix tag selection margin on getting started page --- app/assets/stylesheets/getting-started.scss | 3 +-- app/views/users/getting_started.haml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/getting-started.scss b/app/assets/stylesheets/getting-started.scss index b7aeab7d5..12c4931a1 100644 --- a/app/assets/stylesheets/getting-started.scss +++ b/app/assets/stylesheets/getting-started.scss @@ -13,7 +13,7 @@ } .awesome { - text-align: center; + margin-top: 15px; } .hero-unit { @@ -31,7 +31,6 @@ width: 100%; input { height: 32px; - margin-bottom: 15px; } } } diff --git a/app/views/users/getting_started.haml b/app/views/users/getting_started.haml index 7b58b6d4a..c35c8a9f7 100644 --- a/app/views/users/getting_started.haml +++ b/app/views/users/getting_started.haml @@ -41,5 +41,5 @@ = label_tag 'follow_tags', t('.hashtag_suggestions') #tags_list = text_field_tag 'follow_tags', nil, class: "nostrap form-control" - .text-center + .text-center.awesome = link_to "#{t('.awesome_take_me_to_diaspora')} >>", stream_path, id: "awesome_button", class: "btn btn-default btn-lg btn-primary"