Summit

Merge lp:~daker/summit/track-tooltip into lp:summit

  1. track-tooltip
  2. Merge into trunk
Proposed by Adnane Belmadiaf on 2012-04-22
Status: Merged
Approved by: Michael Hall on 2012-04-22
Approved revision: 358
Merged at revision: 360
Proposed branch: lp:~daker/summit/track-tooltip
Merge into: lp:summit
Diff against target: 91 lines (+29/-7)
4 files modified
summit/media/css/site.css (+26/-7)
summit/schedule/templates/schedule/by_room.html (+1/-0)
summit/schedule/templates/schedule/by_track.html (+1/-0)
summit/schedule/templates/schedule/daily.html (+1/-0)
To merge this branch: bzr merge lp:~daker/summit/track-tooltip
Reviewer Review Type Date Requested Status
Michael Hall (community) 2012-04-22 Approve on 2012-04-22
Review via email: mp+102991@code.launchpad.net

Commit Message

Added nice css to the meeting details tooltips

To post a comment you must log in.
lp:~daker/summit/track-tooltip updated on 2012-04-22
358. By Adnane Belmadiaf on 2012-04-22

Added the tooltip to the room & daily view

Michael Hall (mhall119) wrote :

Looks nice

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/media/css/site.css'
2--- summit/media/css/site.css 2012-04-11 14:59:23 +0000
3+++ summit/media/css/site.css 2012-04-22 00:42:20 +0000
4@@ -19,25 +19,44 @@
5
6 div.agenda-details {
7 display: none;
8- padding: 5px;
9 position: absolute;
10- margin-left: 20px;
11 font-size: 0.9em;
12- color: #FFFFFF;
13- background-color: #101010;
14- border: #000000 1px solid;
15+ color: #fff;
16 border-radius: 5px;
17 min-width: 200px;
18 max-width: 500px;
19 z-index: 100;
20-}
21+ padding: 10px;
22+ background: #101010;
23+ border-radius: 4px;
24+ -moz-border-radius: 4px;
25+ -webkit-border-radius: 4px;
26+ margin-top: 5px;
27+}
28+
29+div.agenda-details .arrow {
30+ border-color: transparent transparent #101010 transparent;
31+ border-style: solid;
32+ border-width: 5px;
33+ height: 0;
34+ width: 0;
35+ position: absolute;
36+ top: -10px;
37+ left: 17px;
38+}
39+
40
41 div.meeting-description {
42 white-space: pre-wrap;
43 }
44
45-div.agenda-details LI {
46+div.agenda-details ul {
47+ margin-bottom: 0;
48+}
49+
50+div.agenda-details ul li {
51 font-size: 1.0em;
52+ margin-bottom: 10px;
53 }
54
55 div.schedule-head {
56
57=== modified file 'summit/schedule/templates/schedule/by_room.html'
58--- summit/schedule/templates/schedule/by_room.html 2012-04-16 13:32:10 +0000
59+++ summit/schedule/templates/schedule/by_room.html 2012-04-22 00:42:20 +0000
60@@ -50,6 +50,7 @@
61 {% endfor %})</span>
62 {% endif %}
63 <div id="agenda-{{agenda.id}}-{{slot.id}}-details" class="agenda-details">
64+ <div class="arrow"></div>
65 <div class="meeting-description">{{agenda.meeting.description}}</div>
66 {% if agenda.meeting.participant_set.count %}
67 <br /><b>Participants:</b>
68
69=== modified file 'summit/schedule/templates/schedule/by_track.html'
70--- summit/schedule/templates/schedule/by_track.html 2012-04-16 13:32:10 +0000
71+++ summit/schedule/templates/schedule/by_track.html 2012-04-22 00:42:20 +0000
72@@ -42,6 +42,7 @@
73 {{agenda.meeting.title}}
74 </a>
75 <div id="agenda-{{agenda.id}}-{{slot.id}}-details" class="agenda-details">
76+ <div class="arrow"></div>
77 <div class="meeting-description">{{agenda.meeting.description}}</div>
78 {% if agenda.meeting.participant_set.count %}
79 <br /><b>Participants:</b>
80
81=== modified file 'summit/schedule/templates/schedule/daily.html'
82--- summit/schedule/templates/schedule/daily.html 2012-04-15 02:34:02 +0000
83+++ summit/schedule/templates/schedule/daily.html 2012-04-22 00:42:20 +0000
84@@ -63,6 +63,7 @@
85 {% endfor %})</span>
86 {% endif %}
87 <div id="agenda-{{agenda.id}}-{{slot.id}}-details" class="agenda-details">
88+ <div class="arrow"></div>
89 <div class="meeting-description">{{agenda.meeting.description}}</div>
90 {% if agenda.meeting.participant_set.count %}
91 <br /><b>Participants:</b>

Subscribers

People subscribed via source and target branches