Skip to content

Commit

Permalink
Merge branch 'master' into release_prepare
Browse files Browse the repository at this point in the history
  • Loading branch information
cairijun committed Oct 27, 2014
2 parents 19fcc8f + 3b71b16 commit e1e5a66
Show file tree
Hide file tree
Showing 15 changed files with 976 additions and 894 deletions.
41 changes: 41 additions & 0 deletions init_db.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,47 @@ def outputs():
_(Output(name='BBa_K592101'))
_(Output(name='BBa_E0020'))
_(Output(name='BBa_E0040'))
_(Output(name='BBa_E0030'))
_(Output(name='BBa_E2050'))
_(Output(name='BBa_I712019'))
_(Output(name='BBa_I712028'))
_(Output(name='BBa_I715022'))
_(Output(name='BBa_I715023'))
_(Output(name='BBa_I732005'))
_(Output(name='BBa_I732006'))
_(Output(name='BBa_J52011'))
_(Output(name='BBa_J52013'))
_(Output(name='BBa_J52021'))
_(Output(name='BBa_J52026'))
_(Output(name='BBa_K082003'))
_(Output(name='BBa_K106000'))
_(Output(name='BBa_K106004'))
_(Output(name='BBa_K106005'))
_(Output(name='BBa_K106028'))
_(Output(name='BBa_K106671'))
_(Output(name='BBa_K125500'))
_(Output(name='BBa_K125810'))
_(Output(name='BBa_K147002'))
_(Output(name='BBa_K156009'))
_(Output(name='BBa_K156010'))
_(Output(name='BBa_K157043'))
_(Output(name='BBa_K165005'))
_(Output(name='BBa_K180001'))
_(Output(name='BBa_K180008'))
_(Output(name='BBa_K180009'))
_(Output(name='BBa_K192001'))
_(Output(name='BBa_K283005'))
_(Output(name='BBa_K294055'))
_(Output(name='BBa_K525234'))
_(Output(name='BBa_K525304'))
_(Output(name='BBa_K525305'))
_(Output(name='BBa_K525306'))
_(Output(name='BBa_K525404'))
_(Output(name='BBa_K525405'))
_(Output(name='BBa_K525406'))
_(Output(name='BBa_K592100'))
_(Output(name='BBa_K648013'))
_(Output(name='BBa_K678035'))
db.session.commit()


Expand Down
2 changes: 1 addition & 1 deletion server/static/css/circuit.css
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ body {
}

#right-container .ui.items {
height:95%;
height:88%;
overflow:auto;
width:425px;
}
Expand Down
172 changes: 86 additions & 86 deletions server/static/css/dna.css
Original file line number Diff line number Diff line change
@@ -1,173 +1,173 @@
* {
margin: 0;
padding: 0;
margin: 0;
padding: 0;
}


#dna_container, #dna_footer {
width: 99%;
overflow: hidden;
width: 99%;
overflow: hidden;
}

#dna_container {
height: 600px;
text-align: left;
height: 600px;
text-align: left;
}

#dna_main {
width: 100%;
height: 95%;
float: left;
width: 100%;
height: 95%;
float: left;
}

#dna_header {
width: 100%;
height: 22%;
overflow:auto;
width: 100%;
height: 22%;
overflow:auto;
}

#dna_header ul {
float: left;
margin: 0 2px 0 2px;
padding:0;
max-width:32%;
float: left;
margin: 0 2px 0 2px;
padding:0;
max-width:32%;
}

#dna_header li {
list-style: none;
margin: 5px;
font-size: 14px;
text-align: left;
color:white;
list-style: none;
margin: 5px;
font-size: 14px;
text-align: left;
color:white;
}

#dna_header li > .equal {
width:88px;
}

#dna_content {
width: 95%;
height: 73%;
margin: auto;
overflow-y: auto;
letter-spacing: 0.5em;
font-size: 20px;
font-family: Courier New;
width: 95%;
height: 73%;
margin: auto;
overflow-y: auto;
letter-spacing: 0.5em;
font-size: 20px;
font-family: Courier New;
}

.dna_line {
margin-bottom: 40px;
width: 100%;
overflow-x: hidden;
font-size: 24px;
letter-spacing: 0.5em;
font-family: Courier New;
margin-bottom: 40px;
width: 100%;
overflow-x: hidden;
font-size: 24px;
letter-spacing: 0.5em;
font-family: Courier New;
}


/* 第一条链外的div和第二条链外的div */
.dna_line>div:nth-child(2),
.dna_line>div:nth-child(3) {
width: 100%;
position: relative;
top: 0;
left: 0;
background-color: transparent;
width: 100%;
position: relative;
top: 0;
left: 0;
background-color: transparent;
}

.dna_line>div:nth-child(2) span {
background-color: gray;
background-color: gray;
}

.first_strand, .second_strand {
background-color: transparent;
background-color: transparent;
}

.first_strand::selection {
background-color: yellow;
background-color: yellow;
}

.second_strand::selection {
background-color: transparent;
background-color: transparent;
}

.dna_line input {
border: 0;
outline: 0;
height: 100%;
width: 100%;
font-size: 24px;
letter-spacing: 0.5em;
font-family: Courier New;
ime-mode: disabled;
position: absolute;
color: #fff;
border: 0;
outline: 0;
height: 100%;
width: 100%;
font-size: 24px;
letter-spacing: 0.5em;
font-family: Courier New;
ime-mode: disabled;
position: absolute;
color: #fff;
}


#dna_modal_box {
font-size: 16px;
overflow: hidden;
width: 250px;
padding: auto;
color: white;
position: fixed;
left: 0; top: 0;
display: none;
font-size: 16px;
overflow: hidden;
width: 250px;
padding: auto;
color: white;
position: fixed;
left: 0; top: 0;
display: none;
}

#dna_modal_box>div {
width: 100%;
width: 100%;
}

#dna_modal_box div:first-child {
overflow: hidden;
overflow: hidden;
}


#dna_modal_box>div:first-child>p {
width: 90;
float: left;
text-align: center;
background:none;
width: 90;
float: left;
text-align: center;
background:none;
}

#dna_modal_box .remove.icon {
float: right;
width: 10%;
float: right;
width: 10%;
}

#dna_modal_box .remove.icon:hover {
color:#10cdcc;
}

#dna_modal_box .trash.icon {
float: right;
width: 10%;
float: right;
width: 10%;
}


#dna_modal_box input {
width: 90%;
margin: 5%;
background:none;
color:white;
width: 90%;
margin: 5%;
background:none;
color:white;
}

.dna_tag p {
display: inline;
letter-spacing: 0;
font-family: sans-serif;
position: absolute;
top: 0;
left: 0;
font-size: 18px;
color: black;
display: inline;
letter-spacing: 0;
font-family: sans-serif;
position: absolute;
top: 0;
left: 0;
font-size: 18px;
color: black;
}

.dna_tag>span {
position: relative;
top: 0;
left: 0;
position: relative;
top: 0;
left: 0;
}

12 changes: 6 additions & 6 deletions server/static/css/simulation.css
Original file line number Diff line number Diff line change
Expand Up @@ -267,12 +267,12 @@ body {
}

.adjust_button {
width: 15%;
margin: 3px 0 3px 0;
padding: 0;
outline: none;
background-color: transparent;
border: none;
width: 15%;
margin: 3px 0 3px 0;
padding: 0;
outline: none;
background-color: transparent;
border: none;
}

.left.arrow.icon, .right.arrow.icon {
Expand Down
Loading

0 comments on commit e1e5a66

Please sign in to comment.