Download as
Browse Code »

Commit 17f521028150f7c1203e51157b881c8917e273d9

Authored by Felipe Henrique de Almeida Bormann
2 parents 98ccb93b a73c3a04
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

Merge branch 'refactoring' of https://github.com/amadeusproject/amadeuslms into refactoring

Showing 2 changed files with 18 additions and 14 deletions   Show diff stats
amadeus/static/css/base/amadeus.css
  Diff comments   View file @17f5210
... ... @@ -4,6 +4,7 @@
4 4 #sidebar-menu{
5 5 -webkit-padding-start: 0px;
6 6 }
  7 +
7 8 #sidebar-menu .item{
8 9 font-size: 45px;
9 10 background-color: #26A69A;
... ... @@ -13,10 +14,12 @@
13 14 text-align: center;
14 15 }
15 16  
  17 +#sidebar-menu .item a{
  18 + color: white;
  19 +}
  20 +
16 21 #sidebar-menu > .item:hover{
17   -
18 22 background-color: #00695C;
19   -
20 23 }
21 24  
22 25 #subjects-link{
... ...
amadeus/templates/base.html
  Diff comments   View file @17f5210
... ... @@ -142,23 +142,24 @@
142 142 <div id="sidebar-menu-div" class="col-xs-1 col-sm-1 col-md-1 col-lg-1 col-xl-1">
143 143 {% block sidebar %}
144 144 <ul id="sidebar-menu">
145   - <a href="{% url 'subjects:index' %}"><li class="item" id="subjects-link" data-toggle="tooltip" data-placement="right" title="{% trans "Subjects" %}">
146   - <i class="fa fa-graduation-cap" aria-hidden="true"></i>
147   - </li></a>
148   - <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Timeline" %}">
  145 + <li class="item" id="subjects-link" data-toggle="tooltip" data-placement="right" title="{% trans "Subjects" %}">
  146 + <a href="{% url 'subjects:index' %}">
  147 + <i class="fa fa-graduation-cap" aria-hidden="true"></i>
  148 + </a>
  149 + </li>
  150 + <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Timeline" %}">
149 151 <i class="fa fa-list" aria-hidden="true" ></i>
150   - </li>
151   - <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Messages" %}">
  152 + </li>
  153 + <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Messages" %}">
152 154 <i class="fa fa-envelope-o" aria-hidden="true"></i>
153   - </li>
154   -
155   - <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Pendencias" %}">
  155 + </li>
  156 + <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Pendencias" %}">
156 157 <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
157   - </li>
  158 + </li>
158 159  
159   - <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Analytics" %}">
  160 + <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Analytics" %}">
160 161 <i class="fa fa-bar-chart" aria-hidden="true"></i>
161   - </li>
  162 + </li>
162 163 </ul>
163 164 {% endblock %}
164 165 </div>
... ...