diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-15 12:42:32 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-15 12:42:32 +0300 |
commit | cab7d7686f6c11bd77564eb73abd85fb9f61c58e (patch) | |
tree | b523127e351d0c194902f4b56527a600135c729b | |
parent | 304baaf8efcecf6b639ea1d925ee9973d5b14fd7 (diff) | |
download | gitlab-ce-cab7d7686f6c11bd77564eb73abd85fb9f61c58e.tar.gz |
Help#permissions improved
-rw-r--r-- | app/assets/stylesheets/common.scss | 7 | ||||
-rw-r--r-- | app/assets/stylesheets/gitlab_bootstrap/common.scss | 16 | ||||
-rw-r--r-- | app/views/help/permissions.html.haml | 134 |
3 files changed, 82 insertions, 75 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 48e3898ed5f..6426ca6320d 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -361,3 +361,10 @@ img.emoji { font-size: 14px; line-height: 24px; } + +table { + td.permission-x { + background: #D9EDF7 !important; + text-align: center; + } +} diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss index cd652590089..372cbe50fd0 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/common.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss @@ -1,12 +1,12 @@ /** COLORS **/ -.cgray { color:gray } -.cred { color:#D12F19 } -.cgreen { color:#4a2 } -.cblue { color:#29A } -.cblack { color:#111 } -.cdark { color:#444 } -.cwhite { color:#fff!important } -.bgred { background:#F2DEDE!important } +.cgray { color: gray } +.cred { color: #D12F19 } +.cgreen { color: #4a2 } +.cblue { color: #29A } +.cblack { color: #111 } +.cdark { color: #444 } +.cwhite { color: #fff!important } +.bgred { background: #F2DEDE!important } /** COMMON CLASSES **/ .left { float:left } diff --git a/app/views/help/permissions.html.haml b/app/views/help/permissions.html.haml index 4d359e59313..da5210bad3d 100644 --- a/app/views/help/permissions.html.haml +++ b/app/views/help/permissions.html.haml @@ -1,160 +1,160 @@ = render layout: 'help/layout' do %h3.page-title Permissions - %table + %table.table %thead %tr - %td - %td Guest - %td Reporter - %td Developer - %td Master - %td Owner + %th Action + %th Guest + %th Reporter + %th Developer + %th Master + %th Owner %tbody %tr %td Create new issue - %td X - %td X - %td X - %td X - %td + %td.permission-x ✓ + %td.permission-x ✓ + %td.permission-x ✓ + %td.permission-x ✓ + %td.permission-x ✓ %tr %td Leave comments - %td X - %td X - %td X - %td X - %td + %td.permission-x ✓ + %td.permission-x ✓ + %td.permission-x ✓ + %td.permission-x ✓ + %td.permission-x ✓ %tr %td Write on project wall - %td X - %td X - %td X - %td X - %td + %td.permission-x ✓ + %td.permission-x ✓ + %td.permission-x ✓ + %td.permission-x ✓ + %td.permission-x ✓ %tr %td Pull project code %td - %td X - %td X - %td X - %td + %td.permission-x ✓ + %td.permission-x ✓ + %td.permission-x ✓ + %td.permission-x ✓ %tr %td Download project %td - %td X - %td X - %td X - %td + %td.permission-x ✓ + %td.permission-x ✓ + %td.permission-x ✓ + %td.permission-x ✓ %tr %td Create code snippets %td - %td X - %td X - %td X - %td + %td.permission-x ✓ + %td.permission-x ✓ + %td.permission-x ✓ + %td.permission-x ✓ %tr %td Create new merge request %td %td - %td X - %td X - %td + %td.permission-x ✓ + %td.permission-x ✓ + %td.permission-x ✓ %tr %td Create new branches %td %td - %td X - %td X - %td + %td.permission-x ✓ + %td.permission-x ✓ + %td.permission-x ✓ %tr %td Push to non-protected branches %td %td - %td X - %td X - %td + %td.permission-x ✓ + %td.permission-x ✓ + %td.permission-x ✓ %tr %td Remove non-protected branches %td %td - %td X - %td X - %td + %td.permission-x ✓ + %td.permission-x ✓ + %td.permission-x ✓ %tr %td Add tags %td %td - %td X - %td X - %td + %td.permission-x ✓ + %td.permission-x ✓ + %td.permission-x ✓ %tr %td Write a wiki %td %td - %td X - %td X - %td + %td.permission-x ✓ + %td.permission-x ✓ + %td.permission-x ✓ %tr %td Add new team members %td %td %td - %td X - %td + %td.permission-x ✓ + %td.permission-x ✓ %tr %td Push to protected branches %td %td %td - %td X - %td + %td.permission-x ✓ + %td.permission-x ✓ %tr %td Remove protected branches %td %td %td - %td X - %td + %td.permission-x ✓ + %td.permission-x ✓ %tr %td Edit project %td %td %td - %td X - %td + %td.permission-x ✓ + %td.permission-x ✓ %tr %td Add Deploy Keys to project %td %td %td - %td X - %td + %td.permission-x ✓ + %td.permission-x ✓ %tr %td Configure Project Hooks %td %td %td - %td X - %td + %td.permission-x ✓ + %td.permission-x ✓ %tr %td Switch public mode %td %td %td %td - %td X + %td.permission-x ✓ %tr %td Transfer project to another namespace %td %td %td %td - %td X + %td.permission-x ✓ %tr %td Remove project %td %td %td %td - %td X + %td.permission-x ✓ |