From bdfc7398bb3755bb9ac106a28ded494849d6b704 Mon Sep 17 00:00:00 2001 From: Sahat Yalkabov Date: Sat, 7 Dec 2013 16:06:36 -0500 Subject: [PATCH] Linked accounts on account settings page --- public/css/ios7.less | 4 ++++ views/account.jade | 14 +++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/public/css/ios7.less b/public/css/ios7.less index 353a4d51fc..5fccf63563 100644 --- a/public/css/ios7.less +++ b/public/css/ios7.less @@ -528,6 +528,10 @@ label-info { color: #007aff; } +.text-danger { + color: #d9534f; +} + .text-warning { color: #f0ad4e; } diff --git a/views/account.jade b/views/account.jade index 5735f2947b..351bdf5159 100644 --- a/views/account.jade +++ b/views/account.jade @@ -36,7 +36,8 @@ block content .col-sm-4 input.form-control(type='text', name='website', id='website', value='#{user.profile.website}') .form-group - button.btn.btn.btn-primary(type='submit') Update Profile + .col-sm-offset-2.col-sm-4 + button.btn.btn.btn-primary(type='submit') Update Profile #settings.tab-pane.fade .page-header @@ -58,6 +59,17 @@ block content p You can delete your account, but keep in mind this action is irreversiable. a.btn.btn-danger-outline(href='#') Delete my account + .page-header + h3 Linked Accounts + p + a.text-danger(href='#') Unlink your Google account + p + a(href='#') Link your Facebook account + p + a(href='#') Link your Twitter account + p + a(href='#') Link your GitHub account + if messages.length .alert.alert-danger for message in messages