Skip to content

Use JetBrains Mono font for code #3555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ahornace wants to merge 1 commit into from
Closed

Use JetBrains Mono font for code #3555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added opengrok-web/src/main/webapp/default/font/JetBrainsMono-Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file added opengrok-web/src/main/webapp/default/font/JetBrainsMono-BoldItalic.woff2
View file
Open in desktop
Binary file not shown.
Binary file added opengrok-web/src/main/webapp/default/font/JetBrainsMono-Italic.woff2
View file
Open in desktop
Binary file not shown.
Binary file added opengrok-web/src/main/webapp/default/font/JetBrainsMono-Regular.woff2
View file
Open in desktop
Binary file not shown.
69 changes: 61 additions & 8 deletions ...b/src/main/webapp/default/style-1.0.1.css → ...b/src/main/webapp/default/style-1.0.2.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,34 @@ body {
margin: 0;
}

@font-face {
font-family: "JetBrainsMono";
src: url("./font/JetBrainsMono-Regular.woff2");
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: "JetBrainsMono";
src: url("./font/JetBrainsMono-Bold.woff2");
font-weight: bold;
font-style: normal;
}

@font-face {
font-family: "JetBrainsMono";
src: url("./font/JetBrainsMono-Italic.woff2");
font-weight: normal;
font-style: italic;
}

@font-face {
font-family: "JetBrainsMono";
src: url("./font/JetBrainsMono-BoldItalic.woff2");
font-weight: bold;
font-style: italic;
}

a {
text-decoration: none;
}
Expand Down Expand Up @@ -102,7 +130,10 @@ label {

.pre { /* the diff content */
white-space: pre-wrap;
font-family: monospace;
font-family: JetBrainsMono, monospace;
font-size: 13px;
font-variant-ligatures: none;
line-height: 1.5;
margin: 0;
}

Expand Down Expand Up @@ -303,7 +334,9 @@ html.diff #whole_header {
}

#Masthead {
font-family: monospace; /* ala <kbd> */
font-family: JetBrainsMono, monospace; /* ala <kbd> */
font-size: 13px;
font-variant-ligatures: none;
clear: left;
margin-bottom: 1ex;
margin-left: 1ex;
Expand Down Expand Up @@ -538,7 +571,9 @@ table#revisions {

#revisions td:first-child {
/* rev number - git/mercurial revs numbers look bad with prop. fonts */
font-family: monospace;
font-family: JetBrainsMono, monospace;
font-size: 13px;
font-variant-ligatures: none;
text-align: right;
}

Expand All @@ -550,7 +585,9 @@ table#revisions {

#revisions td > div {
/* modified file list in comment column */
font-family: monospace;
font-family: JetBrainsMono, monospace;
font-size: 13px;
font-variant-ligatures: none;
text-align: left;
float: left;
}
Expand Down Expand Up @@ -682,7 +719,9 @@ table#revisions tbody tr td p {

/* directory listing */
table#dirlist { /* the "Name" column */
font-family: monospace;
font-family: JetBrainsMono, monospace;
font-size: 13px;
font-variant-ligatures: none;
border-style: none;
border-collapse: collapse;
}
Expand Down Expand Up @@ -733,9 +772,19 @@ div[id^='src'] {
}

div[id^='src'] pre {
font-family: JetBrainsMono, monospace;
font-size: 13px;
font-variant-ligatures: none;
line-height: 1.5;
margin: 0;
}

#more pre {
font-family: JetBrainsMono, monospace;
font-size: 13px;
font-variant-ligatures: none;
}

/* hidden line number/annotation block */
.lines-hidden .l, .lines-hidden .hl, .blame-hidden .blame {
display: none
Expand Down Expand Up @@ -787,7 +836,7 @@ div[id^='src'] .n { /* numbers/label */ color: #a52a2a;
div[id^='src'] .s { /* strings */ color: green; }
div[id^='src'] .c { /* comment */ color: #666; }
div[id^='src'] .b { /* heading/title/bold */ color: #000; font-weight: bold; }
div[id^='src'] .k { /* block display */ color: #000; font-family: monospace; }
div[id^='src'] .k { /* block display */ color: #000; }
div[id^='src'] a.d { /* symbol definition */ color: #909; font-weight: bold; }

a.xlbl { /* label */ color: red; font-weight: bold; background-color: yellow }
Expand Down Expand Up @@ -841,8 +890,9 @@ a.scope { /* scope */ color: steelblue; font-weight: bol

.window {
position: fixed;
font-family: JetBrainsMono, monospace;
font-size: 12px;
font-family: monospace;
font-variant-ligatures: none;
overflow: hidden;
z-index: 10;
}
Expand Down Expand Up @@ -1024,7 +1074,10 @@ a.scope { /* scope */ color: steelblue; font-weight: bol
}

#results .con { /* 3rd column: line number + matched line contents */
font-size: small;
font-family: JetBrainsMono, monospace;
font-size: 13px;
font-variant-ligatures: none;
line-height: 1.5;
}

#results .con .all {
Expand Down
2 changes: 1 addition & 1 deletion opengrok-web/src/main/webapp/httpheader.jspf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ org.opengrok.web.Scripts"
PageConfig cfg = PageConfig.get(request);
String styleDir = cfg.getCssDir();
String ctxPath = request.getContextPath();
String dstyle = styleDir + '/' + "style-1.0.1.min.css";
String dstyle = styleDir + '/' + "style-1.0.2.min.css";
String pstyle = styleDir + '/' + "print-1.0.1.min.css";
String mstyle = styleDir + '/' + "mandoc-1.0.0.min.css";
%><!DOCTYPE html>
Expand Down