rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into v2.1.0-dev

Browse source
This commit is contained in:
Joel Collins 2020-03-25 16:43:53 +00:00
commit d427a81cb7
3 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "openflexure-ev", "name": "openflexure-ev",
"version": "2.0.0-beta.6", "version": "2.0.0",
"private": true, "private": true,
"description": "An electron-based user client for the OpenFlexure Microscope Server", "description": "An electron-based user client for the OpenFlexure Microscope Server",
"author": "OpenFlexure <contact@openflexure.org> (https://www.openflexure.org)", "author": "OpenFlexure <contact@openflexure.org> (https://www.openflexure.org)",

1
src/components/genericComponents/tabIcon.vue
View file

@ -92,6 +92,7 @@ export default {
max-width: 60px; max-width: 60px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
font-size: 85%;
} }
a:hover, a:hover,

1
src/components/panelLeft.vue
View file

@ -258,6 +258,7 @@ export default {
} }
#switcher-left { #switcher-left {
width: 75px;
background-color: rgba(180, 180, 180, 0.1); background-color: rgba(180, 180, 180, 0.1);
padding-top: 2px !important; padding-top: 2px !important;
} }