Commit 17f521028150f7c1203e51157b881c8917e273d9
Exists in
master
and in
3 other branches
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
| @@ -4,6 +4,7 @@ | @@ -4,6 +4,7 @@ | ||
| 4 | #sidebar-menu{ | 4 | #sidebar-menu{ |
| 5 | -webkit-padding-start: 0px; | 5 | -webkit-padding-start: 0px; |
| 6 | } | 6 | } |
| 7 | + | ||
| 7 | #sidebar-menu .item{ | 8 | #sidebar-menu .item{ |
| 8 | font-size: 45px; | 9 | font-size: 45px; |
| 9 | background-color: #26A69A; | 10 | background-color: #26A69A; |
| @@ -13,10 +14,12 @@ | @@ -13,10 +14,12 @@ | ||
| 13 | text-align: center; | 14 | text-align: center; |
| 14 | } | 15 | } |
| 15 | 16 | ||
| 17 | +#sidebar-menu .item a{ | ||
| 18 | + color: white; | ||
| 19 | +} | ||
| 20 | + | ||
| 16 | #sidebar-menu > .item:hover{ | 21 | #sidebar-menu > .item:hover{ |
| 17 | - | ||
| 18 | background-color: #00695C; | 22 | background-color: #00695C; |
| 19 | - | ||
| 20 | } | 23 | } |
| 21 | 24 | ||
| 22 | #subjects-link{ | 25 | #subjects-link{ |
amadeus/templates/base.html
| @@ -142,23 +142,24 @@ | @@ -142,23 +142,24 @@ | ||
| 142 | <div id="sidebar-menu-div" class="col-xs-1 col-sm-1 col-md-1 col-lg-1 col-xl-1"> | 142 | <div id="sidebar-menu-div" class="col-xs-1 col-sm-1 col-md-1 col-lg-1 col-xl-1"> |
| 143 | {% block sidebar %} | 143 | {% block sidebar %} |
| 144 | <ul id="sidebar-menu"> | 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 | <i class="fa fa-list" aria-hidden="true" ></i> | 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 | <i class="fa fa-envelope-o" aria-hidden="true"></i> | 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 | <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> | 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 | <i class="fa fa-bar-chart" aria-hidden="true"></i> | 161 | <i class="fa fa-bar-chart" aria-hidden="true"></i> |
| 161 | - </li> | 162 | + </li> |
| 162 | </ul> | 163 | </ul> |
| 163 | {% endblock %} | 164 | {% endblock %} |
| 164 | </div> | 165 | </div> |