diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-17 20:35:06 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-17 20:35:06 +0000 |
| commit | dc396d0fa4b18815b4517c23b0d4e50c23b20db7 (patch) | |
| tree | e0c025eefa0e4ac7f4f82a4827f2d4e045a90f77 /app/assets | |
| parent | ab9970e22c7d68fd2338f0fa1a5cf3ad3ad4457b (diff) | |
| parent | 2941a76fe0fa5305bd6e31e6c47477732e3e7cec (diff) | |
| download | gitlab-ce-dc396d0fa4b18815b4517c23b0d4e50c23b20db7.tar.gz | |
Merge branch 'edited-text' into 'master'
Edited timeago text on comments
Unified the 'edited text' to be the same in descriptions and comments
Closes #5538
See merge request !3063
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index 75d7f52bbb6..b164231e7ef 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -343,6 +343,7 @@ class @Notes updateNote: (_xhr, note, _status) => # Convert returned HTML to a jQuery object so we can modify it further $html = $(note.html) + $('.js-timeago', $html).timeago() $html.syntaxHighlight() $html.find('.js-task-list-container').taskList('enable') diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index c975ca0ce43..6f93299404c 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -262,3 +262,11 @@ color: $gray-darkest; } } + +.edited-text { + color: $gray-darkest; + + .author_link { + color: $gray-darkest; + } +} |