Merge branch 'dev' of git.app.uib.no:spraksamlingane/beta.ordbok.uib.no into replace-api

.gitlab-ci.yml

@@ -2,13 +2,28 @@ stages:
   - build
   - deploy
 
+workflow:
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS'
+      when: never
+    - if: '$CI_COMMIT_BRANCH'
+
 build-dev:
   image: node:latest
   tags:
     - spraaksamlingene_01
   stage: build
+  rules:
+    - if: $CI_COMMIT_TAG == null
+      when: always
   script:
-    - echo "VUE_APP_VERSION_LABEL=$CI_COMMIT_BRANCH" >> .env.dev_server
+    - |- 
+          if [[ $CI_PIPELINE_SOURCE == "merge_request_event" ]]; then
+              echo "VUE_APP_VERSION_LABEL=MERGE $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME ($CI_COMMIT_SHORT_SHA)" >> .env.dev_server
+          else 
+              echo "VUE_APP_VERSION_LABEL=BRANCH $CI_COMMIT_BRANCH ($CI_COMMIT_SHORT_SHA)" >> .env.dev_server
+          fi
     - npm install --progress=false
     - npm run build -- --mode dev_server
   artifacts:
@@ -38,9 +53,9 @@ deploy-dev:
     - spraaksamlingene_01
   stage: deploy
   rules:
-  - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+  - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_PIPELINE_SOURCE == 'merge_request_event'
     when: always
-  - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
+  - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE != 'merge_request_event'
     when: manual
   script:
   - rm -rf ~/.aws

package.json

@@ -28,8 +28,8 @@
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
     "@babel/plugin-proposal-optional-chaining": "^7.13.12",
     "@vue/cli-plugin-babel": "^4.5.12",
-    "@vue/cli-plugin-eslint": "~4.5.0",
-    "@vue/cli-service": "~4.5.0",
+    "@vue/cli-plugin-eslint": "^3.1.1",
+    "@vue/cli-service": "^4.5.13",
     "babel-eslint": "^10.1.0",
     "eslint": "^5.16.0",
     "eslint-plugin-vue": "^5.0.0",

src/App.vue

@@ -99,8 +99,9 @@ header > p {
 
 .beta {
   position: absolute;
+  white-space: nowrap;
   top: 2px;
-  font-size: 20px;
+  font-size: 18px;
   color: #BBBBBB;
   padding-left: 15px;
 }

src/components/Header.vue

@@ -286,7 +286,8 @@ article:not(.righ_hand_column) .inflection-canvas {
 
 
 td.hilite {
-    background-color: var(--v-tertiary-base)
+    background-color: var(--v-tertiary-base);
+    text-align: center
 }
 
 </style>