Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
framadate
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nounous
framadate
Commits
d14a7ec3
Commit
d14a7ec3
authored
9 years ago
by
Olivier PEREZ
Browse files
Options
Downloads
Patches
Plain Diff
Some style on poll info
parent
45d14044
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
css/style.css
+10
-6
10 additions, 6 deletions
css/style.css
tpl/part/poll_info.tpl
+6
-6
6 additions, 6 deletions
tpl/part/poll_info.tpl
with
16 additions
and
12 deletions
css/style.css
+
10
−
6
View file @
d14a7ec3
...
...
@@ -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
:
0
px
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
:
0
px
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
:
0
px
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
:
0
px
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
0
px
;
margin
:
10px
0
;
}
#md-a-imgModalLabel
{
...
...
This diff is collapsed.
Click to expand it.
tpl/part/poll_info.tpl
+
6
−
6
View file @
d14a7ec3
...
...
@@ -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
>
<p
re
class=
"form-control-static well
poll-description
"
>
{
$poll
->
description
|
html
}
</p
re
>
{
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"
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment