ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#168: Improved countdown control buttons.

Browse Source
This commit is contained in:
Emanuel Schuetze 2012-05-20 22:01:44 +02:00
parent 760bb415ae
commit 5581ed1222
6 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
openslides/projector/static/images/icons/pause.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 721 B

After

Width:  |  Height:  |  Size: 484 B

BIN
openslides/projector/static/images/icons/play.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 736 B

After

Width:  |  Height:  |  Size: 501 B

BIN
openslides/projector/static/images/icons/skip-backward.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 753 B

After

Width:  |  Height:  |  Size: 511 B

16
openslides/projector/static/styles/projector-control.css
View File

@ -40,7 +40,7 @@
/*.projector_countdown_spinval {*/
#countdown_time {
width: 40px;
width: 22px;
height: 16px;
}
@ -63,25 +63,23 @@
left: 35px;
}
.projector_countdown_btn {
margin-top: auto;
.projector_countdown_btn img {
padding-top: 8px;
position: absolute;
}
/* countdown control buttons */
.play{
background:url(../images/icons/play.png) no-repeat 0px 0px;
text-indent:22px !important;
height: 22px !important;
text-indent: 14px !important;
}
.pause{
background:url(../images/icons/pause.png) no-repeat 0px 0px;
text-indent:22px !important;
height: 22px !important;
text-indent: 14px !important;
}
.backward{
background:url(../images/icons/skip-backward.png) no-repeat 0px 0px;
text-indent:22px !important;
height: 22px !important;
text-indent: 14px !important;
}
/* iframe */

2
openslides/projector/templates/projector/control.html
View File

@ -203,7 +203,7 @@
<a id="countdown_set" class="projector_countdown_btn" href="{% url countdown_set_default %}" title="{% trans 'Save as default' %}">
<img src="{% static 'images/icons/document-save.png' %}" />
</a>
&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<a class="projector_countdown_btn" href="{% url countdown_reset %}" title="{% trans 'Reset countdown' %}" onclick="javascript:switchButtons('play')"><button
type="submit" class="button" style="padding:4px;" name='message-clean'>
<span class="icon backward">&nbsp;</span>

4
openslides/static/styles/base.css
View File

@ -288,7 +288,7 @@ label {
display:block;
padding:5px 0;
}
input[type="text"], input[type="email"], input[type="password"], textarea, select {
input[type="text"], input[type="email"], input[type="password"], input[type="number"], textarea, select {
background:none repeat scroll 0 0 #F7F7F7;
border:1px solid #CCCCCC;
outline:medium none;
@ -297,7 +297,7 @@ input[type="text"], input[type="email"], input[type="password"], textarea, selec
width: 400px;
size:800px;
}
input[type="text"], input[type="email"], input[type="password"] {
input[type="text"], input[type="email"], input[type="password"], input[type="number"] {
height:17px;
}
textarea {