Download as
Browse Code »

Commit 02cbb3a124d3cf95d48b3a5e4326aa1b230fc39a

Authored by Matheus Lins
2 parents f9a2a416 170950c6
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

fixing conflit

Showing 2 changed files with 9 additions and 1 deletions   Show diff stats
core/static/css/base/amadeus.css
  Diff comments   View file @02cbb3a
@@ -411,4 +411,9 @@ ul, li { @@ -411,4 +411,9 @@ ul, li {
411 .cards-detail .panel .panel-heading{/*background-color:;*/} 411 .cards-detail .panel .panel-heading{/*background-color:;*/}
412 .cards-detail .panel .panel-heading h4{color:black;} 412 .cards-detail .panel .panel-heading h4{color:black;}
413 .course, .subject, .topic{ padding-top: 0px; padding-bottom: 0px; } 413 .course, .subject, .topic{ padding-top: 0px; padding-bottom: 0px; }
414 -.course-detail{padding-top: 10px; padding-bottom: 10px;}  
415 \ No newline at end of file 414 \ No newline at end of file
  415 +.course-detail{padding-top: 10px; padding-bottom: 10px;}
  416 +
  417 +/* Menu link remove radius */
  418 +.nav-pills > li > a {
  419 + border-radius: 0px;
  420 +}
416 \ No newline at end of file 421 \ No newline at end of file
courses/templates/course/view.html
  Diff comments   View file @02cbb3a
@@ -173,6 +173,9 @@ @@ -173,6 +173,9 @@
173 <p><b>{% trans "Professor" %}: </b>{% for professor in subject.professors.all %}{% if not forloop.first %},{% endif %} 173 <p><b>{% trans "Professor" %}: </b>{% for professor in subject.professors.all %}{% if not forloop.first %},{% endif %}
174 {{professor}}{% if forloop.last %}.{% endif %}{% endfor %}</p> 174 {{professor}}{% if forloop.last %}.{% endif %}{% endfor %}</p>
175 <p> 175 <p>
  176 + <b>{% trans 'Category' %}: </b><i>{{ subject.category }}</i>
  177 + </p>
  178 + <p>
176 <b>{% trans "Description" %}: </b> 179 <b>{% trans "Description" %}: </b>
177 <i> 180 <i>
178 {{subject.description}} 181 {{subject.description}}