nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6947 from svbergerem/fix-inviter-avatar

Browse source 
Various frontend fixes for the getting started page
This commit is contained in:
Jonne Haß 2016-08-08 20:10:52 +02:00 committed by GitHub
commit e738f40d8f
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/assets/stylesheets/getting-started.scss
View file

@ -1,7 +1,11 @@
#hello-there { #hello-there {
#profile_photo_upload .avatar { #profile_photo_upload .avatar {
width: 200px; max-height: 200px;
height: 200px; max-width: 200px;
}
.well .avatar {
min-width: 50px;
} }
.well .media{ .well .media{
@ -9,7 +13,7 @@
} }
.awesome { .awesome {
text-align: center; margin-top: 15px;
} }
.hero-unit { .hero-unit {
@ -27,7 +31,6 @@
width: 100%; width: 100%;
input { input {
height: 32px; height: 32px;
margin-bottom: 15px;
} }
} }
} }

3
app/views/people/_add_contact.haml
View file

@ -1,5 +1,6 @@
.well .well
= t('.invited_by') %strong
= t(".invited_by")
.media .media
.pull-right .pull-right
= render partial: "aspect_memberships/aspect_membership_dropdown" = render partial: "aspect_memberships/aspect_membership_dropdown"

2
app/views/users/getting_started.haml
View file

@ -41,5 +41,5 @@
= label_tag 'follow_tags', t('.hashtag_suggestions') = label_tag 'follow_tags', t('.hashtag_suggestions')
#tags_list #tags_list
= text_field_tag 'follow_tags', nil, class: "nostrap form-control" = 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" = link_to "#{t('.awesome_take_me_to_diaspora')} >>", stream_path, id: "awesome_button", class: "btn btn-default btn-lg btn-primary"