Skip to content

Commit

Permalink
Merge branch 'unstable'
Browse files Browse the repository at this point in the history
  • Loading branch information
kinimesi committed Jun 19, 2018
2 parents 00ce820 + 94d116d commit 7877e03
Show file tree
Hide file tree
Showing 13 changed files with 2,678 additions and 306 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ Thanks to JetBrains for an [Open Source License](https://www.jetbrains.com/buy/o

## Team

* [Ilkin Safarli](https://github.com/kinimesi), [Hasan Balci](https://github.com/hasanbalci), [Leonard Dervishi](https://github.com/leonarddrv), [Istemi Bahceci](https://github.com/istemi-bahceci), and [Ugur Dogrusoz](https://github.com/ugurdogrusoz) of [i-Vis at Bilkent University](http://www.cs.bilkent.edu.tr/~ivis), [Metin Can Siper](https://github.com/metincansiper), [Ozgun Babur](https://github.com/ozgunbabur), and [Emek Demir](https://github.com/emekdemir) of the Demir Lab at [OHSU](http://www.ohsu.edu/), and [Ludovic Roy](https://github.com/royludo) and [Alexander Mazein](https://github.com/amazein) of [EISBM](http://eisbm.org)
* [Ilkin Safarli](https://github.com/kinimesi), [Hasan Balci](https://github.com/hasanbalci), [Leonard Dervishi](https://github.com/leonarddrv), [Ahmet Candiroglu](https://github.com/ahmetcandiroglu), [Kaan Sancak](https://github.com/kaansancak), and [Ugur Dogrusoz](https://github.com/ugurdogrusoz) of [i-Vis at Bilkent University](http://www.cs.bilkent.edu.tr/~ivis), [Metin Can Siper](https://github.com/metincansiper), [Ozgun Babur](https://github.com/ozgunbabur), and [Emek Demir](https://github.com/emekdemir) of the Demir Lab at [OHSU](http://www.ohsu.edu/), and [Alexander Mazein](https://github.com/amazein) of [EISBM](http://eisbm.org)

#### Alumni

* Alper Karacelik, Selim Firat Yilmaz
* [Ludovic Roy](https://github.com/royludo), [Istemi Bahceci](https://github.com/istemi-bahceci), Alper Karacelik, Selim Firat Yilmaz
27 changes: 25 additions & 2 deletions app/css/chise.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ body {
padding: 0px;
}

.drag-and-drop-file{
border: 2px dashed #0B9BCD !important;
background-color: #EEEEEE;
}

.sbgn-nav-menu .open > .dropdown-menu {
animation-name: slidenavAnimation;
animation-duration:.3s;
Expand Down Expand Up @@ -185,8 +190,8 @@ body {
}

.network-panel {
height: 680px;
width: 800px;
height: 100%;
width: 100%;
}

#network-tabs-list-container {
Expand Down Expand Up @@ -434,6 +439,14 @@ input::-webkit-outer-spin-button, input::-webkit-inner-spin-button {
margin: 0;
}

#template-modal-content {
position: fixed;
width: 600px;
top: 50%;
left: 50%;
margin-left: -300px;
}

.sbgn-input-small {
width: 50px !important;
}
Expand Down Expand Up @@ -723,6 +736,8 @@ hr.inspector-divider {
border-style: solid !important;
border-width: 1px !important;
border-radius: calc !important;
font-size: 12px;
align: center;
}

#sbgn-toolbar img {
Expand All @@ -737,6 +752,14 @@ img#template-reaction-add-button:hover {
cursor: pointer;
}

img#template-reversible-input-add-button:hover {
cursor: pointer;
}

img#template-reversible-output-add-button:hover {
cursor: pointer;
}

.pointer-button:hover {
cursor: pointer;
}
Expand Down
45 changes: 45 additions & 0 deletions app/img/toolbar/marquee.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 7877e03

Please sign in to comment.