diff --git a/MANIFEST.in b/MANIFEST.in --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/rhodecode/public/css/select2.less +++ b/rhodecode/public/css/select2.less @@ -127,11 +127,11 @@ select.select2{height:28px;visibility:hi &: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 --- a/rhodecode/public/css/type.less +++ b/rhodecode/public/css/type.less @@ -44,7 +44,7 @@ h6, .h6 { font-size: 1em; font-family // 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 --- 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 59ced842ce4973c035fb5dd1f24e029ca63d16b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@
-   +  
diff --git a/rhodecode/templates/compare/compare_commits.mako b/rhodecode/templates/compare/compare_commits.mako --- 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 --- 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 --- a/rhodecode/templates/search/search.mako +++ b/rhodecode/templates/search/search.mako @@ -57,8 +57,7 @@ %endif
- - ${h.text('q', c.cur_query)} + ${h.text('q', c.cur_query, placeholder="Enter query...")} ${h.select('type',c.search_type,[('content',_('File contents')), ('commit',_('Commit messages')), ('path',_('File names')),],id='id_search_type')} diff --git a/rhodecode/templates/search/search_commit.mako b/rhodecode/templates/search/search_commit.mako --- a/rhodecode/templates/search/search_commit.mako +++ b/rhodecode/templates/search/search_commit.mako @@ -35,7 +35,7 @@
-   +