Skip to content
Snippets Groups Projects
Commit e8347424 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Dont load bootstrap buttons. Modified css with new buttons

parent b8f6d67b
No related branches found
No related tags found
No related merge requests found
Showing
with 24 additions and 21 deletions
Loading
Loading
@@ -14,7 +14,7 @@
.clearfix
= f.label :url, "URL:"
.input
= f.text_field :url, class: "text_field xxlarge"
= f.text_field :url, class: "text_field xxlarge input-xpadding", placeholder: 'http://example.com/trigger-ci.json'
 
= f.submit "Add Web Hook", class: "btn btn-create"
%hr
Loading
Loading
Loading
Loading
@@ -6,7 +6,7 @@
.pull-right
.span6
- if can? current_user, :write_issue, @project
= link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-primary pull-right", title: "New Issue", id: "new_issue_link" do
= link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-new pull-right", title: "New Issue", id: "new_issue_link" do
%i.icon-plus
New Issue
= form_tag project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: 'pull-right' do
Loading
Loading
@@ -14,7 +14,7 @@
= hidden_field_tag :assignee_id, params[:assignee_id], id: 'search_assignee_id'
= hidden_field_tag :milestone_id, params[:milestone_id], id: 'search_milestone_id'
= hidden_field_tag :label_name, params[:label_name], id: 'search_label_name'
= search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search input-xlarge append-right-10 search-text-input' }
= search_field_tag :issue_search, nil, { placeholder: 'Filter by title or description', class: 'input-xpadding issue_search input-xlarge append-right-10 search-text-input' }
 
.row
.span3
Loading
Loading
- if can? current_user, :write_merge_request, @project
= link_to new_project_merge_request_path(@project), class: "pull-right btn btn-primary", title: "New Merge Request" do
= link_to new_project_merge_request_path(@project), class: "pull-right btn btn-new", title: "New Merge Request" do
%i.icon-plus
New Merge Request
%h3.page-title
Loading
Loading
Loading
Loading
@@ -32,7 +32,7 @@
 
.form-actions
- if @milestone.new_record?
= f.submit 'Create milestone', class: "btn-save btn"
= f.submit 'Create milestone', class: "btn-create btn"
= link_to "Cancel", project_milestones_path(@project), class: "btn btn-cancel"
-else
= f.submit 'Save changes', class: "btn-save btn"
Loading
Loading
Loading
Loading
@@ -3,7 +3,7 @@
%h3.page-title
Milestones
- if can? current_user, :admin_milestone, @project
= link_to new_project_milestone_path(@project), class: "pull-right btn btn-primary", title: "New Milestone" do
= link_to new_project_milestone_path(@project), class: "pull-right btn btn-new", title: "New Milestone" do
%i.icon-plus
New Milestone
 
Loading
Loading
Loading
Loading
@@ -3,9 +3,9 @@
 
- if can? current_user, :admin_team_member, @project
%span.pull-right
= link_to import_project_team_members_path(@project), class: "btn btn-small grouped", title: "Import team from another project" do
= link_to import_project_team_members_path(@project), class: "btn grouped", title: "Import team from another project" do
Import team from another project
= link_to new_project_team_member_path(@project), class: "btn btn-primary small grouped", title: "New Team Member" do
= link_to new_project_team_member_path(@project), class: "btn btn-new grouped", title: "New Team Member" do
New Team Member
 
%p.light
Loading
Loading
Loading
Loading
@@ -29,8 +29,9 @@
= f.label :commit_message
.input= f.text_field :message, class: 'span8'
.actions
= f.submit 'Save', class: "btn-save btn"
- if @wiki && @wiki.persisted?
= f.submit 'Save changes', class: "btn-save btn"
= link_to "Cancel", project_wiki_path(@project, @wiki), class: "btn btn-cancel"
- else
= f.submit 'Create page', class: "btn-create btn"
= link_to "Cancel", project_wiki_path(@project, :home), class: "btn btn-cancel"
Loading
Loading
@@ -12,7 +12,7 @@
 
- if can?(current_user, :write_wiki, @project)
.pull-right
= link_to '#', class: "add-new-wiki btn btn-small btn-primary" do
= link_to '#', class: "add-new-wiki btn btn-new" do
%i.icon-plus
New Page
 
Loading
Loading
= render 'nav'
%h3.page-title
Git Access
Git access for
%strong= @gollum_wiki.path_with_namespace
= render 'main_links'
 
%br
.content
.project_clone_panel
.row
Loading
Loading
%h3.page-title
My Snippets
%small share code pastes with others out of git repository
.pull-right
= link_to new_snippet_path, class: "btn btn-small add_new grouped btn-primary", title: "New Snippet" do
= link_to new_snippet_path, class: "btn btn-new grouped", title: "New Snippet" do
Add new snippet
= link_to snippets_path, class: "btn btn-small grouped" do
= link_to snippets_path, class: "btn grouped" do
Discover snippets
 
%p.light
Share code pastes with others out of git repository
%hr
 
.row
Loading
Loading
%h3.page-title
Public snippets
%small share code pastes with others out of git repository
 
.pull-right
= link_to new_snippet_path, class: "btn btn-small add_new grouped btn-primary", title: "New Snippet" do
= link_to new_snippet_path, class: "btn btn-new grouped", title: "New Snippet" do
Add new snippet
= link_to user_snippets_path(current_user), class: "btn btn-small grouped" do
= link_to user_snippets_path(current_user), class: "btn grouped" do
My snippets
 
%p.light
Public snippets created by you and other users are listed here
%hr
= render 'snippets'
 
Loading
Loading
@@ -7,7 +7,7 @@
private
 
.pull-right
= link_to new_snippet_path, class: "btn btn-small add_new grouped btn-primary", title: "New Snippet" do
= link_to new_snippet_path, class: "btn btn-new btn-small", title: "New Snippet" do
Add new snippet
 
 
Loading
Loading
Loading
Loading
@@ -12,7 +12,7 @@ class Profile < Spinach::FeatureSteps
fill_in "user_skype", with: "testskype"
fill_in "user_linkedin", with: "testlinkedin"
fill_in "user_twitter", with: "testtwitter"
click_button "Save"
click_button "Save changes"
@user.reload
end
 
Loading
Loading
Loading
Loading
@@ -9,7 +9,7 @@ class ProjectFeature < Spinach::FeatureSteps
end
 
And 'I save project' do
click_button 'Save'
click_button 'Save changes'
end
 
Then 'I should see project with new settings' do
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment