diff --git a/MANIFEST.in b/MANIFEST.in
index b8916a76..2b6a0207 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -39,7 +39,6 @@ include rhodecode/public/sounds/*.mp3
include rhodecode/public/sounds/*.wav
# fonts
-recursive-include rhodecode/public/fonts/ProximaNova *
recursive-include rhodecode/public/fonts/RCIcons *
# js
diff --git a/docs/static/css/add.css b/docs/static/css/add.css
index 076258ec..1563c02c 100644
--- a/docs/static/css/add.css
+++ b/docs/static/css/add.css
@@ -1,13 +1,13 @@
.menuselection, .guilabel {
font-size: .90em;
- font-family: "proximanovaregular", "Proxima Nova Regular", "Proxima Nova", sans-serif;
+ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
font-style: oblique;
}
-.version{
+.version {
display: none;
- }
+}
-.pre{
- color:#000
- }
+.pre {
+ color: #000
+}
diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py
index 625bca4f..a1deb9ac 100644
--- a/rhodecode/lib/helpers.py
+++ b/rhodecode/lib/helpers.py
@@ -1249,15 +1249,18 @@ class InitialsGravatar(object):
"""
generates the svg metadata for image
"""
-
- font_family = ','.join([
- 'proximanovaregular',
- 'Proxima Nova Regular',
- 'Proxima Nova',
- 'Arial',
- 'Lucida Grande',
- 'sans-serif'
- ])
+ fonts = [
+ '-apple-system',
+ 'BlinkMacSystemFont',
+ 'Segoe UI',
+ 'Roboto',
+ 'Oxygen-Sans',
+ 'Ubuntu',
+ 'Cantarell',
+ 'Helvetica Neue',
+ 'sans-serif'
+ ]
+ font_family = ','.join(fonts)
if svg_type:
return self.get_img_data_by_type(font_family, svg_type)
diff --git a/rhodecode/public/502.html b/rhodecode/public/502.html
index 3cd5a097..f90dab25 100644
--- a/rhodecode/public/502.html
+++ b/rhodecode/public/502.html
@@ -12,7 +12,7 @@
body {
background:#eeeeee;
color: #323232;
- font-family: "proximanovaregular","Proxima Nova Regular","Proxima Nova",sans-serif;
+ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
margin: 0 auto;
max-width: 1000px;
letter-spacing: .02em;
diff --git a/rhodecode/public/css/code-block.less b/rhodecode/public/css/code-block.less
index eab03998..a6a64305 100644
--- a/rhodecode/public/css/code-block.less
+++ b/rhodecode/public/css/code-block.less
@@ -800,6 +800,8 @@ input.filediff-collapse-state {
.pill {
opacity: .8;
margin-right: 3px;
+ font-size: 12px;
+ font-weight: normal;
&:first-child {
border-radius: @border-radius 0 0 @border-radius;
diff --git a/rhodecode/public/css/fonts.less b/rhodecode/public/css/fonts.less
deleted file mode 100644
index f9782be0..00000000
--- a/rhodecode/public/css/fonts.less
+++ /dev/null
@@ -1,51 +0,0 @@
-
-@font-face {
- font-family: 'proximanovaregular';
- src: url('../fonts/ProximaNova/ProximaNova-Regular.eot'); /* IE9 Compat Modes */
- src: url('../fonts/ProximaNova/ProximaNova-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
- url('../fonts/ProximaNova/ProximaNova-Regular.woff') format('woff'), /* Modern Browsers */
- url('../fonts/ProximaNova/ProximaNova-Regular.ttf') format('truetype');
- font-style: normal;
- font-weight: normal;
- text-rendering: optimizeLegibility;
-}
-@font-face {
- font-family: 'proximanovaitalic';
- src: url('../fonts/ProximaNova/ProximaNova-Italic.eot'); /* IE9 Compat Modes */
- src: url('../fonts/ProximaNova/ProximaNova-Italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
- url('../fonts/ProximaNova/ProximaNova-Italic.woff') format('woff'), /* Modern Browsers */
- url('../fonts/ProximaNova/ProximaNova-Italic.ttf') format('truetype');
- font-style: italic;
- font-weight: normal;
- text-rendering: optimizeLegibility;
-}
-@font-face {
- font-family: 'proximanovasemibold';
- src: url('../fonts/ProximaNova/ProximaNova-Semibold.eot'); /* IE9 Compat Modes */
- src: url('../fonts/ProximaNova/ProximaNova-Semibold.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
- url('../fonts/ProximaNova/ProximaNova-Semibold.woff') format('woff'), /* Modern Browsers */
- url('../fonts/ProximaNova/ProximaNova-Semibold.ttf') format('truetype');
- font-style: normal;
- font-weight: bold;
- text-rendering: optimizeLegibility;
-}
-@font-face {
- font-family: 'proximanovabold';
- src: url('../fonts/ProximaNova/ProximaNova-Bold.eot'); /* IE9 Compat Modes */
- src: url('../fonts/ProximaNova/ProximaNova-Bold.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
- url('../fonts/ProximaNova/ProximaNova-Bold.woff') format('woff'), /* Modern Browsers */
- url('../fonts/ProximaNova/ProximaNova-Bold.ttf') format('truetype');
- font-style: normal;
- font-weight: bold;
- text-rendering: optimizeLegibility;
-}
-@font-face {
- font-family: 'proximanovabolditalic';
- src: url('../fonts/ProximaNova/ProximaNova-BoldItalic.eot'); /* IE9 Compat Modes */
- src: url('../fonts/ProximaNova/ProximaNova-BoldItalic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
- url('../fonts/ProximaNova/ProximaNova-BoldItalic.woff') format('woff'), /* Modern Browsers */
- url('../fonts/ProximaNova/ProximaNova-BoldItalic.ttf') format('truetype');
- font-style: italic;
- font-weight: bold;
- text-rendering: optimizeLegibility;
-}
\ No newline at end of file
diff --git a/rhodecode/public/css/main.less b/rhodecode/public/css/main.less
index 38fb499d..6d36d45e 100644
--- a/rhodecode/public/css/main.less
+++ b/rhodecode/public/css/main.less
@@ -5,7 +5,6 @@
@import 'helpers';
@import 'mixins';
@import 'rcicons';
-@import 'fonts';
@import 'variables';
@import 'bootstrap-variables';
@import 'form-bootstrap';
@@ -1546,19 +1545,15 @@ table.integrations {
.show_more {
display: inline-block;
- position: relative;
+ width: 0;
+ height: 0;
vertical-align: middle;
- width: 4px;
- height: @basefontsize;
-
- &:after {
- content: "\00A0\25BE";
- display: inline-block;
- width:10px;
- line-height: 5px;
- font-size: 12px;
- cursor: pointer;
- }
+ content: "";
+ border: 4px solid;
+ border-right-color: transparent;
+ border-bottom-color: transparent;
+ border-left-color: transparent;
+ font-size: 0;
}
.journal_more .show_more {
@@ -1569,13 +1564,6 @@ table.integrations {
}
}
-.open .show_more:after,
-.select2-dropdown-open .show_more:after {
- .rotate(180deg);
- margin-left: 4px;
-}
-
-
.compare_view_commits .collapse_commit:after {
cursor: pointer;
content: "\00A0\25B4";
@@ -2250,7 +2238,6 @@ h3.files_location{
div.search-feedback-items {
display: inline-block;
- padding:0px 0px 0px 96px;
}
div.search-code-body {
diff --git a/rhodecode/public/css/navigation.less b/rhodecode/public/css/navigation.less
index 9811dd73..9002a203 100644
--- a/rhodecode/public/css/navigation.less
+++ b/rhodecode/public/css/navigation.less
@@ -119,11 +119,6 @@
&.has_select2 a {
display: block;
padding: 10px 0 2px;
-
- .show_more {
- margin-top: -4px;
- padding-right: .5em;
- }
}
.menulabel {
@@ -170,17 +165,13 @@
&:hover { color: @grey1; }
}
-
- .show_more {
- padding-left: .5em;
- }
}
#quick_login_link {
display: inline-block;
.gravatar {
- border: 1px solid @grey2;
+ border: 1px solid @grey5;
}
.gravatar-login {
@@ -205,6 +196,10 @@
&:hover #quick_login_link {
color: inherit;
}
+
+ .menu_link_user {
+ padding: 0 2px;
+ }
}
&:before { content: none; }
@@ -649,7 +644,7 @@ ul#context-pages {
border-bottom: 1px solid @grey4;
display: inline-block;
vertical-align: top;
- margin-left: -5px;
+ margin-left: -7px;
background: @grey3;
}
@@ -673,10 +668,11 @@ ul#context-pages {
}
.main_filter_input {
- padding: 6px;
+ padding: 5px;
min-width: 220px;
color: @nav-grey;
background: @grey3;
+ min-height: 18px;
}
.main_filter_input::placeholder {
diff --git a/rhodecode/public/css/rcicons.less b/rhodecode/public/css/rcicons.less
index 4bc5fff1..2ddf69db 100644
--- a/rhodecode/public/css/rcicons.less
+++ b/rhodecode/public/css/rcicons.less
@@ -90,6 +90,9 @@
.icon-more:before { content: '\e815'; } /* '' */
+.icon-more-linked { cursor: pointer; color: @grey3 }
+.icon-more-linked:before { content: '\e815'; } /* '' */
+
.icon-git-inv:before { content: '\e80f'; } /* '' */
.icon-hg-inv:before { content: '\e810'; } /* '' */
.icon-svn-inv:before { content: '\e811'; } /* '' */
diff --git a/rhodecode/public/css/select2.less b/rhodecode/public/css/select2.less
index 3a641f3b..f8ab0128 100644
--- a/rhodecode/public/css/select2.less
+++ b/rhodecode/public/css/select2.less
@@ -127,11 +127,11 @@ select.select2{height:28px;visibility:hidden}
&:after {
position: absolute;
content: "\00A0\25BE";
- right: .6em;
+ right: .1em;
line-height: 1em;
- top: 0.9em;
+ top: 0.4em;
width: 1em;
- font-size: 1em;
+ font-size: 20px;
}
}
}
diff --git a/rhodecode/public/css/type.less b/rhodecode/public/css/type.less
index bb1370fe..8ecc5099 100644
--- a/rhodecode/public/css/type.less
+++ b/rhodecode/public/css/type.less
@@ -44,7 +44,7 @@ h6, .h6 { font-size: 1em; font-family: @text-bold-italic; }
// Breadcrumbs
.breadcrumbs {
- &:extend(h1);
+ font-size: @repo-title-fontsize;
margin: 0;
}
@@ -230,7 +230,7 @@ mark,
width: 100%;
margin: @pagepadding/2 0 @pagepadding;
- .breadcrumbs{
+ .breadcrumbs {
float: left;
clear: both;
width: 700px;
diff --git a/rhodecode/public/css/variables.less b/rhodecode/public/css/variables.less
index 35623158..b5f4cdda 100644
--- a/rhodecode/public/css/variables.less
+++ b/rhodecode/public/css/variables.less
@@ -53,16 +53,16 @@
@text-color: @grey2;
@repo-title-fontsize: 18px;
-@text-regular: "proximanovaregular","Proxima Nova Regular", "Proxima Nova", sans-serif;
-@text-italic: "proximanovaitalic","Proxima Nova Italic", "Proxima Nova", sans-serif;
-@text-bold: "proximanovabold","Proxima Nova Bold", "Proxima Nova", sans-serif;
-@text-semibold: "proximanovasemibold","Proxima Nova Semibold", "Proxima Nova", sans-serif;
-@text-bold-italic: "proximanovabolditalic","Proxima Nova Bold Italic", "Proxima Nova", sans-serif;
-@text-code: "Lucida Console", Menlo, Monaco, monospace;
+@text-regular: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+@text-italic: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+@text-bold: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+@text-semibold: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+@text-bold-italic: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+@text-code: 'Menlo', 'Liberation Mono', 'Consolas', 'DejaVu Sans Mono', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace;
@text-light: @text-regular;
@text-light-italic: @text-italic;
// Used for .close buttons
-@text-bootstrap: "Helvetica Neue", Helvetica, Arial, sans-serif;
+@text-bootstrap: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
@panel-title: @basefontsize;
@panel-footer: @basefontsize;
diff --git a/rhodecode/public/fonts/ProximaNova/ProximaNova-Bold.eot b/rhodecode/public/fonts/ProximaNova/ProximaNova-Bold.eot
deleted file mode 100755
index 59ced842..00000000
Binary files a/rhodecode/public/fonts/ProximaNova/ProximaNova-Bold.eot and /dev/null differ
diff --git a/rhodecode/public/fonts/ProximaNova/ProximaNova-Bold.ttf b/rhodecode/public/fonts/ProximaNova/ProximaNova-Bold.ttf
deleted file mode 100755
index 704fab58..00000000
Binary files a/rhodecode/public/fonts/ProximaNova/ProximaNova-Bold.ttf and /dev/null differ
diff --git a/rhodecode/public/fonts/ProximaNova/ProximaNova-Bold.woff b/rhodecode/public/fonts/ProximaNova/ProximaNova-Bold.woff
deleted file mode 100755
index 3bfa4eca..00000000
Binary files a/rhodecode/public/fonts/ProximaNova/ProximaNova-Bold.woff and /dev/null differ
diff --git a/rhodecode/public/fonts/ProximaNova/ProximaNova-BoldItalic.eot b/rhodecode/public/fonts/ProximaNova/ProximaNova-BoldItalic.eot
deleted file mode 100755
index 466862b2..00000000
Binary files a/rhodecode/public/fonts/ProximaNova/ProximaNova-BoldItalic.eot and /dev/null differ
diff --git a/rhodecode/public/fonts/ProximaNova/ProximaNova-BoldItalic.ttf b/rhodecode/public/fonts/ProximaNova/ProximaNova-BoldItalic.ttf
deleted file mode 100755
index 7d2d8a10..00000000
Binary files a/rhodecode/public/fonts/ProximaNova/ProximaNova-BoldItalic.ttf and /dev/null differ
diff --git a/rhodecode/public/fonts/ProximaNova/ProximaNova-BoldItalic.woff b/rhodecode/public/fonts/ProximaNova/ProximaNova-BoldItalic.woff
deleted file mode 100755
index ca0e9439..00000000
Binary files a/rhodecode/public/fonts/ProximaNova/ProximaNova-BoldItalic.woff and /dev/null differ
diff --git a/rhodecode/public/fonts/ProximaNova/ProximaNova-Italic.eot b/rhodecode/public/fonts/ProximaNova/ProximaNova-Italic.eot
deleted file mode 100755
index 182227dd..00000000
Binary files a/rhodecode/public/fonts/ProximaNova/ProximaNova-Italic.eot and /dev/null differ
diff --git a/rhodecode/public/fonts/ProximaNova/ProximaNova-Italic.ttf b/rhodecode/public/fonts/ProximaNova/ProximaNova-Italic.ttf
deleted file mode 100755
index 34783336..00000000
Binary files a/rhodecode/public/fonts/ProximaNova/ProximaNova-Italic.ttf and /dev/null differ
diff --git a/rhodecode/public/fonts/ProximaNova/ProximaNova-Italic.woff b/rhodecode/public/fonts/ProximaNova/ProximaNova-Italic.woff
deleted file mode 100755
index 0a1e6a2a..00000000
Binary files a/rhodecode/public/fonts/ProximaNova/ProximaNova-Italic.woff and /dev/null differ
diff --git a/rhodecode/public/fonts/ProximaNova/ProximaNova-Light.eot b/rhodecode/public/fonts/ProximaNova/ProximaNova-Light.eot
deleted file mode 100755
index f357617d..00000000
Binary files a/rhodecode/public/fonts/ProximaNova/ProximaNova-Light.eot and /dev/null differ
diff --git a/rhodecode/public/fonts/ProximaNova/ProximaNova-Light.ttf b/rhodecode/public/fonts/ProximaNova/ProximaNova-Light.ttf
deleted file mode 100755
index f79169d5..00000000
Binary files a/rhodecode/public/fonts/ProximaNova/ProximaNova-Light.ttf and /dev/null differ
diff --git a/rhodecode/public/fonts/ProximaNova/ProximaNova-Light.woff b/rhodecode/public/fonts/ProximaNova/ProximaNova-Light.woff
deleted file mode 100755
index 5ebb3ed4..00000000
Binary files a/rhodecode/public/fonts/ProximaNova/ProximaNova-Light.woff and /dev/null differ
diff --git a/rhodecode/public/fonts/ProximaNova/ProximaNova-LightItalic.eot b/rhodecode/public/fonts/ProximaNova/ProximaNova-LightItalic.eot
deleted file mode 100755
index e088e1ec..00000000
Binary files a/rhodecode/public/fonts/ProximaNova/ProximaNova-LightItalic.eot and /dev/null differ
diff --git a/rhodecode/public/fonts/ProximaNova/ProximaNova-LightItalic.ttf b/rhodecode/public/fonts/ProximaNova/ProximaNova-LightItalic.ttf
deleted file mode 100755
index d841010c..00000000
Binary files a/rhodecode/public/fonts/ProximaNova/ProximaNova-LightItalic.ttf and /dev/null differ
diff --git a/rhodecode/public/fonts/ProximaNova/ProximaNova-LightItalic.woff b/rhodecode/public/fonts/ProximaNova/ProximaNova-LightItalic.woff
deleted file mode 100755
index 23e1480f..00000000
Binary files a/rhodecode/public/fonts/ProximaNova/ProximaNova-LightItalic.woff and /dev/null differ
diff --git a/rhodecode/public/fonts/ProximaNova/ProximaNova-Regular.eot b/rhodecode/public/fonts/ProximaNova/ProximaNova-Regular.eot
deleted file mode 100755
index a290e36d..00000000
Binary files a/rhodecode/public/fonts/ProximaNova/ProximaNova-Regular.eot and /dev/null differ
diff --git a/rhodecode/public/fonts/ProximaNova/ProximaNova-Regular.ttf b/rhodecode/public/fonts/ProximaNova/ProximaNova-Regular.ttf
deleted file mode 100755
index e58c1991..00000000
Binary files a/rhodecode/public/fonts/ProximaNova/ProximaNova-Regular.ttf and /dev/null differ
diff --git a/rhodecode/public/fonts/ProximaNova/ProximaNova-Regular.woff b/rhodecode/public/fonts/ProximaNova/ProximaNova-Regular.woff
deleted file mode 100755
index 27951b50..00000000
Binary files a/rhodecode/public/fonts/ProximaNova/ProximaNova-Regular.woff and /dev/null differ
diff --git a/rhodecode/public/fonts/ProximaNova/ProximaNova-Semibold.eot b/rhodecode/public/fonts/ProximaNova/ProximaNova-Semibold.eot
deleted file mode 100755
index 74233f4f..00000000
Binary files a/rhodecode/public/fonts/ProximaNova/ProximaNova-Semibold.eot and /dev/null differ
diff --git a/rhodecode/public/fonts/ProximaNova/ProximaNova-Semibold.ttf b/rhodecode/public/fonts/ProximaNova/ProximaNova-Semibold.ttf
deleted file mode 100755
index 22d537cc..00000000
Binary files a/rhodecode/public/fonts/ProximaNova/ProximaNova-Semibold.ttf and /dev/null differ
diff --git a/rhodecode/public/fonts/ProximaNova/ProximaNova-Semibold.woff b/rhodecode/public/fonts/ProximaNova/ProximaNova-Semibold.woff
deleted file mode 100755
index d428ac5a..00000000
Binary files a/rhodecode/public/fonts/ProximaNova/ProximaNova-Semibold.woff and /dev/null differ
diff --git a/rhodecode/templates/changelog/changelog_elements.mako b/rhodecode/templates/changelog/changelog_elements.mako
index 8f0feb64..d93fd97e 100644
--- a/rhodecode/templates/changelog/changelog_elements.mako
+++ b/rhodecode/templates/changelog/changelog_elements.mako
@@ -82,7 +82,7 @@
|
-
+
|
diff --git a/rhodecode/templates/compare/compare_commits.mako b/rhodecode/templates/compare/compare_commits.mako
index 124f87df..3c38a34a 100644
--- a/rhodecode/templates/compare/compare_commits.mako
+++ b/rhodecode/templates/compare/compare_commits.mako
@@ -50,7 +50,7 @@
title="${_( 'Expand commit message')}"
>
-
+
|
diff --git a/rhodecode/templates/pullrequests/pullrequest_show.mako b/rhodecode/templates/pullrequests/pullrequest_show.mako
index a7685f40..fbfe9249 100644
--- a/rhodecode/templates/pullrequests/pullrequest_show.mako
+++ b/rhodecode/templates/pullrequests/pullrequest_show.mako
@@ -518,7 +518,7 @@
|
-
+
|
diff --git a/rhodecode/templates/search/search.mako b/rhodecode/templates/search/search.mako
index 4bb8e086..69d54fdd 100644
--- a/rhodecode/templates/search/search.mako
+++ b/rhodecode/templates/search/search.mako
@@ -57,8 +57,7 @@
%endif
|
-
+
|
|