diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2016-01-12 17:36:01 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2016-01-12 17:36:01 +0000 |
commit | f225c2a005a351d08f0d072955c84c9de08b3153 (patch) | |
tree | 6bf670ff19231fd2a38ce188113b748c392e1dc3 /app | |
parent | d047db910a7cbac7f61b74bb580df3986acb767e (diff) | |
parent | 97022c414ed61ede8e3270ec23d1b91392b2b689 (diff) | |
download | gitlab-ce-f225c2a005a351d08f0d072955c84c9de08b3153.tar.gz |
Merge branch 'improve_more_buttons' into 'master'
Improve admin area button style
A lot of the buttons in the top right in the admin area were too big. This makes those the new `btn-nr` size which seems to look nice.
## User buttons
### Current
![Screen_Shot_2016-01-08_at_2.29.30_PM](/uploads/8920d4a67ff4a20617e5b4d319ba154e/Screen_Shot_2016-01-08_at_2.29.30_PM.png)
### New
![Screen_Shot_2016-01-08_at_2.29.21_PM](/uploads/494741f6e92592ff2c60683f399bb1c1/Screen_Shot_2016-01-08_at_2.29.21_PM.png)
## Project edit button
### Current
![Screen_Shot_2016-01-08_at_2.29.59_PM](/uploads/09a2f8fddc45120510dd10758ce33c51/Screen_Shot_2016-01-08_at_2.29.59_PM.png)
### New ![Screen_Shot_2016-01-08_at_2.30.14_PM](/uploads/93a72a7c42b1974643b1e9ffd3ec8511/Screen_Shot_2016-01-08_at_2.30.14_PM.png)
## Label button
### Current
![Screen_Shot_2016-01-08_at_2.38.09_PM](/uploads/9cff790e1a4e2d650487c9765d0235a4/Screen_Shot_2016-01-08_at_2.38.09_PM.png)
### New
![Screen_Shot_2016-01-08_at_2.38.31_PM](/uploads/9462ff2393249eb762dc7cb92605c733/Screen_Shot_2016-01-08_at_2.38.31_PM.png)
cc/ @jschatz1 @creamzy @skyruler
See merge request !2351
Diffstat (limited to 'app')
-rw-r--r-- | app/views/admin/labels/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/admin/projects/show.html.haml | 2 | ||||
-rw-r--r-- | app/views/admin/users/_head.html.haml | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/admin/labels/index.html.haml b/app/views/admin/labels/index.html.haml index d67454c03e7..3c57e3dc174 100644 --- a/app/views/admin/labels/index.html.haml +++ b/app/views/admin/labels/index.html.haml @@ -1,5 +1,5 @@ - page_title "Labels" -= link_to new_admin_label_path, class: "pull-right btn btn-new" do += link_to new_admin_label_path, class: "pull-right btn btn-nr btn-new" do New label %h3.page-title Labels diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index 0c986af4a95..d734e60682a 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -1,7 +1,7 @@ - page_title @project.name_with_namespace, "Projects" %h3.page-title Project: #{@project.name_with_namespace} - = link_to edit_project_path(@project), class: "btn pull-right" do + = link_to edit_project_path(@project), class: "btn btn-nr pull-right" do %i.fa.fa-pencil-square-o Edit %hr diff --git a/app/views/admin/users/_head.html.haml b/app/views/admin/users/_head.html.haml index 5e17b018163..bc44b1b1d8e 100644 --- a/app/views/admin/users/_head.html.haml +++ b/app/views/admin/users/_head.html.haml @@ -7,8 +7,8 @@ .pull-right - unless @user == current_user || @user.blocked? - = link_to 'Impersonate', impersonate_admin_user_path(@user), method: :post, class: "btn btn-grouped btn-info" - = link_to edit_admin_user_path(@user), class: "btn btn-grouped" do + = link_to 'Impersonate', impersonate_admin_user_path(@user), method: :post, class: "btn btn-nr btn-grouped btn-info" + = link_to edit_admin_user_path(@user), class: "btn btn-nr btn-grouped" do %i.fa.fa-pencil-square-o Edit %hr |