Mirrors/VILLASweb
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-09 00:00:01 +01:00
Code Issues Releases Wiki Activity

Changed button and button style

Browse source
This commit is contained in:
Markus Grigull 2015-10-23 07:51:02 -04:00
parent 1ece7f3558
commit a860811240
2 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/styles/app.css
View file

@ -178,6 +178,27 @@ p {
padding-left: 20px;
}
button {
border: 3px solid blue;
color #FFF;
background-color: #ccf;
font-size: 30px;
font-weight: bold;
width: 250px;
height: 50px;
}
button:disabled {
border: 3px solid gray;
background-color: #ccc;
}
#init-button {
}
/*
* Layout
*/
@ -270,6 +291,11 @@ overflow: hidden;
margin: 0;
}
.shadowed {
box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.5),
0 10px 20px 0 rgba(0, 0, 0, 0.2);
}
/*
* Content
*/

12
app/templates/lab-mashup.hbs
View file

@ -79,8 +79,12 @@
{{line-chart data=Voltage203937 height="90%" xaxisLength=120 minValue=0.90 maxValue=1.05 label="RMS voltage [pu]"}}
</td>
<td style="width: 50%" colspan="2">
<button {{action 'resetData'}} disabled={{initState}}>Reset</button>
<button {{action 'eventData'}} disabled={{eventState}}>Event</button>
<div style="position: relative; top: 25%; left: 30%">
<button {{action 'resetData'}} disabled={{initState}} id="init-button">Reset</button>
</div>
<div style="position: relative; top: 40%; left: 30%">
<button {{action 'eventData'}} disabled={{eventState}} id="event-button">Event</button>
</div>
</td>
</tr>
</table>
@ -153,10 +157,10 @@
</td>
<td style="width: 50%;" colspan="2">
{{#if initState}}
<img src={{"assets/images/Prosumer_section/Prosumer_gif_m1.gif"}} style="width: 55%; height: auto; float: right; margin-right: 100px" />
<img src={{"assets/images/Prosumer_section/Prosumer_gif_m1.gif"}} style="width: 55%; height: auto; float: right; margin-right: 100px" class="shadowed" />
{{/if}}
{{#if eventState}}
<img src={{"assets/images/Prosumer_section/Prosumer_gif_m2.gif"}} style="width: 55%; height: auto; float: right; margin-right: 100px" />
<img src={{"assets/images/Prosumer_section/Prosumer_gif_m2.gif"}} style="width: 55%; height: auto; float: right; margin-right: 100px" class="shadowed" />
{{/if}}
</td>
</tr>