fnp
/
fnpeditor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
add1f0d
)
editor: styling gutter comments
author
Aleksander Łukasz
<aleksander.lukasz@nowoczesnapolska.org.pl>
Tue, 27 May 2014 12:41:32 +0000
(14:41 +0200)
committer
Aleksander Łukasz
<aleksander.lukasz@nowoczesnapolska.org.pl>
Wed, 28 May 2014 12:45:59 +0000
(14:45 +0200)
src/editor/modules/documentCanvas/canvas/comments/comment.html
patch
|
blob
|
history
src/editor/modules/documentCanvas/canvas/comments/comments.js
patch
|
blob
|
history
src/editor/modules/documentCanvas/canvas/comments/comments.less
patch
|
blob
|
history
src/editor/modules/documentCanvas/canvas/gutter.less
patch
|
blob
|
history
diff --git
a/src/editor/modules/documentCanvas/canvas/comments/comment.html
b/src/editor/modules/documentCanvas/canvas/comments/comment.html
index
47af2ce
..
68c14c1
100644
(file)
--- a/
src/editor/modules/documentCanvas/canvas/comments/comment.html
+++ b/
src/editor/modules/documentCanvas/canvas/comments/comment.html
@@
-16,7
+16,7
@@
</div>
</div>
<div class="toolbox">
</div>
</div>
<div class="toolbox">
- <a href="#" class="edit-start-btn"><%= gettext('edit') %></a>
+ <a href="#" class="edit-start-btn"><%= gettext('edit') %></a>
-
<a href="#" class="remove-btn"><%= gettext('remove') %></a>
</div>
</div>
<a href="#" class="remove-btn"><%= gettext('remove') %></a>
</div>
</div>
diff --git
a/src/editor/modules/documentCanvas/canvas/comments/comments.js
b/src/editor/modules/documentCanvas/canvas/comments/comments.js
index
41ed973
..
692c0b7
100644
(file)
--- 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();
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');
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
(file)
--- a/
src/editor/modules/documentCanvas/canvas/comments/comments.less
+++ b/
src/editor/modules/documentCanvas/canvas/comments/comments.less
@@
-1,5
+1,5
@@
.comments {
.comments {
- @borderColor: darken(#FFFCB7,
1
5%);
+ @borderColor: darken(#FFFCB7,
4
5%);
font-size: 12px;
font-size: 12px;
@@
-7,11
+7,15
@@
border-color: @borderColor;
border-style: solid;
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 {
.header {
- border-bottom: 1px solid @borderColor;
padding: 0 3px;
font-size: 10px;
padding: 0 3px;
font-size: 10px;
@@
-35,18
+39,19
@@
.newComment {
margin-top: 10px;
.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
}
\ 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
(file)
--- 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;
display: table-cell;
width: calc(~'100% - 800px');
min-width: 250px;
+ padding-left: 45px;
}
.gutter-box {
}
.gutter-box {