Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
subugoe
ahiqar
ahiqar-tido
Commits
99e099ff
Commit
99e099ff
authored
Oct 14, 2020
by
Mathias Goebel
Browse files
Merge branch 'develop' of gitlab.gwdg.de:subugoe/ahiqar/frontend into develop
parents
aac10ef1
845a9c0f
Changes
5
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
99e099ff
...
...
@@ -11,6 +11,7 @@ build:
GIT_SUBMODULE_STRATEGY
:
normal
script
:
-
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
...
...
CHANGELOG.md
View file @
99e099ff
...
...
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on
[
Keep a Changelog
](
https://keepachangelog.com/en/1.0.0/
)
,
and this project adheres to
[
Semantic Versioning
](
https://semver.org/spec/v2.0.0.html
)
.
## 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
...
...
README.md
View file @
99e099ff
...
...
@@ -3,5 +3,20 @@
The (static) frontend for the Ahiqar project:
<https://ahikar.sub.uni.goettingen.de>
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.
<https://gitlab.gwdg.de/subugoe/ahiqar/backend#get-the-frontend>
.
## 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.
```
bash
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.
ahikar.css
View file @
99e099ff
<<<<<<<
Updated
upstream
=======
body
{
background-color
:
transparent
;
}
>>>>>>>
Stashed
changes
index.html
View file @
99e099ff
...
...
@@ -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"
>
</head>
<body>
<noscript>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment