Commit 5f8de512 authored by Marcel Nellesen's avatar Marcel Nellesen
Browse files

Merge branch 'Sprint/201921' into 'master'

Sprint/201921

See merge request coscine/app/login!10
parents d144e62e 6a23652a
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</div> </div>
<div id="DeltaCoScInESiteLogo"> <div id="DeltaCoScInESiteLogo">
<a id="ctl00_SPSimpleSiteLink1" title="Team Site" class="ms-siteicon-a coscineSiteIcon" href="/"> <a id="ctl00_SPSimpleSiteLink1" title="Team Site" class="ms-siteicon-a coscineSiteIcon" href="/">
<img id="ctl00_SiteLogoImage1" class="ms-siteicon-img" name="onetidHeadbnnr0" :src="coscineImage" alt="Team Site" data-themekey="#"> <img id="ctl00_SiteLogoImage1" class="ms-siteicon-img" name="onetidHeadbnnr0" :src="coscineImageBlack" alt="Team Site" data-themekey="#">
</a> </a>
<span class="coscineSiteIconLabel">CoScInE</span> <span class="coscineSiteIconLabel">CoScInE</span>
</div> </div>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<div class="col-xl-8"> <div class="col-xl-8">
<h1 class="headline"> <h1 class="headline">
{{ $t('headline') }} {{ $t('headline') }}
<img class="logo" :src="coscineImage" v-if="imageEnabled" alt /> <img class="logo" :src="coscineImageBlue" v-if="imageEnabled" alt />
<span class="keyword">CoScInE</span> <span class="keyword">CoScInE</span>
</h1> </h1>
<div class="row"> <div class="row">
...@@ -113,7 +113,8 @@ import Vue from 'vue'; ...@@ -113,7 +113,8 @@ import Vue from 'vue';
import LoginMain from './components/LoginMain.vue'; import LoginMain from './components/LoginMain.vue';
import LoginForm from './components/LoginForm.vue'; import LoginForm from './components/LoginForm.vue';
import coscineImagePath from './assets/logo-coscine.png'; import coscineImageBlackPath from './assets/logo-coscine-black.png';
import coscineImageBluePath from './assets/logo-coscine-blue.png';
import rwthImagePath from './assets/logo-rwth.png'; import rwthImagePath from './assets/logo-rwth.png';
import linkWhitePath from './assets/link_white.svg'; import linkWhitePath from './assets/link_white.svg';
import mailGreyPath from './assets/mail_grey.svg'; import mailGreyPath from './assets/mail_grey.svg';
...@@ -165,7 +166,8 @@ export default Vue.extend({ ...@@ -165,7 +166,8 @@ export default Vue.extend({
}, },
data() { data() {
return { return {
coscineImage: rootUrl + coscineImagePath, coscineImageBlack: rootUrl + coscineImageBlackPath,
coscineImageBlue: rootUrl + coscineImageBluePath,
rwthImage: rootUrl + rwthImagePath, rwthImage: rootUrl + rwthImagePath,
imageEnabled, imageEnabled,
returnUrl: getReturnUrl(), returnUrl: getReturnUrl(),
...@@ -236,6 +238,12 @@ export default Vue.extend({ ...@@ -236,6 +238,12 @@ export default Vue.extend({
width: 36px; width: 36px;
} }
.coscineSiteIcon img {
margin-left: 8px;
height: 36px;
width: 36px;
}
.coscineSiteIconLabel { .coscineSiteIconLabel {
margin-left: 8px; margin-left: 8px;
vertical-align: middle; vertical-align: middle;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment