Commit 74bc4ccaa40b558fa484f598f04b29f480ff8148
1 parent
625645f9
Exists in
master
and in
2 other branches
Adjusting participants list in subject view page
Showing
2 changed files
with
13 additions
and
7 deletions
Show diff stats
amadeus/static/css/base/amadeus.css
1 | +body { | ||
2 | + overflow-x: hidden; | ||
3 | +} | ||
4 | + | ||
1 | ul, li { | 5 | ul, li { |
2 | list-style-type: none; | 6 | list-style-type: none; |
3 | text-decoration: none; | 7 | text-decoration: none; |
@@ -1557,7 +1561,8 @@ div.dataTables_wrapper div.dataTables_paginate { | @@ -1557,7 +1561,8 @@ div.dataTables_wrapper div.dataTables_paginate { | ||
1557 | position: absolute; | 1561 | position: absolute; |
1558 | top: 5px; | 1562 | top: 5px; |
1559 | right: -315px; | 1563 | right: -315px; |
1560 | - overflow-y: auto | 1564 | + overflow-y: auto; |
1565 | + opacity: 0; | ||
1561 | } | 1566 | } |
1562 | 1567 | ||
1563 | #participants { | 1568 | #participants { |
@@ -1579,12 +1584,11 @@ div.dataTables_wrapper div.dataTables_paginate { | @@ -1579,12 +1584,11 @@ div.dataTables_wrapper div.dataTables_paginate { | ||
1579 | 1584 | ||
1580 | position: absolute; | 1585 | position: absolute; |
1581 | top: -25px; | 1586 | top: -25px; |
1582 | - right: -25px; | 1587 | + right: -20px; |
1583 | cursor: pointer; | 1588 | cursor: pointer; |
1584 | padding: 5px; | 1589 | padding: 5px; |
1585 | border-top-left-radius: 5px; | 1590 | border-top-left-radius: 5px; |
1586 | border-top-right-radius: 5px; | 1591 | border-top-right-radius: 5px; |
1587 | - | ||
1588 | } | 1592 | } |
1589 | 1593 | ||
1590 | #participants.open { | 1594 | #participants.open { |
subjects/templates/subjects/view.html
@@ -73,7 +73,7 @@ | @@ -73,7 +73,7 @@ | ||
73 | </div> | 73 | </div> |
74 | </div> | 74 | </div> |
75 | </div> | 75 | </div> |
76 | - <div id="{{subject.slug}}" class="panel-collapse in collapse category-panel-content" style="overflow:hidden;position: relative"> | 76 | + <div id="{{subject.slug}}" class="panel-collapse in collapse category-panel-content" style="position: relative"> |
77 | <p>{{subject.description|safe}}</p> | 77 | <p>{{subject.description|safe}}</p> |
78 | 78 | ||
79 | {% if has_subject_permissions %} | 79 | {% if has_subject_permissions %} |
@@ -190,11 +190,12 @@ | @@ -190,11 +190,12 @@ | ||
190 | 190 | ||
191 | if ($this.hasClass('open')) { | 191 | if ($this.hasClass('open')) { |
192 | $this.animate({ | 192 | $this.animate({ |
193 | - right : '-25px' | 193 | + right : '-20px' |
194 | }, 500); | 194 | }, 500); |
195 | 195 | ||
196 | list.animate({ | 196 | list.animate({ |
197 | - right : '-315px' | 197 | + right : '-315px', |
198 | + opacity: 0 | ||
198 | }, 500); | 199 | }, 500); |
199 | 200 | ||
200 | $this.removeClass('open'); | 201 | $this.removeClass('open'); |
@@ -204,7 +205,8 @@ | @@ -204,7 +205,8 @@ | ||
204 | }, 500).addClass('open'); | 205 | }, 500).addClass('open'); |
205 | 206 | ||
206 | list.animate({ | 207 | list.animate({ |
207 | - right : 0 | 208 | + right : 0, |
209 | + opacity: 1 | ||
208 | }, 500); | 210 | }, 500); |
209 | } | 211 | } |
210 | }); | 212 | }); |