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

Minor UI improvements

parent 0175e665
No related branches found
No related tags found
No related merge requests found
.snippet.file-holder {
.file-title {
.snippet-file-name {
padding: 4px 10px;
position: relative;
top: -4px;
left: -4px;
Loading
Loading
Loading
Loading
@@ -4,6 +4,7 @@
New Merge Request
%h3.page-title
Merge Requests
%span (#{@merge_requests.total_count})
 
 
.row
Loading
Loading
Loading
Loading
@@ -32,7 +32,7 @@
.automerge_widget.cannot_be_merged{style: "display:none"}
.alert.alert-disabled
%span
= link_to "Show how to merge", "#modal_merge_info", class: "how_to_merge_link btn btn-small padded", title: "How To Merge", "data-toggle" => "modal"
= link_to "Show how to merge", "#modal_merge_info", class: "how_to_merge_link btn padded", title: "How To Merge", "data-toggle" => "modal"
 
%strong This request can't be merged with GitLab. You should do it manually
 
Loading
Loading
Loading
Loading
@@ -27,8 +27,11 @@
= f.hidden_field :content, class: 'snippet-file-content'
 
.form-actions
= f.submit 'Save', class: "btn-save btn"
= link_to "Cancel", project_snippets_path(@project), class: " btn"
- if @snippet.new_record?
= f.submit 'Create snippet', class: "btn-create btn"
- else
= f.submit 'Save', class: "btn-save btn"
= link_to "Cancel", project_snippets_path(@project), class: " btn btn-cancel"
- unless @snippet.new_record?
.pull-right= link_to 'Destroy', project_snippet_path(@project, @snippet), confirm: 'Are you sure?', method: :delete, class: "btn pull-right danger delete-snippet", id: "destroy_snippet_#{@snippet.id}"
 
Loading
Loading
%h3.page-title
Snippets
%small share code pastes with others out of git repository
- if can? current_user, :write_project_snippet, @project
= link_to new_project_snippet_path(@project), class: "btn btn-small add_new pull-right", title: "New Snippet" do
= link_to new_project_snippet_path(@project), class: "btn btn-new pull-right", title: "New Snippet" do
Add new snippet
%p.light
Share code pastes with others out of git repository
%hr
%ul.bordered-list
= render partial: "projects/snippets/snippet", collection: @snippets
Loading
Loading
Loading
Loading
@@ -14,7 +14,8 @@
.controls= f.text_field :title, placeholder: "Example Snippet", class: 'input-xlarge', required: true
.control-group
= f.label "Private?"
.controls= f.check_box :private, {class: ''}
.controls
= f.check_box :private, {class: ''}
.control-group
.file-editor
= f.label :file_name, "File"
Loading
Loading
@@ -32,7 +33,7 @@
- else
= f.submit 'Save', class: "btn-save btn"
 
= link_to "Cancel", snippets_path(@project), class: " btn"
= link_to "Cancel", snippets_path(@project), class: "btn btn-cancel"
- unless @snippet.new_record?
.pull-right= link_to 'Destroy', snippet_path(@snippet), confirm: 'Removed snippet cannot be restored! Are you sure?', method: :delete, class: "btn pull-right danger delete-snippet", id: "destroy_snippet_#{@snippet.id}"
 
Loading
Loading
Loading
Loading
@@ -14,11 +14,20 @@
.span3
%ul.nav.nav-pills.nav-stacked
= nav_tab :scope, nil do
= link_to "All", user_snippets_path(@user)
= link_to user_snippets_path(@user) do
All
%span.pull-right
= @user.snippets.count
= nav_tab :scope, 'private' do
= link_to "Private", user_snippets_path(@user, scope: 'private')
= link_to user_snippets_path(@user, scope: 'private') do
Private
%span.pull-right
= @user.snippets.private.count
= nav_tab :scope, 'public' do
= link_to "Public", user_snippets_path(@user, scope: 'public')
= link_to user_snippets_path(@user, scope: 'public') do
Public
%span.pull-right
= @user.snippets.public.count
 
.span9.my-snippets
= render 'snippets'
Loading
Loading
Loading
Loading
@@ -58,7 +58,7 @@ class ProjectSnippets < Spinach::FeatureSteps
within('.file-editor') do
find(:xpath, "//input[@id='project_snippet_content']").set 'Content of snippet three'
end
click_button "Save"
click_button "Create snippet"
end
 
Then 'I should see snippet "Snippet three"' 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