Skip to content
This repository has been archived by the owner on Feb 23, 2022. It is now read-only.

Commit

Permalink
Merge pull request #310 from multinet-app/logo-addition-and-recolor
Browse files Browse the repository at this point in the history
Logo addition and recolor
  • Loading branch information
waxlamp committed Feb 11, 2020
2 parents 6d003be + ddd82c8 commit a959cf7
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 5 deletions.
Binary file added client/src/assets/Kitware_Logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed client/src/assets/Ulogo_100px.png
Binary file not shown.
Binary file removed client/src/assets/kw_logo.png
Binary file not shown.
Binary file modified client/src/assets/nsf_logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/utah_logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/vdl_logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 8 additions & 5 deletions client/src/views/FrontPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
class="pr-5"
color="transparent"
flat
width="66%"
width="74%"
>
<v-card-title>Welcome to Multinet!</v-card-title>
<v-divider />
Expand All @@ -34,13 +34,13 @@
<v-card
class="d-flex align-center"
light
width="33%"
width="26%"
>
<v-card-text>
<v-row class="px-4">
<v-col
class="align-center d-flex py-1"
cols="4"
cols="6"
:key="collab.logo"
v-for="collab in collabs"
>
Expand Down Expand Up @@ -110,10 +110,13 @@ export default Vue.extend ({
return {
collabs: [
{
logo: require('../assets/Ulogo_100px.png'),
logo: require('../assets/utah_logo.png'),
},
{
logo: require('../assets/kw_logo.png'),
logo: require('../assets/Kitware_Logo.png'),
},
{
logo: require('../assets/vdl_logo.png'),
},
{
logo: require('../assets/nsf_logo.png'),
Expand Down

0 comments on commit a959cf7

Please sign in to comment.