Skip to content

Commit

Permalink
Merge pull request #696 from ignapas/osparc-connection
Browse files Browse the repository at this point in the history 
oSPARC connection. Texts + icon changes
  • Loading branch information
@egauzens
egauzens authored Jul 7, 2023
2 parents dadcd79 + 3676ad4 commit 98d2741
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 54 deletions.
17 changes: 14 additions & 3 deletions components/FilesTable/FilesTable.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,12 @@
<sparc-tooltip
placement="bottom-center"
>
<div slot="data">
Open in oSPARC. More info on oSPARC can be found
<a href="/resources/4LkLiH5s4FV0LVJd3htsvH" target="_blank">
<div slot="data" class="osparc-service-btn-tooltip">
Open in o<sup>2</sup>S<sup>2</sup>PARC. Login is required,
<a href="/resources/4LkLiH5s4FV0LVJd3htsvH#user-accounts" target="_blank">
<u>here</u>
</a>
you can find more information on how to get an account.
</div>
<svg-icon slot="item" name="icon-osparc" height="1.5rem" width="1.5rem" />
</sparc-tooltip>
Expand Down Expand Up @@ -903,4 +904,14 @@ export default {
}
}
}
.osparc-service-btn-tooltip {
sup, sub {
vertical-align: baseline;
position: relative;
top: -0.4em;
}
sub {
top: 0.4em;
}
}
</style>
19 changes: 18 additions & 1 deletion components/Resources/ServicesSearchResults.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
/>
</div>
<div class="resources-search-results__items--button">
<sparc-tooltip placement="top-center" content="Instantiate this service in o²S²PARC. Login credentials are required.">
<sparc-tooltip placement="top-center">
<div slot="item">
<a :href="service['view_url']" target="_blank">
<el-button class="secondary">
Expand All @@ -32,6 +32,13 @@
</el-button>
</a>
</div>
<div slot="data" class="osparc-service-btn-tooltip">
Instantiate this service in o<sup>2</sup>S<sup>2</sup>PARC. Login is required,
<a href="/resources/4LkLiH5s4FV0LVJd3htsvH#user-accounts" target="_blank">
<u>here</u>
</a>
you can find more information on how to get an account.
</div>
</sparc-tooltip>
</div>
</div>
Expand Down Expand Up @@ -135,6 +142,16 @@ export default {
}
}
}
.osparc-service-btn-tooltip {
sup, sub {
vertical-align: baseline;
position: relative;
top: -0.4em;
}
sub {
top: 0.4em;
}
}
.metadata-title {
color: $grey;
font-size: 1em;
Expand Down
8 changes: 4 additions & 4 deletions static/icons-js/icon-osparc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
var icon = require('vue-svgicon')
icon.register({
'icon-osparc': {
width: 396,
height: 396,
viewBox: '0 0 297 297',
data: '<circle pid="0" cx="148.5" cy="148.5" r="148.1" _fill="#8300bf"/><g _fill="#fff" fill-rule="nonzero" _stroke="none" stroke-linejoin="miter" stroke-width=".933" font-family="\'Times New Roman\'" font-size="16"><path pid="1" d="M209.575 120.263c-.299-7.34-3.035-13.68-8.269-18.98-5.548-5.626-12.35-8.43-20.4-8.43h-65.15c-7.911 0-14.67 2.804-20.3 8.43-5.619 5.615-8.43 12.38-8.43 20.3v16.65c0 7.915 2.811 14.68 8.43 20.3 5.622 5.615 12.38 8.426 20.3 8.426h65.15c.971 0 1.456.418 1.456 1.247v16.66c0 .967-.485 1.453-1.456 1.453l-93.82-.138c.298 7.339 3.069 13.68 8.37 18.98 5.622 5.623 12.38 8.43 20.3 8.43h65.15c8.046 0 14.85-2.807 20.4-8.43 5.547-5.618 8.329-12.38 8.329-20.29v-16.66c0-7.903-2.782-14.67-8.329-20.29-5.548-5.615-12.35-8.43-20.4-8.43h-65.15c-.971 0-1.456-.415-1.456-1.251v-16.65c0-.971.485-1.46 1.456-1.46zM161.975 42.463c.612.079 1.228.142 1.836.232V4.005c-.608-.063-1.224-.112-1.836-.171zM119.175 45.763c1.505-.445 3.028-.863 4.562-1.24V5.283c-1.523.26-3.054.51-4.562.813zM147.775 3.263v38.37c.228-.004.452-.02.683-.02.695 0 1.374.042 2.061.054V3.297c-.69-.008-1.37-.05-2.061-.05-.231 0-.455.016-.683.016zM47.905 138.163c1.09-13.14 4.226-25.46 9.109-36.62v-65.16a137.576 137.576 0 00-9.109 8.505zM62.165 91.363a102.783 102.783 0 018.254-12.27v-52.78a138.873 138.873 0 00-8.254 5.89zM104.975 51.263a97.755 97.755 0 015.473-2.404V8.229c-1.837.492-3.67 1.008-5.473 1.575zM76.485 72.063a98.57 98.57 0 017.176-6.844v-46.61a138.709 138.709 0 00-7.176 3.935zM90.745 59.663a96.389 96.389 0 016.324-4.111v-42.93a140.436 140.436 0 00-6.324 2.602zM133.575 42.663c1.191-.168 2.39-.325 3.596-.456V3.697c-1.195.097-2.405.157-3.596.276zM7.91 164.863a153.1 153.1 0 006.38 30.93v-94.45a153.342 153.342 0 00-6.38 30.93zM42.755 50.463a139.461 139.461 0 00-8.142 10.23v175.8a139.461 139.461 0 008.142 10.23zM175.375 45.163c.904.247 1.8.504 2.688.773V6.246c-.888-.187-1.792-.34-2.688-.508zM215.475 67.263a98.58 98.58 0 015.417 5.346v-49.78a137.487 137.487 0 00-5.417-3.07zM28.435 70.063a141.81 141.81 0 00-7.175 13.38v130.2a141.196 141.196 0 007.175 13.38zM235.175 32.563a132.433 132.433 0 00-6.324-4.67v54.39a103.996 103.996 0 016.324 9.856zM188.775 49.863a99.722 99.722 0 013.596 1.669v-41.52a147.757 147.757 0 00-3.596-1.08zM202.075 56.863a97.662 97.662 0 014.562 3.11v-44.59a148.254 148.254 0 00-4.562-1.941zM235.175 205.223a102.566 102.566 0 01-6.324 9.853v54.22a135.308 135.308 0 006.324-4.674zM249.375 251.813v-206.5c-2.323-2.404-4.745-4.696-7.232-6.922v68.95c4.656 12.57 7.205 26.44 7.205 41.19 0 14.86-2.549 28.78-7.205 41.37v68.78c2.487-2.221 4.909-4.514 7.232-6.922zM220.875 224.743a99.77 99.77 0 01-5.417 5.332v47.36a132.5 132.5 0 005.417-3.065zM206.575 237.273a98.155 98.155 0 01-4.562 3.095v43.32a125.25 125.25 0 004.562-1.938zM192.375 245.763a102.732 102.732 0 01-3.596 1.654v40.87c1.202-.355 2.408-.702 3.596-1.08zM287.075 119.663a152.017 152.017 0 00-4.05-16.61v91.12a152.75 152.75 0 004.05-16.61zM178.075 251.283c-.888.269-1.784.526-2.688.765v39.4c.9-.164 1.8-.317 2.688-.504zM277.875 88.663a144.422 144.422 0 00-8.994-17.8v155.5a143.648 143.648 0 008.994-17.8zM263.675 62.763a140.313 140.313 0 00-8.142-10.62v192.8a138.728 138.728 0 008.142-10.62zM70.425 218.283a101.243 101.243 0 01-8.254-12.26v58.98a135.554 135.554 0 008.254 5.899zM97.065 241.753a97.802 97.802 0 01-6.324-4.092v44.33a140.92 140.92 0 006.324 2.602zM163.875 254.473c-.608.086-1.224.154-1.836.232v38.62c.612-.056 1.228-.11 1.836-.172zM83.655 232.133a97.8 97.8 0 01-7.176-6.817v49.36a133.541 133.541 0 007.176 3.939zM57.015 260.813v-64.99c-4.883-11.16-8.016-23.51-9.109-36.73v93.22a136.765 136.765 0 009.109 8.504zM110.375 248.363a92.753 92.753 0 01-5.473-2.393v41.39c1.807.57 3.636 1.082 5.473 1.583zM150.475 293.91v-38.36c-.691.012-1.37.046-2.065.046-.227 0-.451-.012-.679-.015v38.37c.228.004.452.019.679.019.695 0 1.374-.045 2.065-.052zM137.075 254.993a102.908 102.908 0 01-3.596-.451v38.68c1.188.12 2.397.183 3.596.273zM123.775 252.653a96.494 96.494 0 01-4.562-1.232v39.63c1.508.306 3.039.556 4.562.814z"/></g>'
width: 24,
height: 24,
viewBox: '0 0 24 24',
data: '<g _fill="none" fill-rule="evenodd"><circle pid="0" cx="12" cy="12" r="12" _fill="#8300BF"/><circle pid="1" _stroke="#FFF" cx="12" cy="12" r="8.5"/><path pid="2" d="M7 14.697h7.874v-1.58H9.105c-1.403 0-2.105-.513-2.105-1.54V8.755c0-1.237.702-1.855 2.105-1.855h5.769C16.29 6.899 17 7.67 17 9.213H9.105v1.622h5.769c1.417 0 2.126.637 2.126 1.913v2.307c0 1.268-.709 1.903-2.126 1.903H9.105c-1.403 0-2.105-.754-2.105-2.26z" _fill="#FFF"/></g>'
}
})
56 changes: 10 additions & 46 deletions static/icons-svg/icon-osparc.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 98d2741

Please sign in to comment.