ui: dropped the custom font in favor of builtin ones....
marcink -
r3164:9a2c9ca9 default
Not Reviewed
Show More
Add another comment
TODOs: 0 unresolved 0 Resolved
COMMENTS: 0 General 0 Inline
@@ -39,7 +39,6
39 include rhodecode/public/sounds/*.wav
39 include rhodecode/public/sounds/*.wav
40
40
41 # fonts
41 # fonts
42 recursive-include rhodecode/public/fonts/ProximaNova *
43 recursive-include rhodecode/public/fonts/RCIcons *
42 recursive-include rhodecode/public/fonts/RCIcons *
44
43
45 # js
44 # js
@@ -1,13 +1,13
1 .menuselection, .guilabel {
1 .menuselection, .guilabel {
2 font-size: .90em;
2 font-size: .90em;
3 font-family: "proximanovaregular", "Proxima Nova Regular", "Proxima Nova", sans-serif;
3 font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
4 font-style: oblique;
4 font-style: oblique;
5 }
5 }
6
6
7 .version{
7 .version {
8 display: none;
8 display: none;
9 }
9 }
10
10
11 .pre{
11 .pre {
12 color:#000
12 color: #000
13 }
13 }
@@ -1249,15 +1249,18
1249 """
1249 """
1250 generates the svg metadata for image
1250 generates the svg metadata for image
1251 """
1251 """
1252
1252 fonts = [
1253 font_family = ','.join([
1253 '-apple-system',
1254 'proximanovaregular',
1254 'BlinkMacSystemFont',
1255 'Proxima Nova Regular',
1255 'Segoe UI',
1256 'Proxima Nova',
1256 'Roboto',
1257 'Arial',
1257 'Oxygen-Sans',
1258 'Lucida Grande',
1258 'Ubuntu',
1259 'sans-serif'
1259 'Cantarell',
1260 ])
1260 'Helvetica Neue',
1261 'sans-serif'
1262 ]
1263 font_family = ','.join(fonts)
1261 if svg_type:
1264 if svg_type:
1262 return self.get_img_data_by_type(font_family, svg_type)
1265 return self.get_img_data_by_type(font_family, svg_type)
1263
1266
@@ -12,7 +12,7
12 body {
12 body {
13 background:#eeeeee;
13 background:#eeeeee;
14 color: #323232;
14 color: #323232;
15 font-family: "proximanovaregular","Proxima Nova Regular","Proxima Nova",sans-serif;
15 font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
16 margin: 0 auto;
16 margin: 0 auto;
17 max-width: 1000px;
17 max-width: 1000px;
18 letter-spacing: .02em;
18 letter-spacing: .02em;
@@ -800,6 +800,8
800 .pill {
800 .pill {
801 opacity: .8;
801 opacity: .8;
802 margin-right: 3px;
802 margin-right: 3px;
803 font-size: 12px;
804 font-weight: normal;
803
805
804 &:first-child {
806 &:first-child {
805 border-radius: @border-radius 0 0 @border-radius;
807 border-radius: @border-radius 0 0 @border-radius;
@@ -5,7 +5,6
5 @import 'helpers';
5 @import 'helpers';
6 @import 'mixins';
6 @import 'mixins';
7 @import 'rcicons';
7 @import 'rcicons';
8 @import 'fonts';
9 @import 'variables';
8 @import 'variables';
10 @import 'bootstrap-variables';
9 @import 'bootstrap-variables';
11 @import 'form-bootstrap';
10 @import 'form-bootstrap';
@@ -1546,19 +1545,15
1546
1545
1547 .show_more {
1546 .show_more {
1548 display: inline-block;
1547 display: inline-block;
1549 position: relative;
1548 width: 0;
1549 height: 0;
1550 vertical-align: middle;
1550 vertical-align: middle;
1551 width: 4px;
1551 content: "";
1552 height: @basefontsize;
1552 border: 4px solid;
1553
1553 border-right-color: transparent;
1554 &:after {
1554 border-bottom-color: transparent;
1555 content: "\00A0\25BE";
1555 border-left-color: transparent;
1556 display: inline-block;
1556 font-size: 0;
1557 width:10px;
1558 line-height: 5px;
1559 font-size: 12px;
1560 cursor: pointer;
1561 }
1562 }
1557 }
1563
1558
1564 .journal_more .show_more {
1559 .journal_more .show_more {
@@ -1569,13 +1564,6
1569 }
1564 }
1570 }
1565 }
1571
1566
1572 .open .show_more:after,
1573 .select2-dropdown-open .show_more:after {
1574 .rotate(180deg);
1575 margin-left: 4px;
1576 }
1577
1578
1579 .compare_view_commits .collapse_commit:after {
1567 .compare_view_commits .collapse_commit:after {
1580 cursor: pointer;
1568 cursor: pointer;
1581 content: "\00A0\25B4";
1569 content: "\00A0\25B4";
@@ -2250,7 +2238,6
2250
2238
2251 div.search-feedback-items {
2239 div.search-feedback-items {
2252 display: inline-block;
2240 display: inline-block;
2253 padding:0px 0px 0px 96px;
2254 }
2241 }
2255
2242
2256 div.search-code-body {
2243 div.search-code-body {
@@ -119,11 +119,6
119 &.has_select2 a {
119 &.has_select2 a {
120 display: block;
120 display: block;
121 padding: 10px 0 2px;
121 padding: 10px 0 2px;
122
123 .show_more {
124 margin-top: -4px;
125 padding-right: .5em;
126 }
127 }
122 }
128
123
129 .menulabel {
124 .menulabel {
@@ -170,17 +165,13
170
165
171 &:hover { color: @grey1; }
166 &:hover { color: @grey1; }
172 }
167 }
173
174 .show_more {
175 padding-left: .5em;
176 }
177 }
168 }
178
169
179 #quick_login_link {
170 #quick_login_link {
180 display: inline-block;
171 display: inline-block;
181
172
182 .gravatar {
173 .gravatar {
183 border: 1px solid @grey2;
174 border: 1px solid @grey5;
184 }
175 }
185
176
186 .gravatar-login {
177 .gravatar-login {
@@ -205,6 +196,10
205 &:hover #quick_login_link {
196 &:hover #quick_login_link {
206 color: inherit;
197 color: inherit;
207 }
198 }
199
200 .menu_link_user {
201 padding: 0 2px;
202 }
208 }
203 }
209
204
210 &:before { content: none; }
205 &:before { content: none; }
@@ -649,7 +644,7
649 border-bottom: 1px solid @grey4;
644 border-bottom: 1px solid @grey4;
650 display: inline-block;
645 display: inline-block;
651 vertical-align: top;
646 vertical-align: top;
652 margin-left: -5px;
647 margin-left: -7px;
653 background: @grey3;
648 background: @grey3;
654 }
649 }
655
650
@@ -673,10 +668,11
673 }
668 }
674
669
675 .main_filter_input {
670 .main_filter_input {
676 padding: 6px;
671 padding: 5px;
677 min-width: 220px;
672 min-width: 220px;
678 color: @nav-grey;
673 color: @nav-grey;
679 background: @grey3;
674 background: @grey3;
675 min-height: 18px;
680 }
676 }
681
677
682 .main_filter_input::placeholder {
678 .main_filter_input::placeholder {
@@ -90,6 +90,9
90
90
91 .icon-more:before { content: '\e815'; } /* '' */
91 .icon-more:before { content: '\e815'; } /* '' */
92
92
93 .icon-more-linked { cursor: pointer; color: @grey3 }
94 .icon-more-linked:before { content: '\e815'; } /* '' */
95
93 .icon-git-inv:before { content: '\e80f'; } /* '' */
96 .icon-git-inv:before { content: '\e80f'; } /* '' */
94 .icon-hg-inv:before { content: '\e810'; } /* '' */
97 .icon-hg-inv:before { content: '\e810'; } /* '' */
95 .icon-svn-inv:before { content: '\e811'; } /* '' */
98 .icon-svn-inv:before { content: '\e811'; } /* '' */
@@ -127,11 +127,11
127 &:after {
127 &:after {
128 position: absolute;
128 position: absolute;
129 content: "\00A0\25BE";
129 content: "\00A0\25BE";
130 right: .6em;
130 right: .1em;
131 line-height: 1em;
131 line-height: 1em;
132 top: 0.9em;
132 top: 0.4em;
133 width: 1em;
133 width: 1em;
134 font-size: 1em;
134 font-size: 20px;
135 }
135 }
136 }
136 }
137 }
137 }
@@ -44,7 +44,7
44
44
45 // Breadcrumbs
45 // Breadcrumbs
46 .breadcrumbs {
46 .breadcrumbs {
47 &:extend(h1);
47 font-size: @repo-title-fontsize;
48 margin: 0;
48 margin: 0;
49 }
49 }
50
50
@@ -230,7 +230,7
230 width: 100%;
230 width: 100%;
231 margin: @pagepadding/2 0 @pagepadding;
231 margin: @pagepadding/2 0 @pagepadding;
232
232
233 .breadcrumbs{
233 .breadcrumbs {
234 float: left;
234 float: left;
235 clear: both;
235 clear: both;
236 width: 700px;
236 width: 700px;
@@ -53,16 +53,16
53 @text-color: @grey2;
53 @text-color: @grey2;
54 @repo-title-fontsize: 18px;
54 @repo-title-fontsize: 18px;
55
55
56 @text-regular: "proximanovaregular","Proxima Nova Regular", "Proxima Nova", sans-serif;
56 @text-regular: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
57 @text-italic: "proximanovaitalic","Proxima Nova Italic", "Proxima Nova", sans-serif;
57 @text-italic: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
58 @text-bold: "proximanovabold","Proxima Nova Bold", "Proxima Nova", sans-serif;
58 @text-bold: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
59 @text-semibold: "proximanovasemibold","Proxima Nova Semibold", "Proxima Nova", sans-serif;
59 @text-semibold: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
60 @text-bold-italic: "proximanovabolditalic","Proxima Nova Bold Italic", "Proxima Nova", sans-serif;
60 @text-bold-italic: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
61 @text-code: "Lucida Console", Menlo, Monaco, monospace;
61 @text-code: 'Menlo', 'Liberation Mono', 'Consolas', 'DejaVu Sans Mono', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace;
62 @text-light: @text-regular;
62 @text-light: @text-regular;
63 @text-light-italic: @text-italic;
63 @text-light-italic: @text-italic;
64 // Used for .close buttons
64 // Used for .close buttons
65 @text-bootstrap: "Helvetica Neue", Helvetica, Arial, sans-serif;
65 @text-bootstrap: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
66
66
67 @panel-title: @basefontsize;
67 @panel-title: @basefontsize;
68 @panel-footer: @basefontsize;
68 @panel-footer: @basefontsize;
@@ -82,7 +82,7
82 </td>
82 </td>
83 <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_('Expand commit message')}" onclick="commitsController.expandCommit(this); return false">
83 <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_('Expand commit message')}" onclick="commitsController.expandCommit(this); return false">
84 <div class="show_more_col">
84 <div class="show_more_col">
85 <i class="show_more"></i>&nbsp;
85 <i class="icon-more-linked"></i>&nbsp;
86 </div>
86 </div>
87 </td>
87 </td>
88 <td class="td-description mid">
88 <td class="td-description mid">
@@ -50,7 +50,7
50 title="${_( 'Expand commit message')}"
50 title="${_( 'Expand commit message')}"
51 >
51 >
52 <div class="show_more_col">
52 <div class="show_more_col">
53 <i class="show_more"></i>
53 <i class="icon-more-linked"></i>
54 </div>
54 </div>
55 </td>
55 </td>
56 <td class="mid td-description">
56 <td class="mid td-description">
@@ -518,7 +518,7
518 </td>
518 </td>
519 <td class="expand_commit" data-commit-id="${commit.raw_id}" title="${_( 'Expand commit message')}">
519 <td class="expand_commit" data-commit-id="${commit.raw_id}" title="${_( 'Expand commit message')}">
520 <div class="show_more_col">
520 <div class="show_more_col">
521 <i class="show_more"></i>
521 <i class="icon-more-linked"></i>
522 </div>
522 </div>
523 </td>
523 </td>
524 <td class="mid td-description">
524 <td class="mid td-description">
@@ -57,8 +57,7
57 %endif
57 %endif
58 <div class="form search-form">
58 <div class="form search-form">
59 <div class="fields">
59 <div class="fields">
60 <label for="q">${_('Search item')}:</label>
60 ${h.text('q', c.cur_query, placeholder="Enter query...")}
61 ${h.text('q', c.cur_query)}
62
61
63 ${h.select('type',c.search_type,[('content',_('File contents')), ('commit',_('Commit messages')), ('path',_('File names')),],id='id_search_type')}
62 ${h.select('type',c.search_type,[('content',_('File contents')), ('commit',_('Commit messages')), ('path',_('File names')),],id='id_search_type')}
64 <input type="submit" value="${_('Search')}" class="btn"/>
63 <input type="submit" value="${_('Search')}" class="btn"/>
@@ -35,7 +35,7
35 </td>
35 </td>
36 <td class="td-message expand_commit search open" data-commit-id="${h.md5_safe(entry['repository'])+entry['commit_id']}" id="t-${h.md5_safe(entry['repository'])+entry['commit_id']}" title="${_('Expand commit message')}">
36 <td class="td-message expand_commit search open" data-commit-id="${h.md5_safe(entry['repository'])+entry['commit_id']}" id="t-${h.md5_safe(entry['repository'])+entry['commit_id']}" title="${_('Expand commit message')}">
37 <div class="show_more_col">
37 <div class="show_more_col">
38 <i class="show_more"></i>&nbsp;
38 <i class="icon-more-linked"></i>&nbsp;
39 </div>
39 </div>
40 </td>
40 </td>
41 <td data-commit-id="${h.md5_safe(entry['repository'])+entry['commit_id']}" id="c-${h.md5_safe(entry['repository'])+entry['commit_id']}" class="message td-description open">
41 <td data-commit-id="${h.md5_safe(entry['repository'])+entry['commit_id']}" id="c-${h.md5_safe(entry['repository'])+entry['commit_id']}" class="message td-description open">
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
Comments 0
You need to be logged in to leave comments. Login now