Skip to content
Snippets Groups Projects
Commit 3f4d4a75 authored by Daniel Göbel's avatar Daniel Göbel
Browse files

Merge branch '87-hide-nfdi-logo-on-login-page' into 'development'

Resolve "Hide NFDI logo on Login Page"

Closes #87

See merge request !83
parents 5be30608 7626e1e7
No related branches found
No related tags found
2 merge requests!84Remove development branch,!83Resolve "Hide NFDI logo on Login Page"
...@@ -40,7 +40,7 @@ build-publish-dev-docker-container-job: ...@@ -40,7 +40,7 @@ build-publish-dev-docker-container-job:
entrypoint: [""] entrypoint: [""]
only: only:
refs: refs:
- development - main
before_script: before_script:
- echo "{\"auths\":{\"${CI_REGISTRY}\":{\"auth\":\"$(printf "%s:%s" "${CI_REGISTRY_USER}" "${CI_REGISTRY_PASSWORD}" | base64 | tr -d '\n')\"},\"$(echo -n $CI_DEPENDENCY_PROXY_SERVER | awk -F[:] '{print $1}')\":{\"auth\":\"$(printf "%s:%s" ${CI_DEPENDENCY_PROXY_USER} "${CI_DEPENDENCY_PROXY_PASSWORD}" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json - echo "{\"auths\":{\"${CI_REGISTRY}\":{\"auth\":\"$(printf "%s:%s" "${CI_REGISTRY_USER}" "${CI_REGISTRY_PASSWORD}" | base64 | tr -d '\n')\"},\"$(echo -n $CI_DEPENDENCY_PROXY_SERVER | awk -F[:] '{print $1}')\":{\"auth\":\"$(printf "%s:%s" ${CI_DEPENDENCY_PROXY_USER} "${CI_DEPENDENCY_PROXY_PASSWORD}" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json
script: script:
......
This diff is collapsed.
...@@ -45,7 +45,7 @@ const parameterGroups = computed<Record<string, never>>( ...@@ -45,7 +45,7 @@ const parameterGroups = computed<Record<string, never>>(
</script> </script>
<template> <template>
<div class="row mb-5 align-items-start"> <div class="row px-2 mb-5 align-items-start">
<div class="col-9"> <div class="col-9">
<div v-for="(group, groupName) in parameterGroups" :key="groupName"> <div v-for="(group, groupName) in parameterGroups" :key="groupName">
<parameter-group-description <parameter-group-description
......
...@@ -21,7 +21,7 @@ const activeTab = computed<string>( ...@@ -21,7 +21,7 @@ const activeTab = computed<string>(
</script> </script>
<template> <template>
<ul class="nav justify-content-evenly nav-tabs fs-5 mb-3"> <ul class="nav justify-content-evenly nav-tabs fs-5">
<li class="nav-item"> <li class="nav-item">
<router-link <router-link
class="nav-link" class="nav-link"
...@@ -79,7 +79,7 @@ const activeTab = computed<string>( ...@@ -79,7 +79,7 @@ const activeTab = computed<string>(
</router-link> </router-link>
</li> </li>
</ul> </ul>
<div v-if="props.loading"> <div v-if="props.loading" class="pt-3 border border-top-0 px-2">
<p class="placeholder-glow mt-2 mb-4"> <p class="placeholder-glow mt-2 mb-4">
<span class="placeholder col-7 fs-1"></span> <span class="placeholder col-7 fs-1"></span>
</p> </p>
...@@ -95,7 +95,7 @@ const activeTab = computed<string>( ...@@ -95,7 +95,7 @@ const activeTab = computed<string>(
></span> ></span>
</p> </p>
</div> </div>
<div v-else class="px-2"> <div v-else class="px-2 pt-3 border border-top-0">
<div v-if="activeTab === 'description'"> <div v-if="activeTab === 'description'">
<markdown-renderer <markdown-renderer
v-if="props.descriptionMarkdown" v-if="props.descriptionMarkdown"
......
...@@ -79,9 +79,8 @@ onMounted(() => { ...@@ -79,9 +79,8 @@ onMounted(() => {
<div <div
class="card text-center ms-md-auto position-fixed top-50 start-50 translate-middle shadow" class="card text-center ms-md-auto position-fixed top-50 start-50 translate-middle shadow"
> >
<div class="card-header">CloWM</div> <div class="card-header">Login</div>
<div class="card-body p-5"> <div class="card-body">
<h5 class="card-title">Login</h5>
<p class="card-text text-secondary"> <p class="card-text text-secondary">
Login to this service with LifeScience Login to this service with LifeScience
</p> </p>
...@@ -92,7 +91,7 @@ onMounted(() => { ...@@ -92,7 +91,7 @@ onMounted(() => {
</div> </div>
<div class="position-fixed bottom-0 w-100 start-0"> <div class="position-fixed bottom-0 w-100 start-0">
<div class="d-flex flex-row justify-content-evenly align-items-center"> <div class="d-flex flex-row justify-content-evenly align-items-center">
<div class="border rounded p-4 icon text-center"> <div class="border rounded p-4 icon text-center" hidden>
<h4 class="mb-4">A Service By</h4> <h4 class="mb-4">A Service By</h4>
<a href="https://nfdi4microbiota.de/"> <a href="https://nfdi4microbiota.de/">
<img <img
......
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