Skip to content

Commit

Permalink
Merge dbeb07a into cfd84d7
Browse files Browse the repository at this point in the history
  • Loading branch information
nathandunn committed Oct 19, 2018
2 parents cfd84d7 + dbeb07a commit a11cd70
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 23 deletions.
28 changes: 14 additions & 14 deletions client/apollo/css/get_history.css
@@ -1,68 +1,68 @@
@CHARSET "UTF-8";

.jbrowse .history_div {
.history_div {
font-size: 9px;
}

.jbrowse .history_table {
.history_table {
font-size: 1.5em;
/* max-width: 47em; */
}

.jbrowse .history_header_column {
.history_header_column {
font-weight: bold;
text-decoration: underline;
}
.jbrowse .history_set{
.history_set{
text-align: left;
margin-right: auto;
}

.jbrowse .history_column_operation {
.history_column_operation {
width: 17em !important;
}

.jbrowse .history_column_action{
.history_column_action{
width: 5em !important;
}

.jbrowse .history_column {
.history_column {
width: 15em;
display: inline-block;
background-color: inherit;
}

.jbrowse .history_row_selected {
.history_row_selected {
background-color: #4169e1;
color: white;
}

.jbrowse .history_row:hover {
.history_row:hover {
background-color: #000099;
color: white;
}

.jbrowse .history_row_current {
.history_row_current {
background-color: #787878;
color: white;
}

.jbrowse .history_rows {
.history_rows {
max-height: 10em;
overflow-y: auto;
}

.jbrowse .history_column_date {
.history_column_date {
max-width: 10em;
}

.jbrowse .history_preview {
.history_preview {
width: 45em;
height: 2em;
padding-top: 3em;
}

.jbrowse .revert_button.dijitButton .dijitButtonNode {
.revert_button.dijitButton .dijitButtonNode {
padding: 0px;
margin: 0px;
}
14 changes: 7 additions & 7 deletions client/apollo/css/get_sequence.css
@@ -1,35 +1,35 @@
@CHARSET "UTF-8";

.jbrowse .get_sequence {
.get_sequence {
font-size:10px;
}

.jbrowse .gff3_area{
.gff3_area{
width: 50em;
height: 20em;
font-family: 'courier';
font-size: 1.0em;
}

.jbrowse .sequence_area {
.sequence_area {
width: 60em;
height: 20em;
font-family: 'courier';
font-size: 1.5em;
}

.jbrowse .first_button_div {
.first_button_div {
margin-top: 10px;
}

.jbrowse .button_div {
.button_div {
margin-top: 5px;
}

.jbrowse .button_label {
.button_label {
margin-left: 3px;
}

.jbrowse .button_field {
.button_field {
margin-left: 3px;
}
5 changes: 3 additions & 2 deletions docs/Apollo2Build.md
Expand Up @@ -81,9 +81,10 @@ Updating the web-service doc can be done with `./apollo create-rest-doc`

#### Running the code for the making client plugin changes

After starting the server run `./apollo watchman` which should automatically copy any files that have been modified from the [client directory](../client) to the running instance.
After starting the server you can run `./gradlew installJBrowseWebOnly` to update the client code to update the JS code.

If for some reason this is not working then make sure that your network development tab, in your browser console, has disabled caching. You can also run the command `./gradlew copy-resources-dev` manually each time instead if the files don't seem to be getting copied.

If for some reason this is not working then make sure that your network development tab, in your browser console, has disabled caching. You can also run the command `gradle copy-resources-dev` manually each time instead if the files don't seem to be getting copied.

#### Running the code for GWT changes

Expand Down

0 comments on commit a11cd70

Please sign in to comment.