From: Aleksander Ɓukasz Date: Tue, 27 May 2014 12:41:32 +0000 (+0200) Subject: editor: styling gutter comments X-Git-Url: https://git.mdrn.pl/fnpeditor.git/commitdiff_plain/4f9d834d93e434d9b8375bb320b0555c98ef5d07?ds=sidebyside;hp=--cc editor: styling gutter comments --- 4f9d834d93e434d9b8375bb320b0555c98ef5d07 diff --git a/src/editor/modules/documentCanvas/canvas/comments/comment.html b/src/editor/modules/documentCanvas/canvas/comments/comment.html index 47af2ce..68c14c1 100644 --- a/src/editor/modules/documentCanvas/canvas/comments/comment.html +++ b/src/editor/modules/documentCanvas/canvas/comments/comment.html @@ -16,7 +16,7 @@
- <%= gettext('edit') %> + <%= gettext('edit') %> - <%= gettext('remove') %>
diff --git a/src/editor/modules/documentCanvas/canvas/comments/comments.js b/src/editor/modules/documentCanvas/canvas/comments/comments.js index 41ed973..692c0b7 100644 --- a/src/editor/modules/documentCanvas/canvas/comments/comments.js +++ b/src/editor/modules/documentCanvas/canvas/comments/comments.js @@ -142,6 +142,11 @@ var CommentView = function(commentNode) { metaData.some(function(row) { date = row.getValue(); + if(/[0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/g.test(date)) { + date = date.split(':'); + date.pop(); + date = date.join(':'); + } return true; }, 'date'); diff --git a/src/editor/modules/documentCanvas/canvas/comments/comments.less b/src/editor/modules/documentCanvas/canvas/comments/comments.less index 7476123..140e836 100644 --- a/src/editor/modules/documentCanvas/canvas/comments/comments.less +++ b/src/editor/modules/documentCanvas/canvas/comments/comments.less @@ -1,5 +1,5 @@ .comments { - @borderColor: darken(#FFFCB7, 15%); + @borderColor: darken(#FFFCB7, 45%); font-size: 12px; @@ -7,11 +7,15 @@ border-color: @borderColor; border-style: solid; - border-width: 1px; - margin-top: 10px; + border-width: 1px 0; + margin-top: -1px; + padding-bottom: 10px; + + &:first-child { + margin-top:0; + } .header { - border-bottom: 1px solid @borderColor; padding: 0 3px; font-size: 10px; @@ -35,18 +39,19 @@ .newComment { margin-top: 10px; - textarea { - display: block; - width: 95%; - padding: 2px 2px; - margin: 0 0 10px 0; - font-size: 12px; - resize: vertical; - outline: none !important; - box-shadow: none; - } } + textarea { + display: block; + width: calc(~'100% - 4px'); + padding: 2px 2px; + margin: 0 0 10px 0; + font-size: 12px; + resize: vertical; + outline: none !important; + box-shadow: none; + + } } \ No newline at end of file diff --git a/src/editor/modules/documentCanvas/canvas/gutter.less b/src/editor/modules/documentCanvas/canvas/gutter.less index b6747a2..b41179b 100644 --- a/src/editor/modules/documentCanvas/canvas/gutter.less +++ b/src/editor/modules/documentCanvas/canvas/gutter.less @@ -2,6 +2,7 @@ display: table-cell; width: calc(~'100% - 800px'); min-width: 250px; + padding-left: 45px; } .gutter-box {