Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-08-17 10:26:59 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-08-17 10:26:59 +0400
commit93401ef9887b297343d5bf33b4fbf39f13090894 (patch)
treeac365e9c4ad12d1c98e8eaf756e35a6f58b0c44d /app
parent813814f02ed7bf226782861820570117fa196026 (diff)
Few css improvements
Diffstat (limited to 'app')
-rw-r--r--app/views/commits/_commit_box.html.haml6
-rw-r--r--app/views/issues/_form.html.haml12
-rw-r--r--app/views/issues/index.html.haml5
-rw-r--r--app/views/milestones/_form.html.haml6
4 files changed, 15 insertions, 14 deletions
diff --git a/app/views/commits/_commit_box.html.haml b/app/views/commits/_commit_box.html.haml
index 52f03ba73c3..506f4e092a1 100644
--- a/app/views/commits/_commit_box.html.haml
+++ b/app/views/commits/_commit_box.html.haml
@@ -5,10 +5,10 @@
%span.btn.disabled.grouped
%i.icon-comment
= @notes_count
- = link_to patch_project_commit_path(@project, @commit.id), class: "btn small grouped" do
+ = link_to patch_project_commit_path(@project, @commit.id), class: "btn small grouped" do
%i.icon-download-alt
- Get Patch
- = link_to tree_project_ref_path(@project, @commit.id), class: "browse-button primary grouped" do
+ Get Patch
+ = link_to tree_project_ref_path(@project, @commit.id), class: "browse-button primary grouped" do
%strong Browse Code ยป
%h3.commit-title.page_title
= gfm @commit.title
diff --git a/app/views/issues/_form.html.haml b/app/views/issues/_form.html.haml
index 6139f3d4cbc..1b67eabd5a5 100644
--- a/app/views/issues/_form.html.haml
+++ b/app/views/issues/_form.html.haml
@@ -1,5 +1,5 @@
%div.issue-form-holder
- %h3= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
+ %h3.page_title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
= form_for [@project, @issue], remote: request.xhr? do |f|
-if @issue.errors.any?
.alert-message.block-message.error
@@ -9,26 +9,26 @@
.issue_form_box
.issue_title
.clearfix
- = f.label :title do
+ = f.label :title do
%strong= "Subject *"
.input
= f.text_field :title, maxlength: 255, class: "xxlarge"
.issue_middle_block
.issue_assignee
- = f.label :assignee_id do
+ = f.label :assignee_id do
%i.icon-user
Assign to
.input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { include_blank: "Select a user" })
.issue_milestone
- = f.label :milestone_id do
+ = f.label :milestone_id do
%i.icon-time
Milestone
.input= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" })
.issue_description
.clearfix
- = f.label :label_list do
- %i.icon-tag
+ = f.label :label_list do
+ %i.icon-tag
Labels
.input
= f.text_field :label_list, maxlength: 2000, class: "xxlarge"
diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml
index 8876d24dee5..a6836fd4fd1 100644
--- a/app/views/issues/index.html.haml
+++ b/app/views/issues/index.html.haml
@@ -7,6 +7,7 @@
.span5
- if can? current_user, :write_issue, @project
= link_to new_project_issue_path(@project), class: "right btn small", title: "New Issue", remote: true do
+ %i.icon-plus
New Issue
= form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: :right do
= hidden_field_tag :project_id, @project.id, { id: 'project_id' }
@@ -21,7 +22,7 @@
.issues_bulk_update.hide
- = form_tag bulk_update_project_issues_path(@project), method: :post do
+ = form_tag bulk_update_project_issues_path(@project), method: :post do
%span.update_issues_text Update selected issues with &nbsp;
.left
= select_tag('update[status]', options_for_select(['open', 'closed']), prompt: "Status")
@@ -53,7 +54,7 @@
= select_tag(:milestone_id, options_from_collection_for_select([unassigned_filter] + @project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), prompt: "Milestone")
= hidden_field_tag :f, params[:f]
.clearfix
-
+
%ul#issues-table.unstyled.issues_table
= render "issues"
diff --git a/app/views/milestones/_form.html.haml b/app/views/milestones/_form.html.haml
index daae58fe1e0..1cd08ac3bcf 100644
--- a/app/views/milestones/_form.html.haml
+++ b/app/views/milestones/_form.html.haml
@@ -1,4 +1,4 @@
-%h3= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}"
+%h3.page_title= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}"
.back_link
= link_to project_milestones_path(@project) do
&larr; To milestones
@@ -17,12 +17,12 @@
= f.label :title, "Title", class: "control-label"
.controls
= f.text_field :title, maxlength: 255, class: "input-xlarge"
- %p.help-block Required
+ %p.hint Required
.control-group
= f.label :description, "Description", class: "control-label"
.controls
= f.text_area :description, maxlength: 2000, class: "input-xlarge", rows: 10
- %p.help-block Markdown is enabled.
+ %p.hint Markdown is enabled.
.span6
.control-group
= f.label :due_date, "Due Date", class: "control-label"