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

Perform compositional styling to "getting started"

Browse source
This commit is contained in:
theworldbright 2015-06-03 23:59:06 +09:00 committed by Jonne Haß
parent ed5f7837b5
commit 5589dac108
4 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
#hello-there { #hello-there {
.avatar { .avatar {
width: 50px; width: 200px;
height: 50px; height: 200px;
} }
.well .media{ .well .media{
@ -21,16 +21,12 @@
margin-top: 80px; margin-top: 80px;
} }
p, form {
margin-left: 30px;
}
ul.as-selections { ul.as-selections {
width: 100%; width: 100%;
li.as-original { li.as-original {
width: 100%; width: 100%;
input { input {
height: 32px;
margin-bottom: 15px; margin-bottom: 15px;
} }
} }

5
app/views/photos/_new_profile_photo.haml
View file

@ -59,9 +59,10 @@
#profile_photo_upload #profile_photo_upload
= owner_image_tag(:thumb_large) = owner_image_tag(:thumb_large)
.clearfix
.small-horizontal-spacer .small-horizontal-spacer
#file-upload.btn.btn-primary.pull-right .clearfix
.text-center
#file-upload.btn.btn-primary
=t('.upload') =t('.upload')
= image_tag('mobile-spinner.gif', :class => 'hidden', :style => "z-index:-1", :id => 'file-upload-spinner') = image_tag('mobile-spinner.gif', :class => 'hidden', :style => "z-index:-1", :id => 'file-upload-spinner')

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

@ -9,7 +9,9 @@
= invited_by_message = invited_by_message
%h2 .small-horizontal-spacer
%h3
= t(".who_are_you") = t(".who_are_you")
- if AppConfig.configured_services.include? :facebook - if AppConfig.configured_services.include? :facebook
@ -18,13 +20,15 @@
= form_tag profile_path, method: :put, remote: true, id: 'edit_profile' do = form_tag profile_path, method: :put, remote: true, id: 'edit_profile' do
%fieldset %fieldset
.form-group
= label_tag 'profile[first_name]', t('profiles.edit.your_name') = label_tag 'profile[first_name]', t('profiles.edit.your_name')
= text_field_tag 'profile[first_name]', current_user.first_name, class: "form-control" = text_field_tag 'profile[first_name]', current_user.first_name, class: "form-control"
.form-group
= image_tag 'ajax-loader2.gif', id: "gs-name-form-spinner", class: "hidden" = image_tag 'ajax-loader2.gif', id: "gs-name-form-spinner", class: "hidden"
= label_tag :your_photo, t('profiles.edit.your_photo') = label_tag :your_photo, t('profiles.edit.your_photo')
= render 'photos/new_profile_photo', aspect: :getting_started, person: current_user.person = render 'photos/new_profile_photo', aspect: :getting_started, person: current_user.person
%h2 %h3
= t('.what_are_you_in_to') = t('.what_are_you_in_to')
%p %p
@ -35,6 +39,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
.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"

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

@ -63,7 +63,7 @@
%span.saved{class: "hidden"} %span.saved{class: "hidden"}
= image_tag "mobile/check_yes_ok.png" = image_tag "mobile/check_yes_ok.png"
= t(".saved") = t(".saved")
.clearfix.visible-xs-block
= label_tag :your_photo, t('profiles.edit.your_photo'), class: "bootstrapped" = label_tag :your_photo, t('profiles.edit.your_photo'), class: "bootstrapped"
= render 'photos/new_profile_photo', aspect: :getting_started, person: current_user.person = render 'photos/new_profile_photo', aspect: :getting_started, person: current_user.person