MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix #EDU-526 Set task description font size depends on editor font size Change fonts for edu study task description panel

Browse Source
This commit is contained in:
Valentina Kiryushkina
2016-02-10 15:40:09 +03:00
parent 2288283e30
commit 02abce4f5e
4 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational-core/student/resources/code-mirror/codemirror-darcula.css
+5 -3
View File
@@ -16,9 +16,11 @@
body {
margin-left: 20px;
/*font-family: Serif, serif;*/
font-family: monospace;
font-weight: lighter;
font-family: Helvetica, sans-serif;
}
code {
font-family: Courier, monospace;
}
/* BASICS */
python/educational-core/student/resources/code-mirror/codemirror.css
+6 -3
View File
@@ -1,8 +1,11 @@
body {
margin-left: 20px;
/*font-family: Serif, serif;*/
font-family: monospace;
font-weight: lighter;
font-family: Helvetica, sans-serif;
color: #4f5254;
}
code {
font-family: "Source Code Pro", fantasy;
}
/* BASICS */
.task-help pre code {
python/educational-core/student/resources/code-mirror/template.html
+17
View File
@@ -1,14 +1,31 @@
<!DOCTYPE html>
<html>
<head>
<!--all elements like "${}" is replaced by real values while loading page in StudyBrowser-->
<!--suppress HtmlUnknownTarget -->
<link rel="stylesheet" href="${css_oldcodemirror}">
<!--suppress HtmlUnknownTarget -->
<link rel="stylesheet" href="${css_codemirror}">
<!--suppress HtmlUnknownTarget -->
<script src="${codemirror}"></script>
<!--suppress HtmlUnknownTarget -->
<script src="${colorize}"></script>
<!--suppress HtmlUnknownTarget -->
<script src="${runmode}"></script>
<!--suppress HtmlUnknownTarget -->
<script src="${highlight_mode}"></script>
<!--suppress HtmlUnknownTarget -->
<script src="${javascript}"></script>
<!--suppress HtmlUnknownTarget -->
<script src="${python}"></script>
<!--suppress CssInvalidPropertyValue -->
<style media="screen" type="text/css">
body {
font-size: ${font_size}pt !important;
}
</style>
</head>
<body>
${code}
python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyBrowserWindow.java
+7 -1
View File
@@ -7,6 +7,8 @@ import com.intellij.ide.ui.LafManagerListener;
import com.intellij.ide.ui.laf.darcula.DarculaLookAndFeelInfo;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.colors.EditorColorsManager;
import com.intellij.openapi.editor.colors.EditorColorsScheme;
import com.intellij.openapi.util.io.StreamUtil;
import com.jetbrains.edu.learning.StudyToolWindowConfigurator;
import javafx.application.Platform;
@@ -152,8 +154,12 @@ class StudyBrowserWindow extends JFrame {
if (template == null) {
LOG.warn("Code mirror template is null");
return null;
}
}
final EditorColorsScheme editorColorsScheme = EditorColorsManager.getInstance().getGlobalScheme();
int fontSize = editorColorsScheme.getEditorFontSize();
template = template.replace("${font_size}", String.valueOf(fontSize- 2));
template = template.replace("${highlight_mode}", getClass().getResource("/code-mirror/clike.js").toExternalForm());
template = template.replace("${codemirror}", getClass().getResource("/code-mirror/codemirror.js").toExternalForm());
template = template.replace("${python}", getClass().getResource("/code-mirror/python.js").toExternalForm());