diff --git a/rhodecode/public/css/rcicons.less b/rhodecode/public/css/rcicons.less index 2b0cfe25..c92ace7b 100644 --- a/rhodecode/public/css/rcicons.less +++ b/rhodecode/public/css/rcicons.less @@ -1,10 +1,11 @@ @font-face { font-family: 'rcicons'; - src: url('../fonts/RCIcons/rcicons.eot?18742416'); - src: url('../fonts/RCIcons/rcicons.eot?18742416#iefix') format('embedded-opentype'), - url('../fonts/RCIcons/rcicons.woff?18742416') format('woff'), - url('../fonts/RCIcons/rcicons.ttf?18742416') format('truetype'), - url('../fonts/RCIcons/rcicons.svg?18742416#rcicons') format('svg'); + src: url('../fonts/RCIcons/rcicons.eot?88634534'); + src: url('../fonts/RCIcons/rcicons.eot?88634534#iefix') format('embedded-opentype'), + url('../fonts/RCIcons/rcicons.woff2?88634534') format('woff2'), + url('../fonts/RCIcons/rcicons.woff?88634534') format('woff'), + url('../fonts/RCIcons/rcicons.ttf?88634534') format('truetype'), + url('../fonts/RCIcons/rcicons.svg?88634534#rcicons') format('svg'); font-weight: normal; font-style: normal; } @@ -14,7 +15,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: 'rcicons'; - src: url('../font/rcicons.svg?18742415#rcicons') format('svg'); + src: url('../fonts/RCIcons/rcicons.svg?88634534#rcicons') format('svg'); } } */ @@ -35,7 +36,7 @@ /* 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; @@ -46,40 +47,44 @@ /* 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-svn-transparent:before { content: '\e800'; } /* '' */ -.icon-hg-transparent:before { content: '\e801'; } /* '' */ -.icon-git-transparent:before { content: '\e802'; } /* '' */ -.icon-svn:before { content: '\e803'; } /* '' */ -.icon-hg:before { content: '\e804'; } /* '' */ -.icon-git:before { content: '\e805'; } /* '' */ -.icon-plus:before { content: '\e806'; } /* '' */ -.icon-minus:before { content: '\e807'; } /* '' */ -.icon-remove:before { content: '\e808'; } /* '' */ -.icon-bookmark:before { content: '\e809'; } /* '' */ -.icon-branch:before { content: '\e80a'; } /* '' */ -.icon-tag:before { content: '\e80b'; } /* '' */ -.icon-lock:before { content: '\e80c'; } /* '' */ -.icon-unlock:before { content: '\e80d'; } /* '' */ + +.icon-git:before { content: '\e82a'; } /* '' */ +.icon-hg:before { content: '\e82d'; } /* '' */ +.icon-svn:before { content: '\e82e'; } /* '' */ +.icon-plus:before { content: '\e813'; } /* '' */ +.icon-minus:before { content: '\e814'; } /* '' */ +.icon-remove:before { content: '\e815'; } /* '' */ +.icon-bookmark:before { content: '\e803'; } /* '' */ +.icon-branch:before { content: '\e804'; } /* '' */ +.icon-merge:before { content: '\e833'; } /* '' */ +.icon-tag:before { content: '\e805'; } /* '' */ +.icon-lock:before { content: '\e806'; } /* '' */ +.icon-unlock:before { content: '\e807'; } /* '' */ .icon-delete:before, -.icon-false:before { content: '\e80e'; } /* '' */ +.icon-false:before { content: '\e800'; } /* '' */ .icon-ok:before, -.icon-true:before { content: '\e80f'; } /* '' */ -.icon-comment:before { content: '\e810'; } /* '' */ -.icon-feed:before { content: '\e811'; } /* '' */ -.icon-right:before { content: '\e812'; } /* '' */ -.icon-left:before { content: '\e813'; } /* '' */ -.icon-arrow_down:before { content: '\e814'; } /* '' */ -.icon-group:before { content: '\e815'; } /* '' */ -.icon-folder:before { content: '\e816'; } /* '' */ -.icon-fork:before { content: '\e817'; } /* '' */ -.icon-more:before { content: '\e818'; } /* '' */ -.icon-comment-add:before { content: '\e819'; } /* '' */ - - +.icon-true:before { content: '\e801'; } /* '' */ +.icon-feed:before { content: '\e808'; } /* '' */ +.icon-left:before { content: '\e809'; } /* '' */ +.icon-right:before { content: '\e80a'; } /* '' */ +.icon-arrow_down:before { content: '\e80b'; } /* '' */ +.icon-arrow_up:before { content: '\e832'; } /* '' */ +.icon-group:before { content: '\e80f'; } /* '' */ +.icon-folder:before { content: '\e810'; } /* '' */ +.icon-fork:before { content: '\e811'; } /* '' */ +.icon-more:before { content: '\e812'; } /* '' */ +.icon-comment:before { content: '\e802'; } /* '' */ +.icon-comment-add:before { content: '\e82f'; } /* '' */ +.icon-comment-toggle:before { content: '\e830'; } /* '' */ +.icon-rhodecode:before { content: '\e831'; } /* '' */ .icon-remove-sign:before { &:extend(.icon-remove:before); } .icon-repo-private:before, .icon-repo-lock:before { &:extend(.icon-lock:before); } diff --git a/rhodecode/public/fonts/RCIcons/rcicons.eot b/rhodecode/public/fonts/RCIcons/rcicons.eot index fc99ccf7..5c34a7d4 100644 Binary files a/rhodecode/public/fonts/RCIcons/rcicons.eot and b/rhodecode/public/fonts/RCIcons/rcicons.eot differ diff --git a/rhodecode/public/fonts/RCIcons/rcicons.svg b/rhodecode/public/fonts/RCIcons/rcicons.svg index a48064b9..a945641d 100644 --- a/rhodecode/public/fonts/RCIcons/rcicons.svg +++ b/rhodecode/public/fonts/RCIcons/rcicons.svg @@ -6,32 +6,59 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/rhodecode/public/fonts/RCIcons/rcicons.ttf b/rhodecode/public/fonts/RCIcons/rcicons.ttf index 37231133..11fd0d78 100644 Binary files a/rhodecode/public/fonts/RCIcons/rcicons.ttf and b/rhodecode/public/fonts/RCIcons/rcicons.ttf differ diff --git a/rhodecode/public/fonts/RCIcons/rcicons.woff b/rhodecode/public/fonts/RCIcons/rcicons.woff index 95e01762..80f42444 100644 Binary files a/rhodecode/public/fonts/RCIcons/rcicons.woff and b/rhodecode/public/fonts/RCIcons/rcicons.woff differ diff --git a/rhodecode/public/fonts/RCIcons/rcicons.woff2 b/rhodecode/public/fonts/RCIcons/rcicons.woff2 new file mode 100644 index 00000000..506291e4 Binary files /dev/null and b/rhodecode/public/fonts/RCIcons/rcicons.woff2 differ diff --git a/rhodecode/templates/debug_style/icons.html b/rhodecode/templates/debug_style/icons.html index 1349662a..54f2d2af 100644 --- a/rhodecode/templates/debug_style/icons.html +++ b/rhodecode/templates/debug_style/icons.html @@ -53,40 +53,46 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + +
icon-plus0xe800 icon-minus0xe801 icon-remove0xe802 icon-bookmark0xe803 icon-plus 0xe813 icon-minus 0xe814 icon-remove 0xe815 icon-fork 0xe811 icon-bookmark 0xe803
icon-branch 0xe804 icon-merge 0xe833 icon-tag 0xe805 icon-lock 0xe806 icon-unlock 0xe807
icon-delete 0xe800 icon-false 0xe800 icon-ok 0xe801 icon-true 0xe801 icon-group 0xe80f
icon-hg 0xe82d icon-git 0xe82a icon-svn 0xe82e icon-folder 0xe810 icon-rhodecode 0xe831
icon-more 0xe812 icon-comment 0xe802 icon-comment-add 0xe82f icon-comment-toggle 0xe830 icon-feed 0xe808
icon-branch0xe804 icon-tag0xe805 icon-lock0xe806 icon-unlock0xe807
icon-delete0xe808 icon-false0xe808 icon-ok0xe809 icon-true0xe809
icon-right0xe80c icon-left0xe80d icon-arrow_down0xe80e icon-git0xe80f
icon-hg0xe810 icon-svn0xe811 icon-group0xe812 icon-folder0xe813
icon-fork0xe814 icon-more0xe815 icon-comment0xe80a icon-feed0xe80b icon-right 0xe80a icon-left 0xe809 icon-arrow_down 0xe80b icon-arrow_up 0xe832