Download as
Browse Code »

Commit ad562111de154328ac9281713e21c182bf2731f3

Authored by Zambom
1 parent ea63422e
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

Resolving responsive errors

Showing 3 changed files with 17 additions and 16 deletions   Show diff stats
amadeus/static/js/topics.js
  Diff comments   View file @ad56211
1 -$('.collapse').on('show.bs.collapse', function (e) { 1 +$('.topic-panel').on('show.bs.collapse', function (e) {
2 if($(this).is(e.target)){ 2 if($(this).is(e.target)){
3 var btn = $(this).parent().find('.fa-angle-right'); 3 var btn = $(this).parent().find('.fa-angle-right');
4 4
@@ -11,7 +11,7 @@ $('.collapse').on('show.bs.collapse', function (e) { @@ -11,7 +11,7 @@ $('.collapse').on('show.bs.collapse', function (e) {
11 }); 11 });
12 12
13 // Update breadcrumb with topic's name 13 // Update breadcrumb with topic's name
14 -$('.collapse').on('shown.bs.collapse', function (e) { 14 +$('.topic-panel').on('shown.bs.collapse', function (e) {
15 if($(this).is(e.target)){ 15 if($(this).is(e.target)){
16 var li = $(".breadcrumb").find('li:last-child'); 16 var li = $(".breadcrumb").find('li:last-child');
17 var li_text = $(li).html(); 17 var li_text = $(li).html();
@@ -28,7 +28,7 @@ $('.collapse').on('shown.bs.collapse', function (e) { @@ -28,7 +28,7 @@ $('.collapse').on('shown.bs.collapse', function (e) {
28 }); 28 });
29 29
30 // Reset breadcrumb to it's normal state 30 // Reset breadcrumb to it's normal state
31 -$('.collapse').on('hide.bs.collapse', function (e) { 31 +$('.topic-panel').on('hide.bs.collapse', function (e) {
32 if($(this).is(e.target)){ 32 if($(this).is(e.target)){
33 var btn = $(this).parent().find('.fa-angle-down'); 33 var btn = $(this).parent().find('.fa-angle-down');
34 34
topics/templates/topics/list.html
  Diff comments   View file @ad56211
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 </div> 34 </div>
35 </div> 35 </div>
36 </div> 36 </div>
37 - <div id="{{topic.slug}}" class="panel-collapse collapse category-panel-content"> 37 + <div id="{{topic.slug}}" class="panel-collapse collapse category-panel-content topic-panel">
38 <input type="hidden" class="id_inp" name="id" value="{{ topic.id }}" /> 38 <input type="hidden" class="id_inp" name="id" value="{{ topic.id }}" />
39 <input type="hidden" class="order_inp" name="order" value="{{ topic.order }}" /> 39 <input type="hidden" class="order_inp" name="order" value="{{ topic.order }}" />
40 40
webpage/templates/webpages/view.html
  Diff comments   View file @ad56211
@@ -34,21 +34,22 @@ @@ -34,21 +34,22 @@
34 <div class="panel panel-info topic-panel-invisible"> 34 <div class="panel panel-info topic-panel-invisible">
35 <div class="panel-heading panel-invisible"> 35 <div class="panel-heading panel-invisible">
36 {% endif %} 36 {% endif %}
37 - <div class="row">  
38 - <div class="col-md-12 category-header">  
39 - <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px">  
40 - <span>{{ webpage }}</span>  
41 - </h4> 37 + <div class="row">
  38 + <div class="col-md-12 category-header">
  39 + <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px">
  40 + <span>{{ webpage }}</span>
  41 + </h4>
42 42
43 - <div class="col-md-5 pull-right category-card-items">  
44 - <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a> 43 + <div class="col-md-5 pull-right category-card-items">
  44 + <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a>
  45 + </div>
45 </div> 46 </div>
46 </div> 47 </div>
47 </div> 48 </div>
48 - </div>  
49 - <div id="{{subject.slug}}" class="panel-collapse in collapse category-panel-content">  
50 - {% autoescape off %}  
51 - {{ webpage.content }}  
52 - {% endautoescape %} 49 + <div id="{{subject.slug}}" class="panel-collapse in collapse category-panel-content">
  50 + {% autoescape off %}
  51 + {{ webpage.content }}
  52 + {% endautoescape %}
  53 + </div>
53 </div> 54 </div>
54 {% endblock %} 55 {% endblock %}