Commit 99e099ff authored by Mathias Goebel's avatar Mathias Goebel
Browse files

Merge branch 'develop' of into develop

parents aac10ef1 845a9c0f
......@@ -11,6 +11,7 @@ build:
- cp --force index.html Qviewer/src/index.template.html
- cp --force ahikar.css Qviewer/src/statics/
- cd Qviewer
- npm install -g @quasar/cli
- npm install
......@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](,
and this project adheres to [Semantic Versioning](
## 0.5.0 - 2020-10-12
#### Added
- include a static CSS resource to the viewer for project specific styling (mainly the text area)
## [0.4.0] - 2020-08-28
### Changed
......@@ -3,5 +3,20 @@
The (static) frontend for the Ahiqar project: <>
This repository mainly serves as a project specific customization of the EMo QViewer.
QViewer is integrated as git submodule.
It is integrated into the QViewer during the build of the backend, cf. <>.
## Text Styling
To add a specific styling of the text in accordance with the project's requirements a
specific stylesheet, `ahikar.css`, is available.
The file is going to be included in the build of the QViewer application.
For local development copy the two files like shown below.
cp --force index.html Qviewer/src/index.template.html
cp --force *.css Qviewer/src/statics/
You do not have to track the copied files in the version control system.
<<<<<<< Updated upstream
body {
background-color: transparent;
>>>>>>> Stashed changes
......@@ -14,6 +14,7 @@
<link rel="icon" type="image/png" sizes="32x32" href="statics/icons/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="statics/icons/favicon-96x96.png">
<link rel="icon" type="image/ico" href="statics/icons/favicon.ico">
<link rel="stylesheet" type="text/css" href="statics/ahikar.css">
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment