Merge pull request #360 from ImisDevelopers/dev

Dev to master

.gitignore

@@ -4,6 +4,7 @@
 .idea
 .gradle
 .DS_Store
+.vscode
 **/.project
 **/.settings
 /.classpath

client/.eslintrc.js

@@ -9,8 +9,8 @@ module.exports = {
     'plugin:vue/essential',
     'eslint:recommended',
     '@vue/typescript/recommended',
-    '@vue/prettier',
-    '@vue/prettier/@typescript-eslint',
+    //'@vue/prettier',
+    //'@vue/prettier/@typescript-eslint',
   ],
   parserOptions: {
     parser: '@typescript-eslint/parser',

client/build.gradle

@@ -17,6 +17,7 @@ task buildFrontend(type: YarnTask) {
 task lint(type: YarnTask) {
   args = ['run', 'lint']
 }
+
 task test(type: YarnTask) {
   args = ['run', 'test:unit']
 }

client/src/Root.vue

@@ -6,57 +6,6 @@
 
 <style lang="scss">
 
-  .imis-table-no-pagination {
-    .ant-table-pagination {
-      display: none;
-    }
-  }
-
-  #app {
-    font-family: Avenir, Helvetica, Arial, sans-serif;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-    text-align: center;
-    color: #2c3e50;
-  }
-
-  #nav {
-    padding: 30px;
-
-    a {
-      font-weight: bold;
-      color: #2c3e50;
-
-      &.router-link-exact-active {
-        color: #42b983;
-      }
-    }
-  }
-
-  // CSS classes used by multiple components
-  .imis-radio-group {
-    display: flex;
-    flex-direction: column;
-    align-items: stretch;
-    padding-left: 15px;
-
-    > label {
-      padding: 10px 0 10px 15px;
-      display: flex;
-      align-items: center;
-    }
-
-    > label:hover {
-      background: rgba(0, 0, 0, 0.1);
-    }
-
-    .ant-radio {
-      margin-right: 10px;
-    }
-
-    i {
-      margin-right: 10px;
-    }
-  }
+  @import '@/assets/global';
 
 </style>

client/src/assets/global.scss

@@ -0,0 +1,76 @@
+@import url("https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&display=swap");
+
+body {
+  font-family: "Open Sans", Helvetica, Arial, sans-serif;
+}
+
+.imis-table-no-pagination {
+  .ant-table-pagination {
+    display: none;
+  }
+}
+
+#app {
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  color: #2c3e50;
+}
+
+#nav {
+  padding: 30px;
+
+  a {
+    font-weight: bold;
+    color: #2c3e50;
+
+    &.router-link-exact-active {
+      color: #42b983;
+    }
+  }
+}
+
+// CSS classes used by multiple components
+.imis-radio-group {
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+  padding-left: 15px;
+
+  > label {
+    padding: 10px 0 10px 15px;
+    display: flex;
+    align-items: center;
+  }
+
+  > label:hover {
+    background: rgba(0, 0, 0, 0.1);
+  }
+
+  .ant-radio {
+    margin-right: 10px;
+  }
+
+  i {
+    margin-right: 10px;
+  }
+}
+
+.ant-divider-horizontal {
+  margin: 16px 0;
+}
+
+h4 {
+  font-weight: bold,
+}
+
+.fading-enter-active,
+.fading-leave-active {
+  transition: opacity 0.2s;
+}
+.fading-enter, .fading-leave-to /* .fade-leave-active below version 2.1.8 */ {
+  opacity: 0;
+}
+
+.ant-form-item {
+  margin-bottom: 10px;
+}

client/src/components/DateInput.vue

@@ -40,7 +40,7 @@ export default mixins(FormControlMixin).extend({
   props: {
     value: { default: undefined },
     open: { default: false },
-    placeholder: { default: 'TT.MM.JJJJ (z.B. 28.02.1986)' },
+    placeholder: { default: 'z.B. 28.02.1986' },
     format: { default: 'DD.MM.YYYY' },
     defaultValue: { default: undefined },
   },