Commit 80812a5d authored by Jacob Schatz's avatar Jacob Schatz

Edited time ago location change.

Change edited icon to word.
Change edited text color to gray
cc/ @creamzy
parent 7f5a87f1
...@@ -211,44 +211,49 @@ $ -> ...@@ -211,44 +211,49 @@ $ ->
$this.attr 'value', $this.val() $this.attr 'value', $this.val()
return return
$(document).on 'keyup', 'input[type="search"]' , (e) -> $(document)
$this = $(this) .off 'keyup', 'input[type="search"]'
$this.attr 'value', $this.val() .on 'keyup', 'input[type="search"]' , (e) ->
$this = $(this)
$(document).on 'breakpoint:change', (e, breakpoint) -> $this.attr 'value', $this.val()
if breakpoint is 'sm' or breakpoint is 'xs'
$gutterIcon = $('.gutter-toggle').find('i') $(document)
if $gutterIcon.hasClass('fa-angle-double-right') .off 'breakpoint:change'
$gutterIcon.closest('a').trigger('click') .on 'breakpoint:change', (e, breakpoint) ->
if breakpoint is 'sm' or breakpoint is 'xs'
$gutterIcon = $('.gutter-toggle').find('i')
$(document).on 'click', 'aside .gutter-toggle', (e) -> if $gutterIcon.hasClass('fa-angle-double-right')
e.preventDefault() $gutterIcon.closest('a').trigger('click')
$this = $(this)
$thisIcon = $this.find 'i' $(document)
if $thisIcon.hasClass('fa-angle-double-right') .off 'click', 'aside .gutter-toggle'
$thisIcon.removeClass('fa-angle-double-right') .on 'click', 'aside .gutter-toggle', (e) ->
.addClass('fa-angle-double-left') e.preventDefault()
$this $this = $(this)
.closest('aside') $thisIcon = $this.find 'i'
.removeClass('right-sidebar-expanded') if $thisIcon.hasClass('fa-angle-double-right')
.addClass('right-sidebar-collapsed') $thisIcon.removeClass('fa-angle-double-right')
$('.page-with-sidebar') .addClass('fa-angle-double-left')
.removeClass('right-sidebar-expanded') $this
.addClass('right-sidebar-collapsed') .closest('aside')
else .removeClass('right-sidebar-expanded')
$thisIcon.removeClass('fa-angle-double-left') .addClass('right-sidebar-collapsed')
.addClass('fa-angle-double-right') $('.page-with-sidebar')
$this .removeClass('right-sidebar-expanded')
.closest('aside') .addClass('right-sidebar-collapsed')
.removeClass('right-sidebar-collapsed') else
.addClass('right-sidebar-expanded') $thisIcon.removeClass('fa-angle-double-left')
$('.page-with-sidebar') .addClass('fa-angle-double-right')
.removeClass('right-sidebar-collapsed') $this
.addClass('right-sidebar-expanded') .closest('aside')
$.cookie("collapsed_gutter", .removeClass('right-sidebar-collapsed')
$('.right-sidebar') .addClass('right-sidebar-expanded')
.hasClass('right-sidebar-collapsed'), { path: '/' }) $('.page-with-sidebar')
.removeClass('right-sidebar-collapsed')
.addClass('right-sidebar-expanded')
$.cookie("collapsed_gutter",
$('.right-sidebar')
.hasClass('right-sidebar-collapsed'), { path: '/' })
bootstrapBreakpoint = undefined; bootstrapBreakpoint = undefined;
checkBootstrapBreakpoints = -> checkBootstrapBreakpoints = ->
...@@ -282,8 +287,10 @@ $ -> ...@@ -282,8 +287,10 @@ $ ->
if bootstrapBreakpoint is "xs" or "sm" if bootstrapBreakpoint is "xs" or "sm"
$(document).trigger('breakpoint:change', [bootstrapBreakpoint]) $(document).trigger('breakpoint:change', [bootstrapBreakpoint])
$(window).on "resize", (e) -> $(window)
fitSidebarForSize() .off "resize"
.on "resize", (e) ->
fitSidebarForSize()
setBootstrapBreakpoints() setBootstrapBreakpoints()
checkInitialSidebarSize() checkInitialSidebarSize()
......
...@@ -233,3 +233,9 @@ ...@@ -233,3 +233,9 @@
} }
} }
} }
.detail-page-description {
small {
color: $gray-darkest;
}
}
\ No newline at end of file
...@@ -15,11 +15,6 @@ ...@@ -15,11 +15,6 @@
opened by #{link_to_member(@project, @issue.author, size: 24)} opened by #{link_to_member(@project, @issue.author, size: 24)}
· ·
= time_ago_with_tooltip(@issue.created_at, placement: 'bottom', html_class: 'issue_created_ago') = time_ago_with_tooltip(@issue.created_at, placement: 'bottom', html_class: 'issue_created_ago')
- if @issue.updated_at != @issue.created_at
%span
·
= icon('edit', title: 'edited')
= time_ago_with_tooltip(@issue.updated_at, placement: 'bottom', html_class: 'issue_edited_ago')
.pull-right .pull-right
- if can?(current_user, :create_issue, @project) - if can?(current_user, :create_issue, @project)
...@@ -46,6 +41,10 @@ ...@@ -46,6 +41,10 @@
= markdown(@issue.description, cache_key: [@issue, "description"]) = markdown(@issue.description, cache_key: [@issue, "description"])
%textarea.hidden.js-task-list-field %textarea.hidden.js-task-list-field
= @issue.description = @issue.description
- if @issue.updated_at != @issue.created_at
%small
Edited
= time_ago_with_tooltip(@issue.updated_at, placement: 'bottom', html_class: 'issue_edited_ago')
.merge-requests .merge-requests
= render 'merge_requests' = render 'merge_requests'
......
...@@ -10,3 +10,8 @@ ...@@ -10,3 +10,8 @@
= markdown(@merge_request.description, cache_key: [@merge_request, "description"]) = markdown(@merge_request.description, cache_key: [@merge_request, "description"])
%textarea.hidden.js-task-list-field %textarea.hidden.js-task-list-field
= @merge_request.description = @merge_request.description
- if @merge_request.updated_at != @merge_request.created_at
%small
Edited
= time_ago_with_tooltip(@merge_request.updated_at, placement: 'bottom')
...@@ -8,11 +8,6 @@ ...@@ -8,11 +8,6 @@
opened by #{link_to_member(@project, @merge_request.author, size: 24)} opened by #{link_to_member(@project, @merge_request.author, size: 24)}
· ·
= time_ago_with_tooltip(@merge_request.created_at) = time_ago_with_tooltip(@merge_request.created_at)
- if @merge_request.updated_at != @merge_request.created_at
%span
·
= icon('edit', title: 'edited')
= time_ago_with_tooltip(@merge_request.updated_at, placement: 'bottom')
.issue-btn-group.pull-right .issue-btn-group.pull-right
- if can?(current_user, :update_merge_request, @merge_request) - if can?(current_user, :update_merge_request, @merge_request)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment