Skip to content
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

feat: adding calcutta default fonts for vnc #167

Merged
merged 3 commits into from
Jun 7, 2021
+366 −9
Merged

feat: adding calcutta default fonts for vnc #167

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04929f5
adding calcutta default fonts for vnc
gavin-k-lee Jun 7, 2021
1b42275
change refresh instruction to calcutta
gavin-k-lee Jun 7, 2021
ea2ef11
rm calcutta-medium.html
gavin-k-lee Jun 7, 2021
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 removed docker/vnc/CircularMedium.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed docker/vnc/CircularMedium.woff
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion docker/vnc/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ COPY --chown=root:root renku-48x48.png /opt/noVNC-${novnc_version}/app/images/ic

COPY --chown=root:root ui.js /opt/noVNC-${novnc_version}/app/ui.js
COPY --chown=root:root base.css /opt/noVNC-${novnc_version}/app/styles/base.css
COPY --chown=root:root CircularMedium.* /opt/noVNC-${novnc_version}/app/styles/
COPY --chown=root:root fonts /opt/noVNC-${novnc_version}/app/styles/fonts

#################################################################
# Install TigerVNC
Expand Down
23 changes: 16 additions & 7 deletions docker/vnc/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -866,26 +866,35 @@ select:active {
ime-mode: disabled;
}

/*Default noVNC logo.*/
/* From: http://fonts.googleapis.com/css?family=Orbitron:700 */
/* Webfont: Calcutta-Medium */
@font-face {
font-family: 'CircularMedium';
font-family: 'Calcutta';
src: url('fonts/calcutta/Calcutta-Medium.eot'); /* IE9 Compat Modes */
src: url('fonts/calcutta/Calcutta-Medium.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('fonts/calcutta/Calcutta-Medium.woff') format('woff'), /* Modern Browsers */
url('fonts/calcutta/Calcutta-Medium.ttf') format('truetype'), /* Safari, Android, iOS */
url('fonts/calcutta/Calcutta-Medium.svg#Calcutta-Medium') format('svg'); /* Legacy iOS */
font-style: normal;
font-weight: 700;
src: local('CircularMedium.woff') format('woff'),
local('CircularMedium.ttf') format('truetype');
font-weight: 500;
text-rendering: optimizeLegibility !important;
}


.noVNC_logo {
color:rgb(0, 149, 104);
font-family: 'CircularMedium', 'CircularMediumTTF', sans-serif;
font-family: 'Calcutta', sans-serif;
line-height:90%;
text-shadow: 0.1em 0.1em 0 black;
}
.noVNC_logo span{
color:rgb(210, 106, 152);
}

.noVNC_text {
color: rgb(255,255,255);
font-family: 'Calcutta', sans-serif;
}

#noVNC_bell {
display: none;
}
Expand Down
11 changes: 11 additions & 0 deletions docker/vnc/fonts/calcutta/Calcutta-Medium.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/* Webfont: Calcutta-Medium */@font-face {
font-family: 'Calcutta-Medium';
src: url('Calcutta-Medium.eot'); /* IE9 Compat Modes */
src: url('Calcutta-Medium.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('Calcutta-Medium.woff') format('woff'), /* Modern Browsers */
url('Calcutta-Medium.ttf') format('truetype'), /* Safari, Android, iOS */
url('Calcutta-Medium.svg#Calcutta-Medium') format('svg'); /* Legacy iOS */
font-style: normal;
font-weight: normal;
text-rendering: optimizeLegibility;
}
Binary file added docker/vnc/fonts/calcutta/Calcutta-Medium.eot
View file
Open in desktop
Binary file not shown.
21 changes: 21 additions & 0 deletions docker/vnc/fonts/calcutta/Calcutta-Medium.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">

<head>
<meta content="text/html; charset=utf-8" http-equiv="content-type" />
<meta content="en-us" http-equiv="Content-Language" />
<title>Calcutta Medium Regular - Web Font Specimen</title>
<link rel="stylesheet" type="text/css" media="screen" href="Calcutta-Medium.css" />
<style type="text/css" media="screen">
body {
font-size: 14px;
font-family: "Calcutta-Medium", Georgia;
}
</style>
</head>

<body>
<p contenteditable="true">The quick brown fox jumps over the lazy dog. $123.45!</p>
</body>

</html>
gavin-k-lee marked this conversation as resolved.
Show resolved Hide resolved
Binary file added docker/vnc/fonts/calcutta/Calcutta-Medium.otf
View file
Open in desktop
Binary file not shown.
337 changes: 337 additions & 0 deletions docker/vnc/fonts/calcutta/Calcutta-Medium.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docker/vnc/fonts/calcutta/Calcutta-Medium.ttf
View file
Open in desktop
Binary file not shown.
Binary file added docker/vnc/fonts/calcutta/Calcutta-Medium.woff
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion docker/vnc/vnc_renku.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ <h1 class="noVNC_logo" translate="no">renku</h1>
<div class="noVNC_center">
<div id="noVNC_connect_dlg">
<div class="noVNC_logo" translate="no">renku<span>desktop</span></div>
<div id="noVNC_connect_button"><div>
<div id="noVNC_connect_button"><div class="noVNC_text">
<img alt="" src="app/images/icons/renku-48x48.png"> Refresh your browser or restart your session.
</div></div>
</div>
Expand Down