From d14a7ec35dc6dd799d4f11a3cbf09b0c83ec82aa Mon Sep 17 00:00:00 2001
From: Olivier PEREZ <olivier@olivierperez.fr>
Date: Tue, 14 Apr 2015 22:43:04 +0200
Subject: [PATCH] Some style on poll info
---
css/style.css | 16 ++++++++++------
tpl/part/poll_info.tpl | 12 ++++++------
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/css/style.css b/css/style.css
index 0251ee42..718ebea3 100644
--- a/css/style.css
+++ b/css/style.css
@@ -120,7 +120,11 @@ header .lead {
.jumbotron h3, .jumbotron .js-title {
margin-bottom:20px;
- margin-top:0px;
+ margin-top:0;
+}
+
+.poll-description {
+ font-family: inherit;
}
h4.control-label {
@@ -166,7 +170,7 @@ caption {
#name-form:hover .btn-edit {
position:relative !important;
left:0;
- padding: 0px 10px;
+ padding: 0 10px;
}
.js-desc textarea {
@@ -325,21 +329,21 @@ table.results .btn-link.btn-sm {
color: #fff;
background-color: #768745;
border-color: #67753C;
- box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.125) inset;
+ box-shadow: 0 3px 5px rgba(0, 0, 0, 0.125) inset;
}
.ifneedbe input[type="radio"]:checked + label { /* =.btn-warning.active */
color: #fff;
background-color: #CF9800;
border-color: #BD8A00;
- box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.125) inset;
+ box-shadow: 0 3px 5px rgba(0, 0, 0, 0.125) inset;
}
.no input[type="radio"]:checked + label { /* =.btn-danger.active */
color: #fff;
background-color: #BF2511;
border-color: #AD220F;
- box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.125) inset;
+ box-shadow: 0 3px 5px rgba(0, 0, 0, 0.125) inset;
}
/* create_date_poll.php */
@@ -374,7 +378,7 @@ table.results .btn-link.btn-sm {
}
#md-a-imgModal .form-group {
- margin:10px 0px;
+ margin:10px 0;
}
#md-a-imgModalLabel {
diff --git a/tpl/part/poll_info.tpl b/tpl/part/poll_info.tpl
index cc81e531..42f24977 100644
--- a/tpl/part/poll_info.tpl
+++ b/tpl/part/poll_info.tpl
@@ -37,9 +37,9 @@
</div>
</div>
<div class="row"> {* Admin name + email | Description *}
- <div class="form-group col-md-5">
+ <div class="form-group col-md-4">
<div id="name-form">
- <h4 class="control-label">{__('PollInfo', 'Initiator of the poll')}</h4>
+ <label class="control-label">{__('PollInfo', 'Initiator of the poll')}</label>
<p class="form-control-static">{$poll->admin_name|html}{if $admin && !$expired} <button class="btn btn-link btn-sm btn-edit" title="{__('PollInfo', 'Edit the name')}"><span class="glyphicon glyphicon-pencil"></span><span class="sr-only">{__('Generic', 'Edit')}</span></button>{/if}</p>
{if $admin && !$expired}
<div class="hidden js-name">
@@ -72,9 +72,9 @@
</div>
{/if}
</div>
- <div class="form-group col-md-7" id="description-form">
- <h4 class="control-label">{__('Generic', 'Description')}{if $admin && !$expired} <button class="btn btn-link btn-sm btn-edit" title="{__('PollInfo', 'Edit the description')}"><span class="glyphicon glyphicon-pencil"></span><span class="sr-only">{__('Generic', 'Edit')}</span></button>{/if}</h4>
- <p class="form-control-static well">{$poll->description|html}</p>
+ <div class="form-group col-md-8" id="description-form">
+ <label class="control-label">{__('Generic', 'Description')}{if $admin && !$expired} <button class="btn btn-link btn-sm btn-edit" title="{__('PollInfo', 'Edit the description')}"><span class="glyphicon glyphicon-pencil"></span><span class="sr-only">{__('Generic', 'Edit')}</span></button>{/if}</label>
+ <pre class="form-control-static well poll-description">{$poll->description|html}</pre>
{if $admin && !$expired}
<div class="hidden js-desc text-right">
<label class="sr-only" for="newdescription">{__('Generic', 'Description')}</label>
@@ -99,7 +99,7 @@
<input class="form-control" id="admin-link" type="text" readonly="readonly" value="{poll_url id=$admin_poll_id admin=true}" />
</div>
<div id="expiration-form" class="form-group col-md-4">
- <h4 class="control-label">{__('PollInfo', 'Expiration date')}</h4>
+ <label class="control-label">{__('PollInfo', 'Expiration date')}</label>
<p>{$poll->end_date|date_format:$date_format['txt_date']|html}{if !$expired} <button class="btn btn-link btn-sm btn-edit" title="{__('PollInfo', 'Edit the expiration date')}"><span class="glyphicon glyphicon-pencil"></span><span class="sr-only">{__('Generic', 'Edit')}</span></button>{/if}</p>
{if !$expired}
<div class="hidden js-expiration">
--
GitLab