summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-18 06:14:05 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-18 06:14:05 +0300
commit8826077471d667680ee0ed9f86a41c4b30429e5c (patch)
tree24cda0ab9c38574ef35420c27521f21b73037f53 /app/views
parent85d5f606f656fc8680e28baf3d58d24898d23261 (diff)
downloadgitlab-ce-8826077471d667680ee0ed9f86a41c4b30429e5c.tar.gz
Refactor css lists. Use well-list class
Diffstat (limited to 'app/views')
-rw-r--r--app/views/commits/_commits.html.haml2
-rw-r--r--app/views/compare/show.html.haml2
-rw-r--r--app/views/dashboard/_groups.html.haml6
-rw-r--r--app/views/dashboard/_projects.html.haml8
-rw-r--r--app/views/dashboard/issues.html.haml2
-rw-r--r--app/views/dashboard/merge_requests.html.haml7
-rw-r--r--app/views/events/event/_push.html.haml2
-rw-r--r--app/views/groups/_projects.html.haml6
-rw-r--r--app/views/groups/issues.html.haml2
-rw-r--r--app/views/groups/merge_requests.html.haml2
-rw-r--r--app/views/groups/people.html.haml4
-rw-r--r--app/views/issues/_issues.html.haml2
-rw-r--r--app/views/issues/_show.html.haml2
-rw-r--r--app/views/issues/index.html.haml2
-rw-r--r--app/views/labels/_label.html.haml2
-rw-r--r--app/views/labels/index.html.haml2
-rw-r--r--app/views/merge_requests/_merge_request.html.haml2
-rw-r--r--app/views/merge_requests/index.html.haml2
-rw-r--r--app/views/merge_requests/show/_commits.html.haml6
-rw-r--r--app/views/milestones/index.html.haml2
-rw-r--r--app/views/services/index.html.haml12
-rw-r--r--app/views/team_members/_show.html.haml2
-rw-r--r--app/views/team_members/_team.html.haml6
23 files changed, 43 insertions, 42 deletions
diff --git a/app/views/commits/_commits.html.haml b/app/views/commits/_commits.html.haml
index c3c7d49ce74..c9217989884 100644
--- a/app/views/commits/_commits.html.haml
+++ b/app/views/commits/_commits.html.haml
@@ -3,4 +3,4 @@
%h5.small
%i.icon-calendar
= day.stamp("28 Aug, 2010")
- %ul.unstyled= render commits
+ %ul.well-list= render commits
diff --git a/app/views/compare/show.html.haml b/app/views/compare/show.html.haml
index 528c8b44af4..2abbd3fc0ee 100644
--- a/app/views/compare/show.html.haml
+++ b/app/views/compare/show.html.haml
@@ -9,7 +9,7 @@
- if @commits.present?
%div.ui-box
%h5.small Commits (#{@commits.count})
- %ul.unstyled= render @commits
+ %ul.well-list= render @commits
- unless @diffs.empty?
%h4 Diff
diff --git a/app/views/dashboard/_groups.html.haml b/app/views/dashboard/_groups.html.haml
index 0ef054155b6..9e3401e51b8 100644
--- a/app/views/dashboard/_groups.html.haml
+++ b/app/views/dashboard/_groups.html.haml
@@ -8,11 +8,11 @@
= link_to new_admin_group_path, class: "btn very_small info" do
%i.icon-plus
New Group
- %ul.unstyled
+ %ul.well-list
- groups.each do |group|
- %li.wll
+ %li
= link_to group_path(id: group.path), class: dom_class(group) do
- %strong.group_name= truncate(group.name, length: 35)
+ %strong.well-title= truncate(group.name, length: 35)
%span.arrow
&rarr;
%span.last_activity
diff --git a/app/views/dashboard/_projects.html.haml b/app/views/dashboard/_projects.html.haml
index d92983ff6a5..cffafb5445c 100644
--- a/app/views/dashboard/_projects.html.haml
+++ b/app/views/dashboard/_projects.html.haml
@@ -16,14 +16,14 @@
= nav_tab :scope, 'joined' do
= link_to "Joined", dashboard_path(scope: 'joined')
- %ul.unstyled
+ %ul.well-list
- projects.each do |project|
- %li.wll
+ %li
= link_to project_path(project), class: dom_class(project) do
- if project.namespace
= project.namespace.human_name
\/
- %strong.project_name
+ %strong.well-title
= truncate(project.name, length: 25)
%span.arrow
&rarr;
@@ -31,6 +31,6 @@
%strong Last activity:
%span= project_last_activity(project)
- if projects.blank?
- %li.wll
+ %li
%h3.nothing_here_message There are no projects here.
.bottom= paginate projects, theme: "gitlab"
diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml
index c2c124980f4..52863229644 100644
--- a/app/views/dashboard/issues.html.haml
+++ b/app/views/dashboard/issues.html.haml
@@ -14,7 +14,7 @@
%div.ui-box
- @project = group[0]
%h5= link_to_project @project
- %ul.unstyled.issues_table
+ %ul.well-list.issues_table
- group[1].each do |issue|
= render(partial: 'issues/show', locals: {issue: issue})
%hr
diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml
index ce9438405c8..ea7c8c9a3d5 100644
--- a/app/views/dashboard/merge_requests.html.haml
+++ b/app/views/dashboard/merge_requests.html.haml
@@ -10,11 +10,12 @@
.span9
- if @merge_requests.any?
- @merge_requests.group_by(&:project).each do |group|
- %ul.unstyled.ui-box
+ .ui-box
- @project = group[0]
%h5= link_to_project @project
- - group[1].each do |merge_request|
- = render(partial: 'merge_requests/merge_request', locals: {merge_request: merge_request})
+ %ul.well-list
+ - group[1].each do |merge_request|
+ = render(partial: 'merge_requests/merge_request', locals: {merge_request: merge_request})
%hr
= paginate @merge_requests, theme: "gitlab"
diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml
index 8d0718ad650..119b8e828d0 100644
--- a/app/views/events/event/_push.html.haml
+++ b/app/views/events/event/_push.html.haml
@@ -12,7 +12,7 @@
- if event.push_with_commits?
- project = event.project
.event-body
- %ul.unstyled.event_commits
+ %ul.well-list.event_commits
- few_commits = event.commits[0...2]
- few_commits.each do |commit|
= render "events/commit", commit: commit, project: project
diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml
index 39c0b6af685..0b491879fe0 100644
--- a/app/views/groups/_projects.html.haml
+++ b/app/views/groups/_projects.html.haml
@@ -8,13 +8,13 @@
= link_to new_project_path(namespace_id: @group.id), class: "btn very_small info" do
%i.icon-plus
New Project
- %ul.unstyled
+ %ul.well-list
- if projects.blank?
%p.nothing_here_message This groups has no projects yet
- projects.each do |project|
- %li.wll
+ %li
= link_to project_path(project), class: dom_class(project) do
- %strong.project_name= truncate(project.name, length: 25)
+ %strong.well-title= truncate(project.name, length: 25)
%span.arrow
&rarr;
%span.last_activity
diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml
index cc488d57e9e..0daf4d752a8 100644
--- a/app/views/groups/issues.html.haml
+++ b/app/views/groups/issues.html.haml
@@ -10,7 +10,7 @@
%div.ui-box
- @project = group[0]
%h5= @project.name
- %ul.unstyled.issues_table
+ %ul.well-list.issues_table
- group[1].each do |issue|
= render(partial: 'issues/show', locals: {issue: issue})
%hr
diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml
index 23a7e7222d7..72aa4ad11e1 100644
--- a/app/views/groups/merge_requests.html.haml
+++ b/app/views/groups/merge_requests.html.haml
@@ -6,7 +6,7 @@
%br
- if @merge_requests.any?
- @merge_requests.group_by(&:project).each do |group|
- %ul.unstyled.ui-box
+ %ul.well-list.ui-box
- @project = group[0]
%h5= @project.name
- group[1].each do |merge_request|
diff --git a/app/views/groups/people.html.haml b/app/views/groups/people.html.haml
index 68102b6a85a..be3dd7a4d78 100644
--- a/app/views/groups/people.html.haml
+++ b/app/views/groups/people.html.haml
@@ -9,9 +9,9 @@
Team
%small
(#{@users.size})
- %ul.unstyled
+ %ul.well-list
- @users.each do |user|
- %li.wll
+ %li
= image_tag gravatar_icon(user.email, 16), class: "avatar s16"
%strong= user.name
%span.cgray= user.email
diff --git a/app/views/issues/_issues.html.haml b/app/views/issues/_issues.html.haml
index f82ae8bde58..d7ba4300ce7 100644
--- a/app/views/issues/_issues.html.haml
+++ b/app/views/issues/_issues.html.haml
@@ -6,7 +6,7 @@
.row
.span7= paginate @issues, remote: true, theme: "gitlab"
.span3.right
- %span.cgray.right
+ %span.cgray.right
%span.issue_counter #{@issues.total_count}
issues for this filter
- else
diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml
index ca8cdf704a9..b4c9ed98a6e 100644
--- a/app/views/issues/_show.html.haml
+++ b/app/views/issues/_show.html.haml
@@ -1,4 +1,4 @@
-%li.wll{ id: dom_id(issue), class: issue_css_classes(issue), url: project_issue_path(issue.project, issue) }
+%li{ id: dom_id(issue), class: issue_css_classes(issue), url: project_issue_path(issue.project, issue) }
- if controller.controller_name == 'issues'
.issue_check
= check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue", disabled: !can?(current_user, :modify_issue, issue)
diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml
index d89b183d360..4f551ffff92 100644
--- a/app/views/issues/index.html.haml
+++ b/app/views/issues/index.html.haml
@@ -55,7 +55,7 @@
= hidden_field_tag :f, params[:f]
.clearfix
- %ul#issues-table.unstyled.issues_table
+ %ul#issues-table.well-list.issues_table
= render "issues"
#new_issue_dialog
diff --git a/app/views/labels/_label.html.haml b/app/views/labels/_label.html.haml
index 8a465a9e02c..6e223e8e61d 100644
--- a/app/views/labels/_label.html.haml
+++ b/app/views/labels/_label.html.haml
@@ -1,4 +1,4 @@
-%li.wll
+%li
%strong
%i.icon-tag
= label.name
diff --git a/app/views/labels/index.html.haml b/app/views/labels/index.html.haml
index 4e41d375d6a..6eb2c00e56d 100644
--- a/app/views/labels/index.html.haml
+++ b/app/views/labels/index.html.haml
@@ -4,7 +4,7 @@
Labels
%br
%div.ui-box
- %ul.unstyled.labels-table
+ %ul.well-list.labels-table
- @labels.each do |label|
= render 'label', label: label
diff --git a/app/views/merge_requests/_merge_request.html.haml b/app/views/merge_requests/_merge_request.html.haml
index 4f68c5f2620..7369f3dd061 100644
--- a/app/views/merge_requests/_merge_request.html.haml
+++ b/app/views/merge_requests/_merge_request.html.haml
@@ -1,4 +1,4 @@
-%li.wll{ class: mr_css_classes(merge_request) }
+%li{ class: mr_css_classes(merge_request) }
.right
.left
- if merge_request.merged?
diff --git a/app/views/merge_requests/index.html.haml b/app/views/merge_requests/index.html.haml
index 7bcb7a81e1a..5b234bfbe02 100644
--- a/app/views/merge_requests/index.html.haml
+++ b/app/views/merge_requests/index.html.haml
@@ -30,7 +30,7 @@
= hidden_field_tag :f, params[:f]
.clearfix
- %ul.unstyled
+ %ul.well-list
= render @merge_requests
- if @merge_requests.blank?
%li
diff --git a/app/views/merge_requests/show/_commits.html.haml b/app/views/merge_requests/show/_commits.html.haml
index d25e707c64e..796922776d9 100644
--- a/app/views/merge_requests/show/_commits.html.haml
+++ b/app/views/merge_requests/show/_commits.html.haml
@@ -5,19 +5,19 @@
Commits (#{@commits.count})
.merge-request-commits
- if @commits.count > 8
- %ul.first_mr_commits.unstyled
+ %ul.first_mr_commits.well-list
- @commits.first(8).each do |commit|
= render "commits/commit", commit: commit
%li.bottom
8 of #{@commits.count} commits displayed.
%strong
%a.mr_show_all_commits Click here to show all
- %ul.all_mr_commits.hide.unstyled
+ %ul.all_mr_commits.hide.well-list
- @commits.each do |commit|
= render "commits/commit", commit: commit
- else
- %ul.unstyled
+ %ul.well-list
- @commits.each do |commit|
= render "commits/commit", commit: commit
diff --git a/app/views/milestones/index.html.haml b/app/views/milestones/index.html.haml
index 813fb362e25..3089595fe0b 100644
--- a/app/views/milestones/index.html.haml
+++ b/app/views/milestones/index.html.haml
@@ -18,7 +18,7 @@
= link_to project_milestones_path(@project, f: "all") do
All
- %ul.unstyled
+ %ul.well-list
= render @milestones
- if @milestones.present?
diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml
index 2b4655285e2..2c94f965eec 100644
--- a/app/views/services/index.html.haml
+++ b/app/views/services/index.html.haml
@@ -2,8 +2,8 @@
%h3.page_title Services
%br
-%ul.unstyled.ui-box
- %li.wll
+%ul.ui-box.well-list
+ %li
%h4.cgreen
= link_to edit_project_service_path(@project, :gitlab_ci) do
GitLab CI
@@ -17,14 +17,14 @@
%small.cgray
%i.icon-off
Disabled
- %li.wll
- %h4.cgray
+ %li.disabled
+ %h4
Jenkins CI
%small An extendable open source continuous integration server
.right
%small Not implemented yet
- %li.wll
- %h4.cgray
+ %li.disabled
+ %h4
Campfire
%small Web-based group chat tool
.right
diff --git a/app/views/team_members/_show.html.haml b/app/views/team_members/_show.html.haml
index 8938c7d8a6d..8082f47fca8 100644
--- a/app/views/team_members/_show.html.haml
+++ b/app/views/team_members/_show.html.haml
@@ -1,6 +1,6 @@
- user = member.user
- allow_admin = can? current_user, :admin_project, @project
-%li.wll{id: dom_id(member), class: "team_member_row user_#{user.id}"}
+%li{id: dom_id(member), class: "team_member_row user_#{user.id}"}
.row
.span6
= link_to project_team_member_path(@project, member), title: user.name, class: "dark" do
diff --git a/app/views/team_members/_team.html.haml b/app/views/team_members/_team.html.haml
index e5fc4316279..462e75af183 100644
--- a/app/views/team_members/_team.html.haml
+++ b/app/views/team_members/_team.html.haml
@@ -1,9 +1,9 @@
- grouper_project_members(@project).each do |access, members|
- %fieldset
- %legend
+ .ui-box
+ %h5
= Project.access_options.key(access).pluralize
%small= members.size
- %ul.unstyled
+ %ul.well-list
- members.sort_by(&:user_name).each do |up|
= render(partial: 'team_members/show', locals: {member: up})