1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-30 00:00:13 +01:00

Change absolute layout into scrollable

Replaced last svg-image with png
Removed unnecessary css
This commit is contained in:
Markus Grigull 2016-06-23 14:19:08 +02:00
parent 534f0dc108
commit 16fef1ae47
7 changed files with 7 additions and 10388 deletions

View file

@ -3,26 +3,12 @@
/*
* Skeleton
*/
html, body {
margin: 0;
padding: 0;
}
.ember-application {
width: 100%;
height: 100%;
top: 0;
left: 0;
position: absolute;
overflow: hidden;
min-width: 1350px;
background: #6EA2B0;
color: #4d4d4d;
margin: 0 auto;
/*font: 16px 'Helvetica Neue', Helvetica, Arial, sans-serif;*/
font: 1.6em Helvetica;
font-weight: 300;
@ -31,21 +17,6 @@ html, body {
-moz-font-smoothing: antialiased;
}
.row, .col {
overflow: hidden;
position: absolute;
}
.row {
left: 0;
right: 0;
}
.col {
top: 0;
bottom: 0;
}
.hidden {
display: none;
}
@ -58,16 +29,11 @@ html, body {
/*
* Application
*/
#lapMashupApp {
}
header {
color: #103B7D;
background-color: #fff;
height: 80px;
top: 0;
border-bottom: 3px solid #bbb;
}
@ -93,32 +59,6 @@ header #logos {
float: right;
}
footer {
color: #555;
height: 25px;
bottom: 0;
font-size: 1em;
/*text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);*/
text-align: center;
}
#main {
top: 80px;
bottom: 0px;
left: 20px;
right: 20px;
}
.svg-image {
width: 96%;
height: auto;
padding-left: 42px;
}
.logo {
width: auto;
height: 60px;

View file

@ -1,5 +1,5 @@
<section id="lapMashupApp">
<header class="row">
<header>
<div id="title">
European Real-Time Integrated Co-Simulation Demo
</div>

View file

@ -1,9 +1,9 @@
<section class="row" id="main">
<section id="main">
<table class="grid">
<tr style="height: 50%">
<td colspan="2" style="padding-top: 20px; padding-right: 5px;">
<div class="layout-page" id="simulation-page">
<img src={{"assets/images/TS_DS_grid_withSimulators_web.svg"}} class="svg-image" />
<img src={{"assets/images/ts_ds_grid_withsimulators_web.png"}} width="100%" />
</div>
</td>
<td width="33%" style="padding-top: 20px;">

View file

@ -5,9 +5,9 @@ module.exports = function(environment) {
* This variable must be set to the address the server should be available on.
*/
var hostAddress = 'localhost';
/*********************************
/*
*
*/
*********************************/
var ENV = {
modulePrefix: 'lab-mashup',

View file

@ -27,7 +27,7 @@ server {
proxy_pass http://orion:1026/;
}
# website location
location / {
root /www;

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 7.7 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 979 KiB

After

Width:  |  Height:  |  Size: 390 KiB