summaryrefslogtreecommitdiff
path: root/app/views/profiles
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-01 22:35:40 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-01 22:35:40 +0300
commite834742407a74c26a443cce888c8ab0c210bf1cd (patch)
tree96a3d71634736e37448e6448d68f9d107023f13a /app/views/profiles
parentb8f6d67b96991e8089fb3b139d4e17994af60b17 (diff)
downloadgitlab-ce-e834742407a74c26a443cce888c8ab0c210bf1cd.tar.gz
Dont load bootstrap buttons. Modified css with new buttons
Diffstat (limited to 'app/views/profiles')
-rw-r--r--app/views/profiles/groups/index.html.haml10
-rw-r--r--app/views/profiles/keys/index.html.haml4
-rw-r--r--app/views/profiles/show.html.haml2
3 files changed, 8 insertions, 8 deletions
diff --git a/app/views/profiles/groups/index.html.haml b/app/views/profiles/groups/index.html.haml
index 860951b871a..63695d7e0b9 100644
--- a/app/views/profiles/groups/index.html.haml
+++ b/app/views/profiles/groups/index.html.haml
@@ -1,5 +1,10 @@
%h3.page-title
Group membership
+ - if current_user.can_create_group?
+ %span.pull-right
+ = link_to new_group_path, class: "btn btn-new" do
+ %i.icon-plus
+ New Group
%p.light
Members of group have access to all group projects.
%hr
@@ -7,11 +12,6 @@
.title
%strong Groups
(#{@groups.count})
- - if current_user.can_create_group?
- %span.pull-right
- = link_to new_group_path, class: "btn btn-small btn-primary" do
- %i.icon-plus
- New Group
%ul.well-list
- @groups.each do |group|
%li
diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml
index f2180b9893b..0704874763e 100644
--- a/app/views/profiles/keys/index.html.haml
+++ b/app/views/profiles/keys/index.html.haml
@@ -1,5 +1,7 @@
%h3.page-title
My SSH keys
+ .pull-right
+ = link_to "Add SSH Key", new_profile_key_path, class: "btn btn-new"
%p.light
SSH key allows you to establish a secure connection between your computer and GitLab
%br
@@ -11,8 +13,6 @@
.ui-box
.title
SSH Keys (#{@keys.count})
- .pull-right
- = link_to "Add SSH Key", new_profile_key_path, class: "btn btn-small btn-primary"
%ul.well-list#keys-table
= render @keys
- if @keys.blank?
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index dd1186fd37c..25bf7912f1e 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -87,4 +87,4 @@
= link_to "Add Public Key", new_profile_key_path, class: "btn btn-small"
.form-actions
- = f.submit 'Save', class: "btn btn-save"
+ = f.submit 'Save changes', class: "btn btn-save"