Skip to content

Commit

Permalink
Merge pull request #39 from alan-wu/popup-size
Browse files Browse the repository at this point in the history
Popup size and new cat icon
  • Loading branch information
alan-wu committed Jun 11, 2020
2 parents 170caca + a0b7cfd commit cd640b4
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 33 deletions.
Binary file modified assets/fonts/mapicon-species.eot
Binary file not shown.
3 changes: 2 additions & 1 deletion assets/fonts/mapicon-species.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/fonts/mapicon-species.ttf
Binary file not shown.
Binary file modified assets/fonts/mapicon-species.woff
Binary file not shown.
15 changes: 9 additions & 6 deletions assets/mapicon-species-style.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@font-face {
font-family: 'mapicon-species';
src: url('fonts/mapicon-species.eot?lf5val');
src: url('fonts/mapicon-species.eot?lf5val#iefix') format('embedded-opentype'),
url('fonts/mapicon-species.ttf?lf5val') format('truetype'),
url('fonts/mapicon-species.woff?lf5val') format('woff'),
url('fonts/mapicon-species.svg?lf5val#mapicon-species') format('svg');
src: url('fonts/mapicon-species.eot?h40clo');
src: url('fonts/mapicon-species.eot?h40clo#iefix') format('embedded-opentype'),
url('fonts/mapicon-species.ttf?h40clo') format('truetype'),
url('fonts/mapicon-species.woff?h40clo') format('woff'),
url('fonts/mapicon-species.svg?h40clo#mapicon-species') format('svg');
font-weight: normal;
font-style: normal;
font-display: block;
Expand All @@ -13,7 +13,7 @@
[class^="icon-"], [class*=" icon-"] {
/* use !important to prevent issues with browser extensions that change fonts */
font-family: 'mapicon-species' !important;
speak: none;
speak: never;
font-style: normal;
font-weight: normal;
font-variant: normal;
Expand All @@ -25,6 +25,9 @@
-moz-osx-font-smoothing: grayscale;
}

.icon-mapicon_cat:before {
content: "\e904";
}
.icon-mapicon_rat:before {
content: "\e900";
}
Expand Down
52 changes: 31 additions & 21 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@abi-software/mapintegratedvuer",
"version": "0.1.15",
"version": "0.1.16",
"main": "./dist/mapintegratedvuer.common.js",
"files": [
"dist/*",
Expand All @@ -18,9 +18,9 @@
"build-static": "vue-cli-service build --dest test_html"
},
"dependencies": {
"@abi-software/flatmapvuer": "^0.1.17",
"@abi-software/maptooltip": "^0.1.7",
"@abi-software/scaffoldvuer": "^0.1.30",
"@abi-software/flatmapvuer": "^0.1.18",
"@abi-software/maptooltip": "^0.1.10",
"@abi-software/scaffoldvuer": "^0.1.31",
"@tehsurfer/plotvuer": "^0.2.17",
"@tehsurfer/vue-tour": "^1.3.4",
"core-js": "^3.3.2",
Expand Down
2 changes: 1 addition & 1 deletion src/components/FloatingFlow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ var initialState = function() {
"Rat":{taxo: "NCBITaxon:10114", iconClass:"icon-mapicon_rat"},
"Mouse":{taxo: "NCBITaxon:10090", iconClass:"icon-mapicon_mouse"},
"Pig":{taxo: "NCBITaxon:9823", iconClass:"icon-mapicon_pig"},
"Cat":{taxo: "NCBITaxon:9685"},
"Cat":{taxo: "NCBITaxon:9685", iconClass:"icon-mapicon_cat"},
},
type: "MultiFlatmap",
zIndex:1,
Expand Down

0 comments on commit cd640b4

Please sign in to comment.