From ea9c3f5b669bfbf0a7be6ac5e8004e54ee9de0e6 Mon Sep 17 00:00:00 2001 From: Adrien Dorsaz Date: Thu, 8 Aug 2013 18:49:28 +0200 Subject: Make design responsive --- papillon/static/styles.css | 58 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 54 insertions(+), 4 deletions(-) (limited to 'papillon/static') diff --git a/papillon/static/styles.css b/papillon/static/styles.css index c918596..e337060 100644 --- a/papillon/static/styles.css +++ b/papillon/static/styles.css @@ -17,6 +17,22 @@ along with this program. If not, see . See the file COPYING for details. */ +@media only screen and (max-width: 600px){ + #main{ + width:100% !important; + background:white !important; + border:0px !important; + } + + .new_poll{ + width:100% !important; + } + .new_poll *{ + padding:0 !important; + margin:0!important; + } +} + /* colors */ body, #poll th, .highlight{ @@ -123,10 +139,11 @@ border:0; #main{ background-color:white; border:1px solid; -margin:20px; +margin:auto; background-image: url(bg.jpg); background-repeat:no-repeat; background-position:95% 10%; +width: 80%; } #header{ @@ -158,10 +175,43 @@ color:blue; } .new_poll{ -width:600px; + width:200px; + margin:auto; + padding:0; +} + +.help_button{ + float:right; + color:white; + background:green; + width:15px; + height:15px; + border-radius:25px; + text-align:center; } -.new_poll input{ +.new_poll .field_label{ + clear:both; + font-size:1.5em; + width:100%; + float:none; + margin-top:10px; +} + +.new_poll div, .new_poll input, .new_poll textarea{ + width:100%; +} + +.new_poll div { + float:left; +} + +.errorlist{ + color:red; + background-color:rgb(255,200,200); +} + +/*.new_poll input{ width:160px; } @@ -176,7 +226,7 @@ width:20px; .new_poll textarea{ width:160px; height:100px; -} +}*/ .datetime a img{ border:0; -- cgit v1.2.3 From 8d44f2e647a148df237bba2c28092f7f085770d8 Mon Sep 17 00:00:00 2001 From: Adrien Dorsaz Date: Thu, 8 Aug 2013 23:32:48 +0200 Subject: Adjust size of new_poll form for big screen (>600 px) --- papillon/static/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'papillon/static') diff --git a/papillon/static/styles.css b/papillon/static/styles.css index e337060..07260f8 100644 --- a/papillon/static/styles.css +++ b/papillon/static/styles.css @@ -175,7 +175,7 @@ color:blue; } .new_poll{ - width:200px; + width:400px; margin:auto; padding:0; } -- cgit v1.2.3 From 036730a335e4a4804a2e1274a8b3eb76c7c2b8b6 Mon Sep 17 00:00:00 2001 From: Adrien Dorsaz Date: Fri, 9 Aug 2013 00:30:36 +0200 Subject: Update design for choice administration --- papillon/static/styles.css | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) (limited to 'papillon/static') diff --git a/papillon/static/styles.css b/papillon/static/styles.css index 07260f8..93f82a8 100644 --- a/papillon/static/styles.css +++ b/papillon/static/styles.css @@ -190,44 +190,33 @@ color:blue; text-align:center; } -.new_poll .field_label{ +.field_label{ clear:both; font-size:1.5em; width:100%; - float:none; + float:none !important; margin-top:10px; } -.new_poll div, .new_poll input, .new_poll textarea{ +.new_poll table form tr { + margin:5px 0px !important; + padding:0px; +} + +.new_poll div, .new_poll input, .new_poll textarea, .new_poll table{ width:100%; + margin:5px 0px; } .new_poll div { float:left; } -.errorlist{ +.errorlist, .error{ color:red; background-color:rgb(255,200,200); } -/*.new_poll input{ -width:160px; -} - -.new_poll .submit{ -width:auto; -} - -.new_poll input.limit{ -width:20px; -} - -.new_poll textarea{ -width:160px; -height:100px; -}*/ - .datetime a img{ border:0; } -- cgit v1.2.3 From 525fdda2aaae3adc8534ebda777dedddb17ef25f Mon Sep 17 00:00:00 2001 From: Adrien Dorsaz Date: Fri, 9 Aug 2013 01:38:50 +0200 Subject: Remove unused design and fix some labels --- papillon/static/styles.css | 22 +++------------------- papillon/templates/editChoices.html | 2 +- papillon/templates/editChoicesAdmin.html | 2 +- 3 files changed, 5 insertions(+), 21 deletions(-) (limited to 'papillon/static') diff --git a/papillon/static/styles.css b/papillon/static/styles.css index 93f82a8..1b8ae7d 100644 --- a/papillon/static/styles.css +++ b/papillon/static/styles.css @@ -256,6 +256,7 @@ float:left; #poll{ text-align:center; +margin:auto; } #poll a{ @@ -313,7 +314,7 @@ color:white; } .footnote{ -font-size:10px; +font-size:0.9em; padding:10px; } @@ -334,7 +335,7 @@ padding:2px; } -.comments ul{ +ul.comments{ list-style-type:None; margin:4px; padding:0; @@ -351,23 +352,6 @@ margin:0; padding:0; } -.comments input{ -width:160px; -} - -.comments textarea{ -width:160px; -height:100px; -} - -.comments #tdsubmit{ -text-align:center; -} - -.comments .submit{ -width:auto; -} - /* CALENDARS & CLOCKS IMPORTED FROM ADMIN */ diff --git a/papillon/templates/editChoices.html b/papillon/templates/editChoices.html index 84b2d45..9146e27 100644 --- a/papillon/templates/editChoices.html +++ b/papillon/templates/editChoices.html @@ -10,7 +10,7 @@ {{form_new_choice.poll}} {{form_new_choice.order}} - {%trans "Choice name:"%}
+ {%trans "Choice value:"%}
{{form_new_choice.name}} {%trans "Max number of votes (optional):"%}
{{form_new_choice.limit}}
diff --git a/papillon/templates/editChoicesAdmin.html b/papillon/templates/editChoicesAdmin.html index 3ded310..0a8c611 100644 --- a/papillon/templates/editChoicesAdmin.html +++ b/papillon/templates/editChoicesAdmin.html @@ -28,7 +28,7 @@ {%if not poll.dated_choices%}{%endif%} - + -- cgit v1.2.3
{% trans "Position" %}{% trans "Name" %}{% trans "Value" %} {% trans "Max votes" %} {% trans "Delete?"%} ?