From 267471cb7e7c2e6950cf547ab2ba974fd2ba7f1c Mon Sep 17 00:00:00 2001
From: Vitalis Wiens <vitalis.wiens@gmail.com>
Date: Fri, 9 Feb 2018 17:11:12 +0100
Subject: [PATCH] minor layout changes
---
src/app/css/toolstyle.css | 47 +++++++++++++++++--
src/app/js/menu/modeMenu.js | 1 -
.../js/modules/compactNotationSwitch.js | 2 +
src/webvowl/js/options.js | 2 +-
4 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/src/app/css/toolstyle.css b/src/app/css/toolstyle.css
index 7a99c48b..c5590b2b 100644
--- a/src/app/css/toolstyle.css
+++ b/src/app/css/toolstyle.css
@@ -2,7 +2,7 @@
/*----------------------------------------------
WebVOWL page
----------------------------------------------*/
-/*brrr, edge content no zooming brrr << not sure how this will effect the edge contnet */
+/*brrr, edge content no zooming brrr << not sure how this will effect the edge content */
html{
-ms-content-zooming: none;
}
@@ -193,13 +193,52 @@ main {
margin: 0;
line-height: 0.7;
text-align: center;
- font-size: 3vmin;
+ font-size: 24px;
+
}
#logo h2 span {
color: #34495E;
- font-size: 2vmin;
+ /*font-size: min(2vmin, 24px);*/
+ font-size: 16px;
+}
+
+
+
+@media screen and (max-device-height: 800px){
+ #logo h2 {
+ font-size: calc(8px + 1.0vmin);
+ }
+ #logo h2 span {
+ font-size: calc(3px + 1.0vmin);
+ }
+}
+@media screen and (max-height: 800px){
+ #logo h2 {
+ font-size: calc(8px + 1.0vmin);
+ }
+ #logo h2 span {
+ font-size: calc(3px + 1.0vmin);
+ }
+}
+
+@media screen and (max-device-width: 1200px){
+ #logo h2 {
+ font-size: calc(8px + 1.0vmin);
+ }
+ #logo h2 span {
+ font-size: calc(3px + 1.0vmin);
+ }
}
+@media screen and (max-width: 1200px){
+ #logo h2 {
+ font-size: calc(8px + 1.0vmin);
+ }
+ #logo h2 span {
+ font-size: calc(3px + 1.0vmin);
+ }
+}
+
.checkboxContainer input, .checkboxContainer label {
vertical-align: middle;
}
@@ -703,7 +742,7 @@ main {
/*Font-color Style for menu entries */
#menuElementContainer >li > a {
color : #fff;
- padding: 12px 8px;
+ padding: 12px 12px;
}
#menuElementContainer >li > input {
diff --git a/src/app/js/menu/modeMenu.js b/src/app/js/menu/modeMenu.js
index f82c60b7..e0b8fc21 100644
--- a/src/app/js/menu/modeMenu.js
+++ b/src/app/js/menu/modeMenu.js
@@ -65,7 +65,6 @@ module.exports = function (graph) {
var isEnabled = moduleCheckbox.property("checked");
onChangeFunc(isEnabled);
if (updateLvl>0){
- // graph.updateLabelWidthToDynamic(onChangeFunc);
graph.lazyRefresh(); // maybe to much of an update
}
});
diff --git a/src/webvowl/js/modules/compactNotationSwitch.js b/src/webvowl/js/modules/compactNotationSwitch.js
index e5feb881..daa58389 100644
--- a/src/webvowl/js/modules/compactNotationSwitch.js
+++ b/src/webvowl/js/modules/compactNotationSwitch.js
@@ -3,6 +3,8 @@
*
* @returns {{}}
*/
+
+
module.exports = function (graph) {
var DEFAULT_STATE = false;
diff --git a/src/webvowl/js/options.js b/src/webvowl/js/options.js
index 1d78b44b..f54824ab 100644
--- a/src/webvowl/js/options.js
+++ b/src/webvowl/js/options.js
@@ -33,7 +33,7 @@ module.exports = function () {
graphObject,
zoomSlider,
rectangularRep=false,
- scaleNodesByIndividuals = false;
+ scaleNodesByIndividuals = true;