From fcfe833e1415e5e91642dff7e6d32c3cd34aa657 Mon Sep 17 00:00:00 2001 From: sovanna Date: Mon, 5 Aug 2019 18:26:17 +0200 Subject: [PATCH] fix(Solvespace): Uses 310px and adds overflow-hidden --- sass/css/_layout.scss | 2 +- templates/page-solvespace.html | 21 ++++++++++++--------- templates/page.html | 2 +- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/sass/css/_layout.scss b/sass/css/_layout.scss index d3eff47..21aea3f 100644 --- a/sass/css/_layout.scss +++ b/sass/css/_layout.scss @@ -102,7 +102,7 @@ p ~ h5 { } img.kf25 { - width: 320px; + width: 310px; } diff --git a/templates/page-solvespace.html b/templates/page-solvespace.html index 3a5466a..37e8382 100644 --- a/templates/page-solvespace.html +++ b/templates/page-solvespace.html @@ -1,6 +1,9 @@ {% extends 'page.html' %} +{% block maincss %}overflow-hidden{% endblock %} + + {% block js %} @@ -38,15 +41,15 @@ } var bootstrap_env = findBootstrapEnvironment(); - var params_chamber = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 320, height: 200, scale: 1} : {width: 800, height: 600, scale: 3}; - var params_kf25 = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 320, height: 300, scale: 10, offset: new THREE.Vector3(-8, 0, 0)} : {width: 400, height: 300, scale: 10, offset: new THREE.Vector3(-8, 0, 0)}; - var params_viewport = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 320, height: 300, scale: 3} : {width: 400, height: 300, scale: 3}; - var params_multiport = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 320, height: 300, scale: 3} : {width: 400, height: 300, scale: 3}; - var params_k526s_body = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 320, height: 300, scale: 6, offset: new THREE.Vector3(-10, -15, 0)} : {width: 400, height: 300, scale: 6, offset: new THREE.Vector3(-10, -15, 0)}; - var params_k526s_head = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 320, height: 300, scale: 8, offset: new THREE.Vector3(25, 0, 0)} : {width: 400, height: 300, scale: 8, offset: new THREE.Vector3(25, 0, 0)}; - var params_k526s_fixture = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 320, height: 200, scale: 6} : {width: 800, height: 400, scale: 12}; - var params_k526s_adapter = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 320, height: 300, scale: 8, offset: new THREE.Vector3(-8, 0, 0)} : {width: 400, height: 300, scale: 8, offset: new THREE.Vector3(-8, 0, 0)}; - var params_k526s_assy = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 320, height: 300, scale: 8} : {width: 400, height: 300, scale: 8}; + var params_chamber = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 310, height: 200, scale: 1} : {width: 800, height: 600, scale: 3}; + var params_kf25 = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 310, height: 300, scale: 10, offset: new THREE.Vector3(-8, 0, 0)} : {width: 400, height: 300, scale: 10, offset: new THREE.Vector3(-8, 0, 0)}; + var params_viewport = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 310, height: 300, scale: 3} : {width: 400, height: 300, scale: 3}; + var params_multiport = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 310, height: 300, scale: 3} : {width: 400, height: 300, scale: 3}; + var params_k526s_body = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 310, height: 300, scale: 6, offset: new THREE.Vector3(-10, -15, 0)} : {width: 400, height: 300, scale: 6, offset: new THREE.Vector3(-10, -15, 0)}; + var params_k526s_head = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 310, height: 300, scale: 8, offset: new THREE.Vector3(25, 0, 0)} : {width: 400, height: 300, scale: 8, offset: new THREE.Vector3(25, 0, 0)}; + var params_k526s_fixture = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 310, height: 200, scale: 6} : {width: 800, height: 400, scale: 12}; + var params_k526s_adapter = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 310, height: 300, scale: 8, offset: new THREE.Vector3(-8, 0, 0)} : {width: 400, height: 300, scale: 8, offset: new THREE.Vector3(-8, 0, 0)}; + var params_k526s_assy = (bootstrap_env === 'xs' || bootstrap_env == 'sm') ? {width: 310, height: 300, scale: 8} : {width: 400, height: 300, scale: 8}; var nodes = [{ id: 'kf25', diff --git a/templates/page.html b/templates/page.html index 1a3a9b5..48d22bd 100644 --- a/templates/page.html +++ b/templates/page.html @@ -48,7 +48,7 @@ {% block main %} -
+