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

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/profiles')
-rw-r--r--app/views/profiles/account.html.haml6
-rw-r--r--app/views/profiles/show.html.haml10
2 files changed, 8 insertions, 8 deletions
diff --git a/app/views/profiles/account.html.haml b/app/views/profiles/account.html.haml
index 71eacd571bd..2ad000b815b 100644
--- a/app/views/profiles/account.html.haml
+++ b/app/views/profiles/account.html.haml
@@ -12,7 +12,7 @@
%fieldset
%legend
Private token
- %span.cred.right
+ %span.cred.pull-right
keep it secret!
.padded
= form_for @user, url: reset_private_token_profile_path, method: :put do |f|
@@ -35,7 +35,7 @@
.padded
%p.slead After successful password update you will be redirected to login page where you should login with new password
-if @user.errors.any?
- .alert-message.block-message.error
+ .alert.alert-error
%ul
- @user.errors.full_messages.each do |msg|
%li= msg
@@ -56,7 +56,7 @@
%fieldset.update-username
%legend
Username
- %small.cred.right
+ %small.cred.pull-right
Changing your username can have unintended side effects!
= form_for @user, url: update_username_profile_path, method: :put, remote: true do |f|
.padded
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index 65b5a5d29fc..3cf6330cc3c 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -6,7 +6,7 @@
%small
= @user.email
- .right
+ .pull-right
= link_to destroy_user_session_path, class: "logout", method: :delete do
%small
%i.icon-signout
@@ -15,7 +15,7 @@
= form_for @user, url: profile_path, method: :put, html: { class: "edit_user form-horizontal" } do |f|
-if @user.errors.any?
- %div.alert-message.block-message.error
+ %div.alert.alert-error
%ul
- @user.errors.full_messages.each do |msg|
%li= msg
@@ -46,7 +46,7 @@
= f.text_area :bio, rows: 6, class: "input-xlarge", maxlength: 250
%span.help-block Tell us about yourself in fewer than 250 characters.
- .span5.right
+ .span5.pull-right
%fieldset.tips
%legend Tips:
%ul
@@ -76,7 +76,7 @@
%fieldset
%legend
Personal projects:
- %small.right
+ %small.pull-right
%span= current_user.personal_projects.count
of
%span= current_user.projects_limit
@@ -87,7 +87,7 @@
%fieldset
%legend
SSH public keys:
- %span.right
+ %span.pull-right
= link_to pluralize(current_user.keys.count, 'key'), keys_path
.padded
= link_to "Add Public Key", new_key_path, class: "btn btn-small"