Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortheworldbright <sushionigiris@gmail.com>2015-06-03 17:59:06 +0300
committerJonne Haß <me@jhass.eu>2015-06-04 19:05:44 +0300
commit5589dac1082327b2931e3a055c1cd9a97b16bd6f (patch)
treef332294b01df054ed7d75228a6cbed805d92ca00
parented5f7837b50e3e324b920882e0539bbf144c014e (diff)
Perform compositional styling to "getting started"
-rw-r--r--app/assets/stylesheets/getting-started.scss10
-rw-r--r--app/views/photos/_new_profile_photo.haml9
-rw-r--r--app/views/users/getting_started.haml25
-rw-r--r--app/views/users/getting_started.mobile.haml2
4 files changed, 23 insertions, 23 deletions
diff --git a/app/assets/stylesheets/getting-started.scss b/app/assets/stylesheets/getting-started.scss
index a8453f0e9..372f87467 100644
--- a/app/assets/stylesheets/getting-started.scss
+++ b/app/assets/stylesheets/getting-started.scss
@@ -1,7 +1,7 @@
#hello-there {
.avatar {
- width: 50px;
- height: 50px;
+ width: 200px;
+ height: 200px;
}
.well .media{
@@ -21,16 +21,12 @@
margin-top: 80px;
}
- p, form {
- margin-left: 30px;
- }
-
ul.as-selections {
width: 100%;
-
li.as-original {
width: 100%;
input {
+ height: 32px;
margin-bottom: 15px;
}
}
diff --git a/app/views/photos/_new_profile_photo.haml b/app/views/photos/_new_profile_photo.haml
index bee13208a..2a93082db 100644
--- a/app/views/photos/_new_profile_photo.haml
+++ b/app/views/photos/_new_profile_photo.haml
@@ -45,7 +45,7 @@
var oldPhoto = $('#photo_id');
if(oldPhoto.length == 0) {
$('#update_profile_form').prepend("<input type='hidden' value='" + id + "' id='photo_id' name='photo_id'/>");
- }else{
+ } else {
oldPhoto.val(id);
}
@@ -59,10 +59,11 @@
#profile_photo_upload
= owner_image_tag(:thumb_large)
+ .small-horizontal-spacer
.clearfix
- .small-horizontal-spacer
- #file-upload.btn.btn-primary.pull-right
- =t('.upload')
+ .text-center
+ #file-upload.btn.btn-primary
+ =t('.upload')
= image_tag('mobile-spinner.gif', :class => 'hidden', :style => "z-index:-1", :id => 'file-upload-spinner')
diff --git a/app/views/users/getting_started.haml b/app/views/users/getting_started.haml
index b5eef07f3..009618b39 100644
--- a/app/views/users/getting_started.haml
+++ b/app/views/users/getting_started.haml
@@ -9,7 +9,9 @@
= invited_by_message
- %h2
+ .small-horizontal-spacer
+
+ %h3
= t(".who_are_you")
- if AppConfig.configured_services.include? :facebook
@@ -18,13 +20,15 @@
= form_tag profile_path, method: :put, remote: true, id: 'edit_profile' do
%fieldset
- = label_tag 'profile[first_name]', t('profiles.edit.your_name')
- = text_field_tag 'profile[first_name]', current_user.first_name, class: "form-control"
- = image_tag 'ajax-loader2.gif', id: "gs-name-form-spinner", class: "hidden"
- = label_tag :your_photo, t('profiles.edit.your_photo')
- = render 'photos/new_profile_photo', aspect: :getting_started, person: current_user.person
-
- %h2
+ .form-group
+ = label_tag 'profile[first_name]', t('profiles.edit.your_name')
+ = 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"
+ = label_tag :your_photo, t('profiles.edit.your_photo')
+ = render 'photos/new_profile_photo', aspect: :getting_started, person: current_user.person
+
+ %h3
= t('.what_are_you_in_to')
%p
@@ -35,6 +39,5 @@
= label_tag 'follow_tags', t('.hashtag_suggestions')
#tags_list
= text_field_tag 'follow_tags', nil, class: "nostrap form-control"
-
- .awesome
- = link_to "#{t('.awesome_take_me_to_diaspora')} »", stream_path, id: "awesome_button", class: "btn"
+ .text-center
+ = link_to "#{t('.awesome_take_me_to_diaspora')} >>", stream_path, id: "awesome_button", class: "btn btn-default btn-lg btn-primary"
diff --git a/app/views/users/getting_started.mobile.haml b/app/views/users/getting_started.mobile.haml
index 4dd2483c0..951e82a49 100644
--- a/app/views/users/getting_started.mobile.haml
+++ b/app/views/users/getting_started.mobile.haml
@@ -63,7 +63,7 @@
%span.saved{class: "hidden"}
= image_tag "mobile/check_yes_ok.png"
= t(".saved")
-
+ .clearfix.visible-xs-block
= label_tag :your_photo, t('profiles.edit.your_photo'), class: "bootstrapped"
= render 'photos/new_profile_photo', aspect: :getting_started, person: current_user.person