##// END OF EJS Templates
git: use force fetch and update for target ref. This solves a case...
git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

File last commit:

r2053:bad6294f default
r2784:e8c62649 default
Show More
rcicons.less
157 lines | 5.2 KiB | text/x-less | LessCssLexer
@font-face {
font-family: 'rcicons';
src: url('../fonts/RCIcons/rcicons.eot?74666722');
src: url('../fonts/RCIcons/rcicons.eot?74666722#iefix') format('embedded-opentype'),
url('../fonts/RCIcons/rcicons.woff2?74666722') format('woff2'),
url('../fonts/RCIcons/rcicons.woff?74666722') format('woff'),
url('../fonts/RCIcons/rcicons.ttf?74666722') format('truetype'),
url('../fonts/RCIcons/rcicons.svg?74666722#rcicons') format('svg');
font-weight: normal;
font-style: normal;
}
/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
/*
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'rcicons';
src: url('../fonts/RCIcons/rcicons.svg?74666722#rcicons') format('svg');
}
}
*/
[class^="icon-"]:before, [class*=" icon-"]:before {
font-family: "rcicons";
font-style: normal;
font-weight: normal;
speak: none;
display: inline-block;
text-decoration: inherit;
width: 1em;
margin-right: .2em;
text-align: center;
/* opacity: .8; */
/* For safety - reset parent styles, that can break glyph codes*/
font-variant: normal;
text-transform: none;
/* fix buttons height, for twitter bootstrap */
line-height: 1em;
/* Animation center compensation - margins should be symmetric */
/* remove if not needed */
margin-left: .2em;
/* you can be more comfortable with increased icons size */
/* font-size: 120%; */
/* Font smoothing. That was taken from TWBS */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
/* Uncomment for 3D effect */
/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
}
// -- ICON CLASSES -- //
.icon-bookmark:before { content: '\e803'; } /* '' */
.icon-branch:before { content: '\e804'; } /* '' */
.icon-lock:before { content: '\e806'; } /* '' */
.icon-unlock:before { content: '\e807'; } /* '' */
.icon-delete:before { content: '\e808'; } /* '' */
.icon-false:before { content: '\e808'; } /* '' */
.icon-ok:before { content: '\e809'; } /* '' */
.icon-true:before { content: '\e809'; } /* '' */
.icon-comment:before { content: '\e80a'; } /* '' */
.icon-comment-add:before { content: '\e816'; } /* '' */
.icon-comment_toggle:before { content: '\e818'; } /* '' */
.icon-feed:before { content: '\e80b'; } /* '' */
.icon-right:before { content: '\e80c'; } /* '' */
.icon-left:before { content: '\e80d'; } /* '' */
.icon-arrow_down:before { content: '\e80e'; } /* '' */
.icon-arrow_up:before { content: '\e80e'; } /* '' */
.icon-group:before { content: '\e812'; } /* '' */
.icon-fork:before { content: '\e814'; } /* '' */
.icon-merge:before { content: '\e814'; } /* '' */
.icon-more:before { content: '\e815'; } /* '' */
.icon-git-inv:before { content: '\e80f'; } /* '' */
.icon-hg-inv:before { content: '\e810'; } /* '' */
.icon-svn-inv:before { content: '\e811'; } /* '' */
.icon-git:before { content: '\e81a'; } /* '' */
.icon-hg:before { content: '\e81b'; } /* '' */
.icon-svn:before { content: '\e820'; } /* '' */
.icon-minus:before { content: '\e81c'; } /* '' */
.icon-plus:before { content: '\e81d'; } /* '' */
.icon-remove:before { content: '\e81e'; } /* '' */
.icon-remove-sign:before { content: '\e81e'; } /* '' */
.icon-rhodecode:before { content: '\e81f'; } /* '' */
.icon-tag:before { content: '\e821'; } /* '' */
.icon-copy:before { content: '\f0c5'; } /* '' */
.icon-clipboard:before { content: '\f0c5'; } /* '' */
.icon-folder:before { content: '\e813'; } /* '' */
.icon-folder-close:before { content: '\e813'; } /* '' */
.icon-directory:before { content: '\e800'; } /* '' */
.icon-directory-empty:before { content: '\f114'; } /* '' */
.icon-file-text:before { content: '\f0f6'; } /* '' */
.icon-file-text-inv:before { content: '\f15c'; } /* '' */
.icon-file-code:before { content: '\f1c9'; } /* '' */
// MERGED ICONS
.icon-repo-private:before { &:extend(.icon-lock:before); }
.icon-repo-lock:before { &:extend(.icon-lock:before); }
.icon-unlock-alt:before { &:extend(.icon-unlock:before); }
.icon-repo-unlock:before { &:extend(.icon-unlock:before); }
.icon-repo-public:before { &:extend(.icon-unlock:before); }
.icon-rss-sign:before { &:extend(.icon-feed:before); }
.icon-code-fork:before { &:extend(.icon-fork:before); }
// TRANSFORM
.icon-arrow_up:before {transform: rotate(180deg);}
.icon-merge:before {transform: rotate(180deg);}
// -- END ICON CLASSES -- //
//--- ICONS STYLING ------------------//
.icon-git { color: @color4 !important; }
.icon-hg { color: @color8 !important; }
.icon-svn { color: @color1 !important; }
.icon-git-inv { color: @color4 !important; }
.icon-hg-inv { color: @color8 !important; }
.icon-svn-inv { color: @color1 !important; }
.icon-repo-lock { color: #FF0000; }
.icon-repo-unlock { color: #FF0000; }
.repo-switcher-dropdown .select2-result-label {
.icon-git:before {
&:extend(.icon-git-transparent:before);
}
.icon-hg:before {
&:extend(.icon-hg-transparent:before);
color: @alert4;
}
.icon-svn:before {
&:extend(.icon-svn-transparent:before);
}
}