Skip to content
Snippets Groups Projects
Commit f63dfdcd authored by mechtelm's avatar mechtelm
Browse files

Merge branch 'master' into syscheck-refac

parents 6b29da7a af7a9c6d
No related branches found
No related tags found
No related merge requests found
......@@ -16,8 +16,8 @@ after_script:
- make stop
after_success:
- if [[ "$TRAVIS_BRANCH" == "master" ]]; then
- if [ "$TRAVIS_TAG" ]; then
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin;
make build-image;
make push-image;
docker build --target prod -t iqbberlin/testcenter-frontend:$TRAVIS_TAG -f docker/Dockerfile .;
docker push iqbberlin/testcenter-frontend:$TRAVIS_TAG;
fi
......@@ -19,18 +19,14 @@ build:
test-unit:
docker-compose -f docker/docker-compose.yml exec testcenter-frontend-dev ng test --watch=false
# TODO fails for yet unknown reason
test-e2e:
docker-compose -f docker/docker-compose.yml exec testcenter-frontend-dev ng e2e --webdriver-update=false --port 4202
init-dev-config:
cp src/environments/environment.dev.ts src/environments/environment.ts
init-prod-config:
cp src/environments/environment.prod.ts src/environments/environment.ts
build-image:
docker build -t iqbberlin/testcenter-frontend -f docker/Dockerfile .
docker build --target prod -t iqbberlin/testcenter-frontend -f docker/Dockerfile .
push-image:
docker push iqbberlin/testcenter-frontend:latest
{
"name": "itc-ng",
"version": "5.0.3",
"version": "5.0.4",
"license": "MIT",
"repository": {
"type": "git",
......
......@@ -130,9 +130,12 @@ mat-sidenav {
}
.corner-menu {
position: absolute;
position: fixed;
right: 30px;
top: 2px;
top: 70px;
background: white;
z-index: 10000;
border-bottom-left-radius: 10px;
}
.emph {
......
......@@ -232,6 +232,7 @@
[class]="{
unit: true,
aggregated: true,
current: true,
selected: selectedElement?.id === testletOrUnit.id,
marked: markedElement?.id === testletOrUnit.id
}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment