##// END OF EJS Templates
- diff.css merge to main style.css...
marcink -
r1772:c83d3d42 beta
parent child Browse files
Show More
@@ -408,7 +408,7 b' class DiffProcessor(object):'
408 408 % {'a_id': anchor_old_id,
409 409 'old_lineno_cls': old_lineno_class})
410 410
411 _html.append('''<pre>%(link)s</pre>''' \
411 _html.append('''%(link)s''' \
412 412 % {'link':
413 413 _link_to_if(cond_old, change['old_lineno'], '#%s' \
414 414 % anchor_old)})
@@ -421,7 +421,7 b' class DiffProcessor(object):'
421 421 % {'a_id': anchor_new_id,
422 422 'new_lineno_cls': new_lineno_class})
423 423
424 _html.append('''<pre>%(link)s</pre>''' \
424 _html.append('''%(link)s''' \
425 425 % {'link':
426 426 _link_to_if(cond_new, change['new_lineno'], '#%s' \
427 427 % anchor_new)})
@@ -2742,7 +2742,6 b' div.gravatar img {'
2742 2742 -khtml-border-radius: 4px 4px 4px 4px !important;
2743 2743 -moz-border-radius: 4px 4px 4px 4px !important;
2744 2744 border-radius: 4px 4px 4px 4px !important;
2745 box-shadow: 0 1px 0 #DADADA !important;
2746 2745 cursor: pointer !important;
2747 2746 padding: 3px 3px 3px 3px;
2748 2747
@@ -3557,8 +3556,11 b' form.comment-inline-form {'
3557 3556 -moz-border-radius: 4px;
3558 3557 border-radius: 4px;
3559 3558 margin: 3px 3px 5px 5px;
3560 }
3561
3559 background-color: #FAFAFA;
3560 }
3561 .inline-comments .comment-wrapp{
3562 padding:1px;
3563 }
3562 3564 .inline-comments .comment .meta {
3563 3565 background: #f8f8f8;
3564 3566 padding: 6px;
@@ -3636,4 +3638,137 b' form.comment-inline-form {'
3636 3638 clear:both;
3637 3639 border-bottom: 1px solid #eee;
3638 3640 padding:5px 0px 5px 38px;
3641 }
3642
3643
3644 /*****************************************************************************
3645 DIFFS CSS
3646 ******************************************************************************/
3647
3648 div.diffblock {
3649 overflow: auto;
3650 padding: 0px;
3651 border: 1px solid #ccc;
3652 background: #f8f8f8;
3653 font-size: 100%;
3654 line-height: 100%;
3655 /* new */
3656 line-height: 125%;
3657 -webkit-border-radius: 6px 6px 0px 0px;
3658 -moz-border-radius: 6px 6px 0px 0px;
3659 border-radius: 6px 6px 0px 0px;
3660 }
3661 div.diffblock.margined{
3662 margin: 0px 20px 0px 20px;
3663 }
3664 div.diffblock .code-header{
3665 border-bottom: 1px solid #CCCCCC;
3666 background: #EEEEEE;
3667 padding:10px 0 10px 0;
3668 }
3669 div.diffblock .code-header div{
3670 margin-left:10px;
3671 font-weight: bold;
3672 font-size: 14px;
3673 }
3674 div.diffblock .code-body{
3675 background: #FFFFFF;
3676 }
3677 div.diffblock pre.raw{
3678 background: #FFFFFF;
3679 color:#000000;
3680 }
3681 table.code-difftable{
3682 border-collapse: collapse;
3683 width: 99%;
3684 }
3685 table.code-difftable td {
3686 padding: 0 !important;
3687 background: none !important;
3688 border:0 !important;
3689 vertical-align: none !important;
3690 }
3691 table.code-difftable .context{
3692 background:none repeat scroll 0 0 #DDE7EF;
3693 }
3694 table.code-difftable .add{
3695 background:none repeat scroll 0 0 #DDFFDD;
3696 }
3697 table.code-difftable .add ins{
3698 background:none repeat scroll 0 0 #AAFFAA;
3699 text-decoration:none;
3700 }
3701 table.code-difftable .del{
3702 background:none repeat scroll 0 0 #FFDDDD;
3703 }
3704 table.code-difftable .del del{
3705 background:none repeat scroll 0 0 #FFAAAA;
3706 text-decoration:none;
3707 }
3708
3709 /** LINE NUMBERS **/
3710 table.code-difftable .lineno{
3711 background:none repeat scroll 0 0 #EEEEEE !important;
3712 padding-left:2px;
3713 padding-right:2px;
3714 text-align:right;
3715 width:30px;
3716 -moz-user-select:none;
3717 -webkit-user-select: none;
3718 border-right: 1px solid #CCC !important;
3719 border-left: 0px solid #CCC !important;
3720 border-top: 0px solid #CCC !important;
3721 border-bottom: none !important;
3722 vertical-align: middle !important;
3723
3724 }
3725 table.code-difftable .lineno.new {
3726 }
3727 table.code-difftable .lineno.old {
3728 }
3729 table.code-difftable .lineno a{
3730 color:#747474 !important;
3731 font:11px "Bitstream Vera Sans Mono",Monaco,"Courier New",Courier,monospace !important;
3732 letter-spacing:-1px;
3733 text-align:right;
3734 float:right;
3735 width:20px;
3736 padding-right: 2px;
3737 cursor: pointer;
3738 }
3739
3740 table.code-difftable .lineno-inline{
3741 background:none repeat scroll 0 0 #FFF !important;
3742 padding-left:2px;
3743 padding-right:2px;
3744 text-align:right;
3745 width:30px;
3746 -moz-user-select:none;
3747 -webkit-user-select: none;
3748 }
3749
3750 /** CODE **/
3751 table.code-difftable .code {
3752 display: block;
3753 width: 100%;
3754 }
3755 table.code-difftable .code td{
3756 margin:0;
3757 padding:0;
3758 }
3759 table.code-difftable .code pre{
3760 margin:0;
3761 padding:0;
3762 height: 17px;
3763 line-height: 17px;
3764 }
3765
3766
3767 .diffblock.margined.comm .line .code:hover{
3768 background-color:#FFFFCC !important;
3769 cursor: pointer !important;
3770 background-image:url("../images/icons/comment_add.png") !important;
3771 background-repeat:no-repeat !important;
3772 background-position: right !important;
3773 background-position: 0% 50% !important;
3639 3774 } No newline at end of file
@@ -357,6 +357,7 b' var injectInlineForm = function(tr){'
357 357 }
358 358 YUD.insertAfter(form,target_tr);
359 359 YUD.get('text_'+lineno).focus();
360 tooltip_activate();
360 361 };
361 362
362 363 var createInlineAddButton = function(tr,label){
@@ -11,7 +11,6 b''
11 11 <%def name="css()">
12 12 <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css')}" media="screen"/>
13 13 <link rel="stylesheet" type="text/css" href="${h.url('/css/pygments.css')}"/>
14 <link rel="stylesheet" type="text/css" href="${h.url('/css/diff.css')}"/>
15 14 ## EXTRA FOR CSS
16 15 ${self.css_extra()}
17 16 </%def>
@@ -132,7 +132,7 b''
132 132 h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw'))}</span>
133 133 &raquo; <span>${h.link_to(_('download diff'),
134 134 h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download'))}</span>
135 <span style="float:right">
135 <span style="float:right;margin-top:-3px">
136 136 <label>
137 137 ${_('show inline comments')}
138 138 ${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=self.fid(filenode.changeset.raw_id,filenode.path))}
@@ -181,6 +181,7 b''
181 181 <div class="clearfix">
182 182 <div class="comment-help">
183 183 ${_('Comments parsed using')} <a href="${h.url('rst_help')}">RST</a> ${_('syntax')}
184 ${_('with')} <span style="color:#003367" class="tooltip" title="${_('Use @username inside this text to send notification to this RhodeCode user')}">@mention</span> ${_('support')}
184 185 </div>
185 186 ${h.textarea('text')}
186 187 </div>
@@ -216,6 +217,10 b''
216 217 for(c in comments){
217 218 YUD.setStyle(comments[c],'display',show);
218 219 }
220 var btns = YUQ('#{0} .inline-comments-button'.format(boxid));
221 for(c in btns){
222 YUD.setStyle(btns[c],'display',show);
223 }
219 224 })
220 225
221 226 YUE.on(YUQ('.line'),'click',function(e){
@@ -4,6 +4,7 b''
4 4 ##
5 5 <%def name="comment_block(co)">
6 6 <div class="comment" id="comment-${co.comment_id}">
7 <div class="comment-wrapp">
7 8 <div class="meta">
8 9 <span class="user">
9 10 <img src="${h.gravatar_url(co.author.email, 20)}" />
@@ -28,6 +29,7 b''
28 29 ${h.rst_w_mentions(co.text)|n}
29 30 </div>
30 31 </div>
32 </div>
31 33 </%def>
32 34
33 35
@@ -38,8 +40,10 b''
38 40 %if c.rhodecode_user.username != 'default':
39 41 ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=c.changeset.raw_id))}
40 42 <div class="clearfix">
41 <div class="comment-help">${_('Commenting on line')} {1} ${_('comments parsed using')}
42 <a href="${h.url('rst_help')}">RST</a> ${_('syntax')}</div>
43 <div class="comment-help">${_('Commenting on line')} {1}. ${_('Comments parsed using')}
44 <a href="${h.url('rst_help')}">RST</a> ${_('syntax')} ${_('with')}
45 <span style="color:#003367" class="tooltip" title="${_('Use @username inside this text to send notification to this RhodeCode user')}">@mention</span> ${_('support')}
46 </div>
43 47 <textarea id="text_{1}" name="text"></textarea>
44 48 </div>
45 49 <div class="comment-button">
1 NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now