Show More
@@ -263,6 +263,10 b' input[type="button"] {' | |||||
263 | border-radius: @border-radius 0 0 @border-radius; |
|
263 | border-radius: @border-radius 0 0 @border-radius; | |
264 |
|
264 | |||
265 | } |
|
265 | } | |
|
266 | // 2nd, if only 2 elements are there | |||
|
267 | &:nth-of-type(2) { | |||
|
268 | border-left-width: 0; | |||
|
269 | } | |||
266 | // middle elements |
|
270 | // middle elements | |
267 | &:not(:first-of-type):not(:last-of-type) { |
|
271 | &:not(:first-of-type):not(:last-of-type) { | |
268 | border-radius: 0; |
|
272 | border-radius: 0; |
@@ -194,6 +194,7 b'' | |||||
194 | .icon-comment-toggle:before { content: '\e830'; } /* '' */ |
|
194 | .icon-comment-toggle:before { content: '\e830'; } /* '' */ | |
195 | .icon-rhodecode:before { content: '\e831'; } /* '' */ |
|
195 | .icon-rhodecode:before { content: '\e831'; } /* '' */ | |
196 | .icon-up:before { content: '\e832'; } /* '' */ |
|
196 | .icon-up:before { content: '\e832'; } /* '' */ | |
|
197 | .icon-down:before { content: '\e832'; } /* '' */ | |||
197 | .icon-merge:before { content: '\e833'; } /* '' */ |
|
198 | .icon-merge:before { content: '\e833'; } /* '' */ | |
198 | .icon-spin-alt:before { content: '\e834'; } /* '' */ |
|
199 | .icon-spin-alt:before { content: '\e834'; } /* '' */ | |
199 | .icon-spin:before { content: '\e838'; } /* '' */ |
|
200 | .icon-spin:before { content: '\e838'; } /* '' */ | |
@@ -235,6 +236,7 b'' | |||||
235 | .icon-rss-sign:before { &:extend(.icon-feed:before); } |
|
236 | .icon-rss-sign:before { &:extend(.icon-feed:before); } | |
236 | .icon-code-fork:before { &:extend(.icon-fork:before); } |
|
237 | .icon-code-fork:before { &:extend(.icon-fork:before); } | |
237 | .icon-arrow_up:before { &:extend(.icon-up:before); } |
|
238 | .icon-arrow_up:before { &:extend(.icon-up:before); } | |
|
239 | .icon-arrow_down:before { &:extend(.icon-down:before); } | |||
238 | .icon-file:before { &:extend(.icon-file-code:before); } |
|
240 | .icon-file:before { &:extend(.icon-file-code:before); } | |
239 | .icon-file-text:before { &:extend(.icon-file-code:before); } |
|
241 | .icon-file-text:before { &:extend(.icon-file-code:before); } | |
240 | .icon-directory:before { &:extend(.icon-folder:before); } |
|
242 | .icon-directory:before { &:extend(.icon-folder:before); } | |
@@ -253,6 +255,8 b'' | |||||
253 | .icon-merge:before {transform: rotate(180deg);} |
|
255 | .icon-merge:before {transform: rotate(180deg);} | |
254 | .icon-wide-mode:before {transform: rotate(90deg);} |
|
256 | .icon-wide-mode:before {transform: rotate(90deg);} | |
255 | .icon-options:before {transform: rotate(90deg);} |
|
257 | .icon-options:before {transform: rotate(90deg);} | |
|
258 | .icon-down:before {transform: rotate(180deg);} | |||
|
259 | ||||
256 |
|
260 | |||
257 | // -- END ICON CLASSES -- // |
|
261 | // -- END ICON CLASSES -- // | |
258 |
|
262 |
@@ -714,3 +714,11 b' var getUserSessionAttr = function(key) {' | |||||
714 | } |
|
714 | } | |
715 | return null |
|
715 | return null | |
716 | } |
|
716 | } | |
|
717 | ||||
|
718 | window.scrollDown = function () { | |||
|
719 | $(document).scrollTop($(document).height()); | |||
|
720 | } | |||
|
721 | ||||
|
722 | window.scrollUp = function scrollUp() { | |||
|
723 | $(window).scrollTop(0); | |||
|
724 | } |
@@ -397,6 +397,7 b' window.ReviewersController = function ()' | |||||
397 | 'user_group': reviewer_obj.user_group, |
|
397 | 'user_group': reviewer_obj.user_group, | |
398 | 'create': true, |
|
398 | 'create': true, | |
399 | 'rule_show': true, |
|
399 | 'rule_show': true, | |
|
400 | 'rhodecode_user': templateContext.rhodecode_user | |||
400 | }) |
|
401 | }) | |
401 |
|
402 | |||
402 | if (role === self.ROLE_REVIEWER) { |
|
403 | if (role === self.ROLE_REVIEWER) { | |
@@ -820,7 +821,8 b' window.ReviewersPanel = {' | |||||
820 | 'review_status': member.review_status, |
|
821 | 'review_status': member.review_status, | |
821 | 'review_status_label': member.review_status_label, |
|
822 | 'review_status_label': member.review_status_label, | |
822 | 'user_group': member.user_group, |
|
823 | 'user_group': member.user_group, | |
823 | 'create': false |
|
824 | 'create': false, | |
|
825 | 'rhodecode_user': templateContext.rhodecode_user | |||
824 | }); |
|
826 | }); | |
825 |
|
827 | |||
826 | $(self.controller.$reviewMembers.selector).append(entry) |
|
828 | $(self.controller.$reviewMembers.selector).append(entry) | |
@@ -915,7 +917,8 b' window.ObserversPanel = {' | |||||
915 | 'review_status': member.review_status, |
|
917 | 'review_status': member.review_status, | |
916 | 'review_status_label': member.review_status_label, |
|
918 | 'review_status_label': member.review_status_label, | |
917 | 'user_group': member.user_group, |
|
919 | 'user_group': member.user_group, | |
918 | 'create': false |
|
920 | 'create': false, | |
|
921 | 'rhodecode_user': templateContext.rhodecode_user | |||
919 | }); |
|
922 | }); | |
920 |
|
923 | |||
921 | $(self.controller.$observerMembers.selector).append(entry) |
|
924 | $(self.controller.$observerMembers.selector).append(entry) |
@@ -916,6 +916,16 b' def get_comments_for(diff_type, comments' | |||||
916 | <div class="sidebar__inner"> |
|
916 | <div class="sidebar__inner"> | |
917 | <div class="sidebar__bar"> |
|
917 | <div class="sidebar__bar"> | |
918 | <div class="pull-right"> |
|
918 | <div class="pull-right"> | |
|
919 | ||||
|
920 | <div class="btn-group" style="margin-right: 5px;"> | |||
|
921 | <a class="tooltip btn" onclick="scrollDown();return false" title="${_('Scroll to page bottom')}"> | |||
|
922 | <i class="icon-arrow_down"></i> | |||
|
923 | </a> | |||
|
924 | <a class="tooltip btn" onclick="scrollUp();return false" title="${_('Scroll to page top')}"> | |||
|
925 | <i class="icon-arrow_up"></i> | |||
|
926 | </a> | |||
|
927 | </div> | |||
|
928 | ||||
919 | <div class="btn-group"> |
|
929 | <div class="btn-group"> | |
920 | <a class="btn tooltip toggle-wide-diff" href="#toggle-wide-diff" onclick="toggleWideDiff(this); return false" title="${h.tooltip(_('Toggle wide diff'))}"> |
|
930 | <a class="btn tooltip toggle-wide-diff" href="#toggle-wide-diff" onclick="toggleWideDiff(this); return false" title="${h.tooltip(_('Toggle wide diff'))}"> | |
921 | <i class="icon-wide-mode"></i> |
|
931 | <i class="icon-wide-mode"></i> | |
@@ -1004,7 +1014,6 b' def get_comments_for(diff_type, comments' | |||||
1004 | </strong> |
|
1014 | </strong> | |
1005 | </div> |
|
1015 | </div> | |
1006 | <div class="pull-right noselect"> |
|
1016 | <div class="pull-right noselect"> | |
1007 |
|
||||
1008 | %if commit: |
|
1017 | %if commit: | |
1009 | <span> |
|
1018 | <span> | |
1010 | <code>${h.show_id(commit)}</code> |
|
1019 | <code>${h.show_id(commit)}</code> |
@@ -604,6 +604,7 b'' | |||||
604 | <i class="icon-circle review-status-${c.pull_request_review_status}"></i> |
|
604 | <i class="icon-circle review-status-${c.pull_request_review_status}"></i> | |
605 | ${_('Reviewers')} |
|
605 | ${_('Reviewers')} | |
606 | </span> |
|
606 | </span> | |
|
607 | ||||
607 |
|
|
608 | %if c.allowed_to_update: | |
608 | <span id="open_edit_reviewers" class="block-right action_button last-item">${_('Edit')}</span> |
|
609 | <span id="open_edit_reviewers" class="block-right action_button last-item">${_('Edit')}</span> | |
609 | <span id="close_edit_reviewers" class="block-right action_button last-item" style="display: none;">${_('Close')}</span> |
|
610 | <span id="close_edit_reviewers" class="block-right action_button last-item" style="display: none;">${_('Close')}</span> | |
@@ -644,7 +645,7 b'' | |||||
644 | </div> |
|
645 | </div> | |
645 | % endif |
|
646 | % endif | |
646 | <div class="pull-right" style="margin-bottom: 15px"> |
|
647 | <div class="pull-right" style="margin-bottom: 15px"> | |
647 |
<button data-role="reviewer" id="update_reviewers" class="btn btn-sm |
|
648 | <button data-role="reviewer" id="update_reviewers" class="btn btn-sm no-margin">${_('Save Changes')}</button> | |
648 | </div> |
|
649 | </div> | |
649 | %endif |
|
650 | %endif | |
650 | </div> |
|
651 | </div> | |
@@ -697,7 +698,7 b'' | |||||
697 | </div> |
|
698 | </div> | |
698 | % endif |
|
699 | % endif | |
699 | <div class="pull-right" style="margin-bottom: 15px"> |
|
700 | <div class="pull-right" style="margin-bottom: 15px"> | |
700 |
<button data-role="observer" id="update_observers" class="btn btn-sm |
|
701 | <button data-role="observer" id="update_observers" class="btn btn-sm no-margin">${_('Save Changes')}</button> | |
701 | </div> |
|
702 | </div> | |
702 | %endif |
|
703 | %endif | |
703 | </div> |
|
704 | </div> |
General Comments 0
You need to be logged in to leave comments.
Login now