Skip to content

Commit a543cff

Browse files
author
Jean-François Pineau
committed
modification du css
1 parent 22c5c4d commit a543cff

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

app/views/my_card/index.html.erb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,13 @@
7373
</form>
7474

7575
<div class="ticket ticket-modele">
76-
<div class="line">
76+
<div class="line histoire">
7777
Histoire : <a href="#" class="parent"></a>
7878
</div>
7979
<a href="#" class="id"></a>
80+
<div class="line estimation">
81+
Estimation: <span class="estimation"></span>
82+
</div>
8083
<span class="subject"></span>
8184
<div class="line custom-field anomalie">
8285
Type anomalie: <span></span>
@@ -87,9 +90,6 @@
8790
<div class="block custom-field finish">
8891
Condition d'acceptation: <span></span>
8992
</div>
90-
<div class="line">
91-
Estimation: <span class="estimation"></span>
92-
</div>
9393

9494
</div>
9595

assets/javascripts/card.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
jQuery('.id',ticketCard).html(issue.id).attr('href',relativeUrl+'/issues/'+issue.id);
163163
//jQuery('.project',ticketCard).html(issue.project.name).attr('href',relativeUrl+'/projects/'+issue.project.name+'/issues');
164164
if (issue.parent) {
165-
jQuery('.parent',ticketCard).html(issue.parent).attr('href',relativeUrl+'/issues/'+issue.parent.id);
165+
jQuery('.parent',ticketCard).html(issue.parent.id).attr('href',relativeUrl+'/issues/'+issue.parent.id);
166166
} else {
167167
jQuery('.parent').hide();
168168
}
@@ -178,7 +178,7 @@
178178
if(issue.custom_fields){
179179
for (var i=0;i<issue.custom_fields.length;i++){
180180
if(issue.custom_fields[i].name== "Type d'anomalie"){
181-
jQuery('.anomalie span',ticketCard).html(issue.custom_fields[i].value);
181+
jQuery('.anomalie span',ticketCard).html(issue.custom_fields[i].value[0]);
182182
jQuery('.anomalie').show();
183183
}
184184
if(issue.custom_fields[i].name=="Conditions de d\u00e9part"){

assets/stylesheets/card.css

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
.ticket .id{
3838
float:right;
39-
font-size:30px;
39+
font-size:25px;
4040
padding-top:3px;
4141
height:30px;
4242
}
@@ -49,6 +49,14 @@
4949
font-weight:bold;
5050
}
5151

52+
.ticket .histoire {
53+
float: left;
54+
}
55+
56+
.ticket .estimation {
57+
float: right;
58+
}
59+
5260
.ticket .line{
5361
display:block;
5462
margin-top:5px;
@@ -68,7 +76,8 @@
6876
display:block;
6977
border: solid 1px black;
7078
width: 100%;
71-
margin:5px;
79+
height: 50px;
80+
padding:5px 0 5px 5px;
7281
}
7382

7483

0 commit comments

Comments
 (0)