Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vfb geppetto application updates #339

Merged
merged 11 commits into from
Jul 4, 2019
Merged

Vfb geppetto application updates #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3fa1d68
Add Entity restriction to core query
dosumis Jun 25, 2019
51c1a69
Merge branch 'vfb_geppetto_application' into Feature_333
Robbie1977 Jul 3, 2019
567616a
Merge pull request #334 from VirtualFlyBrain/Feature_333
Robbie1977 Jul 3, 2019
1d68012
Merge pull request #338 from VirtualFlyBrain/development
Robbie1977 Jul 3, 2019
4b47c81
generalising formatting
Robbie1977 Jul 4, 2019
1b6e41b
Merge branch 'vfb_geppetto_application' of https://github.com/Virtual…
Robbie1977 Jul 4, 2019
fde8cfe
order fix
Robbie1977 Jul 4, 2019
ccb36b7
adding logo
Robbie1977 Jul 4, 2019
40ea023
adding alternative names
Robbie1977 Jul 4, 2019
eee4f27
styling logo
Robbie1977 Jul 4, 2019
c11ef9c
adding link
Robbie1977 Jul 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions components/VFBMain.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,14 +846,18 @@ export default class VFBMain extends React.Component {
termInfoId={this.termInfoId}
order={['Name',
'Label',
'Alternative Names',
'Types',
'Classification',
'Parents',
'Logo',
'Link',
'Thumbnail',
'Examples',
'Source',
'License',
'Relationships',
'Query for',
'Query For',
'Description',
'Cross References',
Expand Down
17 changes: 10 additions & 7 deletions css/VFBTermInfo.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,23 +217,19 @@
color:white;
background-color: grey;
font-size: 10px!important;
display: inline-block;
margin-left: 1px;
margin-right:1px;
float:right;
}

/* link label positioning */
li>span.label.types{
.label.types{
margin-right:30px;
float:right;
padding-top: 0em;
padding-bottom: 0em;
}

li>span.label.types>.label{
float:right;
margin-right:1px;
}

/* icon customisations: */

.terminfo-licenseicon {
Expand All @@ -249,6 +245,13 @@ li>span.label.types{
max-width: 165px;
}

.terminfo-logo {
display: block;
margin-left: auto;
margin-right: auto;
max-width: 50%;
}

/* title modifications: */

.terminfo-comment-title {
Expand Down