klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-10-31 19:38:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

pedagogy: wrap all css inside a class named pedagogy to avoid name clashes

Browse Source
This commit is contained in:
Antoine Bartuccio 2019-07-08 15:25:28 +02:00
parent c15ea345dd
commit fd1f89de1d
Signed by: klmp200
GPG Key ID: E7245548C53F904B
3 changed files with 422 additions and 420 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/static/core/style.scss
View File

@ -1683,6 +1683,8 @@ $pedagogy-light-blue: #caf0ff;
$pedagogy-white-text: #f0f0f0; $pedagogy-white-text: #f0f0f0;
.pedagogy { .pedagogy {
font-family: "Fira Sans";
&.star-not-checked { &.star-not-checked {
color : #f7f7f7; color : #f7f7f7;
margin-bottom: 0px; margin-bottom: 0px;
@ -1704,10 +1706,8 @@ $pedagogy-white-text: #f0f0f0;
margin-right: 5px; margin-right: 5px;
} }
} }
}
#dynamic_view { #dynamic_view {
font-family: "Fira Sans";
font-size: 1.1em; font-size: 1.1em;
table { table {
@ -1718,10 +1718,9 @@ $pedagogy-white-text: #f0f0f0;
border: none; border: none;
} }
} }
#search_form { #search_form {
font-family: "Fira Sans";
margin: 0px; margin: 0px;
width: 100%; width: 100%;
@ -1764,10 +1763,9 @@ $pedagogy-white-text: #f0f0f0;
#radioAUTUMN + label { #radioAUTUMN + label {
margin-left: 50px; margin-left: 50px;
} }
} }
#pedagogy { #uv_detail {
font-family: "Fira Sans";
color: #062f38; color: #062f38;
.uv-quick-info-container { .uv-quick-info-container {
@ -2073,4 +2071,5 @@ $pedagogy-white-text: #f0f0f0;
} }
} }
} }
}
} }

13
pedagogy/templates/pedagogy/guide.jinja
View File

@ -6,7 +6,8 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<form id="search_form" action="{{ url('pedagogy:guide') }}" method="get"> <div class="pedagogy">
<form id="search_form" action="{{ url('pedagogy:guide') }}" method="get">
{% if can_create_uv(user) %} {% if can_create_uv(user) %}
<p> <p>
<a href="{{ url('pedagogy:uv_create') }}">{% trans %}Create UV{% endtrans %}</a> <a href="{{ url('pedagogy:uv_create') }}">{% trans %}Create UV{% endtrans %}</a>
@ -35,9 +36,9 @@
<span><input type="checkbox" name="semester" id="radioAP" value="AUTUMN_AND_SPRING"><label for="radioAP">AP</label></span> <span><input type="checkbox" name="semester" id="radioAP" value="AUTUMN_AND_SPRING"><label for="radioAP">AP</label></span>
</div> </div>
<input type="text" name="json" hidden> <input type="text" name="json" hidden>
</form> </form>
<br> <br>
<table id="dynamic_view"> <table id="dynamic_view">
<thead> <thead>
<tr> <tr>
<td>{% trans %}UV{% endtrans %}</td> <td>{% trans %}UV{% endtrans %}</td>
@ -76,8 +77,8 @@
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
</div>
<script> <script>
function autofillCheckboxRadio(name){ function autofillCheckboxRadio(name){
if (urlParams.has(name)){ $("input[name='" + name + "']").each(function(){ if (urlParams.has(name)){ $("input[name='" + name + "']").each(function(){

8
pedagogy/templates/pedagogy/uv_detail.jinja
View File

@ -7,7 +7,8 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div id="pedagogy"> <div class="pedagogy">
<div id="uv_detail">
<p id="return_noscript"><a href="{{ url('pedagogy:guide') }}">{% trans %}Back{% endtrans %}</a></p> <p id="return_noscript"><a href="{{ url('pedagogy:guide') }}">{% trans %}Back{% endtrans %}</a></p>
<button id="return_js" onclick='(function(){ <button id="return_js" onclick='(function(){
// If comes from the guide page, go back with history // If comes from the guide page, go back with history
@ -192,8 +193,9 @@
{% endif %} {% endif %}
</div> </div>
</div>
<script type="text/javascript"> <script type="text/javascript">
$("#return_noscript").hide(); $("#return_noscript").hide();
$("#return_js").show(); $("#return_js").show();
var icons = { var icons = {
@ -212,5 +214,5 @@
$(document).ready(function(){ $(document).ready(function(){
$(".ui-accordion-header-icon").first().removeClass("ui-icon"); $(".ui-accordion-header-icon").first().removeClass("ui-icon");
}); });
</script> </script>
{% endblock %} {% endblock %}