Merge branch 'Timothep-master' into dev

This commit is contained in:
Hakim El Hattab
2016-06-10 10:13:06 +02:00
2 changed files with 10 additions and 9 deletions

View File

@ -38,8 +38,8 @@
#current-slide {
position: absolute;
width: 65%;
height: 100%;
width: 50%;
height: 50%;
top: 0;
left: 0;
padding-right: 0;
@ -47,20 +47,19 @@
#upcoming-slide {
position: absolute;
width: 35%;
height: 40%;
width: 50%;
height: 50%;
right: 0;
top: 0;
}
#speaker-controls {
position: absolute;
top: 40%;
right: 0;
width: 35%;
height: 60%;
top: 50%;
left: 0;
width: 100%;
height: 50%;
overflow: auto;
font-size: 18px;
}