From 8f05ada6a1ac47bcc02f74b5f5832ad13dafa496 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Tue, 5 Feb 2013 17:05:40 +0100 Subject: [PATCH] template style and new icons --- .../projector/templates/base-projector.html | 2 +- .../templates/projector/overlay_widget.html | 6 +++--- openslides/static/img/glyphicons_041_charts.png | Bin 0 -> 1029 bytes .../static/img/glyphicons_041_charts_white.png | Bin 0 -> 1059 bytes .../static/img/glyphicons_056_projector.png | Bin 452 -> 0 bytes .../img/glyphicons_056_projector_small.png | Bin 341 -> 0 bytes .../static/img/glyphicons_152_check_white.png | Bin 0 -> 333 bytes openslides/static/styles/base.css | 16 ++++++++++++---- 8 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 openslides/static/img/glyphicons_041_charts.png create mode 100644 openslides/static/img/glyphicons_041_charts_white.png delete mode 100644 openslides/static/img/glyphicons_056_projector.png delete mode 100644 openslides/static/img/glyphicons_056_projector_small.png create mode 100644 openslides/static/img/glyphicons_152_check_white.png diff --git a/openslides/projector/templates/base-projector.html b/openslides/projector/templates/base-projector.html index e86cd52d6..b291d2419 100644 --- a/openslides/projector/templates/base-projector.html +++ b/openslides/projector/templates/base-projector.html @@ -10,7 +10,7 @@ - XX{% block title %} {% get_config 'event_name' %} {% endblock %} + {% block title %} {% get_config 'event_name' %} {% endblock %} {% block header %} {% endblock %} diff --git a/openslides/projector/templates/projector/overlay_widget.html b/openslides/projector/templates/projector/overlay_widget.html index 415590221..d904021f7 100644 --- a/openslides/projector/templates/projector/overlay_widget.html +++ b/openslides/projector/templates/projector/overlay_widget.html @@ -6,15 +6,15 @@
  • - + - + {# TODO: Call the html via overlay.html #} diff --git a/openslides/static/img/glyphicons_041_charts.png b/openslides/static/img/glyphicons_041_charts.png new file mode 100644 index 0000000000000000000000000000000000000000..556b7cce5a2ee6dab0952153470c028fdfc44424 GIT binary patch literal 1029 zcmV+g1p51lP)4Tx04R}-l+Q~PVHn51vyB)iL11Qkh@nGBs7w}RMCGo(*tBg~f0Po$?CiU{ zle4qa%26U(f|ru*d1uDm5$(qdGxK?$AK&MB z-{F0M8d)(-JtP5n!?BWmQR({Vm{j`_Asj&+!l+YJ+l(X<1E9fUv1@F;hrqupt$X|b zI_lE4ng@jaKh%lTb}(f=ak3uu6-!kMZ8FSKs7BM z|C+c%%_(W1MkH>@24YeH&g(_h@8=*r^~@L^r0;R+=`OQ-d=_TXN_RhT8}a8f>+a#2 z#Pb=gH%8n{&sxUn9rjo_p*gW3k3%Dd9v|?z$wwEp4JbjhwM#!rpOV)g4O?IHuKzA8qHe6NWHQ4?5 zW?+>pP^lFuS83d>RC0Yby(58Yf7(5YU7B8Os@7T+7jCT7FHP^*tHQ2TvC67;&Z}|3 zd?p?hPl_?ILp%pbyd-vt7sYOxofiix8N;NaVZv3ip-`5AN%ERI{+SmG@2t6_p^q8N z(o~6`|AbY@XgUiV(SNxAbMSk`qp>3J!UhhXuG%(|?j0gDE>~^N72v`*x)0t~ZOwEZ z4m|-D&ZtGJ}8;WLk96sqPn3I;4%{fxLET5GkbR{t#`+_*~}`j zbQ|o>r&YYHREPJ%uUkhq zH(cWcXHBtMf9UBp4b94Tx0C?Jslgn!qSrmuA>fE4^APlsxUJRF6NRT9y4>Te^(n)Nhv2DsklORZ^ z`gV7jo9dcd)o~ON$;PG5FnjT_aN!@|!i6i{C=q-ihL_x=1& zqpK9Ub6~B6)ccYOUFi4>)GCux(;zgEJ{biOh;u;N#QOh0dM4)UK-!EuLm+MetK7gu zAnpMJZnao~P66~*5;Zdkp3`-=InN(JxAG?r0~;W9R)r%?wiZgo;R8TFSg%TIcm(JL z>w4MSHwyFs&&y`tM9kJkFB%<>Id#O>`LQOi^Jnshnw}zvvd)r!IDdF#Nk38CUjQ;- zIkU9`4zLDNdrw!#kH&22)77DTlOLJ7GXeYsscV5QjK#C1?l6T$;o+n3kvQbY(no-y zMi~zejYkfJkHX*)GW*?1O(DUO953;CiNWJ<>L?@*N66+`=xsSj`>FlLer#X1ui39J zX6ild%z`=Yxr-OxQ9xl@zRhfNrr6)5#vmF^1;t!zr!X;TV!E<_G1GQ(7cab1=kp&E zTdG8-K4wsa%wq7EN1+K(3?{n$==K!)?wMQb+Pxl&o5vn@-#xSJu4>({vqfgs^sNTl?T(0oIzuwiX?PU2mb|L0jv|!0JnI zbDLW?^G$2Zx(|{1CjuC%1*eQxsYY_MZEu%@L7jf;r5O8yZM^KQdxr#Qp{%Z#^pPX17f9yFZe07pf#Tz_5D76pUwrvjU?b9Xqy zK5p?fa=5{oF1ub}jy=5P=c>}aDtO;w2ag$CVwQYX@D5wWp>~^yc)@l~?(<`U@1p1@ dCr)$X>o2)af)S~ec`yI~002ovPDHLkV1gBa=ZydW literal 0 HcmV?d00001 diff --git a/openslides/static/img/glyphicons_056_projector.png b/openslides/static/img/glyphicons_056_projector.png deleted file mode 100644 index 4d644db309dd23ba8d0d6d6e08aaf312c40f8953..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 452 zcmV;#0XzPQP)X1^@s6BEU{300009a7bBm000XU z000XU0RWnu7ytkPc1c7*R7i=%mA_KLKoEz&bu7|hNl9y$(oXHH9Nxgt`3@Gq8~6zL z0*>PgK#3J}wv={aN4FNY7cVD6$OZ8?b92e*dp}$|O(Ci3QbaryRbB3Yy;STiYnB7|KxX$nn=@O_<2_;yM^mGeipa<=H^4+y zKSX2*6hJRB3-j*Kzd4n4zK`p$5;TJXdlCxP5X=~a0gu4JdNzbvWB+MMiW&X zh)5sTL>pjk;KDnpszAGQ2ryICfnEF7&wwl737Ewj+D2FaUk1AYx`AyCd;$~ri7@Qa zci{iGS^aN!90000}Rl8<3oNC%zs?u_bxCyDx`7I;J! zGca%qgD@k*tT_@uLG}_)Usv|KjI1K+W@)nmnt?)(JY5_^G|u;4IIZ~yjd z`~Iyjr`at#bkFl2>x*7bnTHl{URqq=_)OlY`)G@~)Z*2TZMH3bZTjj0ss^>$4_mpS7;*N)6E=j(5 zsCF$VajUQ2=Jk`d924>@5dXeBD4|z8W~<>&kwYiIvNmHBWU0Narn27sn8d^SzT6`Z+s_xSV(LG>A~K z|KQ}2&{*t9CQ%Vn`a%K`%qk^2G7M;>#0s$~?NI%6BxM+Np`^P4(PT4(2&8CR#5 z6_p3_U*-S(TF#+1DEw7j&~*oHpGMod@aaKOE6yK?ESTSt?Cif%KeVY`N5=hd=7U7V zD(-dNf7Rqyn7s;oY84c({m#lHI?^Jf{Ob34jImdKo?hXZ+x)w4sa5dytCOQDVrFhV z>ihhl?$z5-H~tu&+-ap*uskl+hQaK>;#v0%8RHMAZdfeGu=qvnv~&M|TCOTjT_j&p Wm&)xYrI8NwC4;A{pUXO@geCy>4Se+g literal 0 HcmV?d00001 diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css index c0b3d3cc5..c40f7dc8b 100644 --- a/openslides/static/styles/base.css +++ b/openslides/static/styles/base.css @@ -233,14 +233,17 @@ legend + .control-group { background-image: url("../img/glyphicons_045_calendar.png"); } .leftmenu ul li.active a span.ico i.icon-agenda { - background-position: 0; background-image: url("../img/glyphicons_045_calendar_white.png"); } .icon-motion, .icon-motions { background-position: -24px -24px; } .icon-assignment, .icon-assignments { - background-position: -144px -72px; + background-image: url("../img/glyphicons_041_charts.png"); + background-position: 0; +} +.leftmenu ul li.active a span.ico i.icon-assignment { + background-image: url("../img/glyphicons_041_charts_white.png"); } .icon-participant, .icon-participants { background-position: -168px 0; @@ -260,14 +263,19 @@ legend + .control-group { .icon-custom_slide { background-position: -120px 0px; } - - +.icon-personal_info { + background-position: -312px -24px; +} /** More glyphicons free icons **/ .status_link .icon-on, .icon-checked-new { background-image: url("../img/glyphicons_152_check.png"); background-position: 0; } +.icon-checked-new_white { + background-image: url("../img/glyphicons_152_check_white.png"); + background-position: 0; +} .status_link .icon-off, .icon-unchecked-new { background-image: url("../img/glyphicons_153_unchecked.png"); background-position: 0;