Commit 98ab71bc0164358febfe983444ecebe7ab94b1ac
Exists in
master
and in
3 other branches
Merge branch 'refactoring' of https://github.com/amadeusproject/amadeuslms into refactoring
Showing
7 changed files
with
113 additions
and
6 deletions
Show diff stats
amadeus/static/css/base/amadeus.css
@@ -248,8 +248,6 @@ | @@ -248,8 +248,6 @@ | ||
248 | color: white; | 248 | color: white; |
249 | } | 249 | } |
250 | 250 | ||
251 | - | ||
252 | - | ||
253 | .navbar-nav li.open { | 251 | .navbar-nav li.open { |
254 | background: #00695C; | 252 | background: #00695C; |
255 | } | 253 | } |
@@ -866,4 +864,48 @@ ul, li { | @@ -866,4 +864,48 @@ ul, li { | ||
866 | font-size: 16px; | 864 | font-size: 16px; |
867 | border-bottom: 1px solid #D2D2D2; | 865 | border-bottom: 1px solid #D2D2D2; |
868 | } | 866 | } |
869 | -/* End Profile */ | ||
870 | \ No newline at end of file | 867 | \ No newline at end of file |
868 | +/* End Profile */ | ||
869 | + | ||
870 | +/* Bottom Menu */ | ||
871 | +.clearfix { | ||
872 | + height: 80px; | ||
873 | +} | ||
874 | + | ||
875 | +.bottom-menu { | ||
876 | + position: fixed; | ||
877 | + bottom: 0px; | ||
878 | + background: #F5F5F5; | ||
879 | + width: 100%; | ||
880 | + padding: 15px 30px; | ||
881 | + z-index: 999; | ||
882 | +} | ||
883 | + | ||
884 | +.mobile-menu { | ||
885 | + -webkit-padding-start: 0px; | ||
886 | +} | ||
887 | + | ||
888 | +.mobile-menu, .mobile-menu li { | ||
889 | + display: inline-block; | ||
890 | +} | ||
891 | + | ||
892 | +.mobile-menu .item { | ||
893 | + color: #FFFFFF; | ||
894 | + background: #26A69A; | ||
895 | + margin-left: 10px; | ||
896 | + margin-right: 10px; | ||
897 | + padding-top: 3px; | ||
898 | + text-align: center; | ||
899 | +} | ||
900 | + | ||
901 | +.mobile-menu .item a{ | ||
902 | + color: white; | ||
903 | +} | ||
904 | + | ||
905 | +.mobile-menu > .subjects_menu_active { | ||
906 | + background-color: #00695C; | ||
907 | +} | ||
908 | + | ||
909 | +.mobile-menu > .item:hover{ | ||
910 | + background-color: #00695C; | ||
911 | +} | ||
912 | +/* End Bottom Menu */ | ||
871 | \ No newline at end of file | 913 | \ No newline at end of file |
amadeus/static/css/base/amadeus_responsive.css
@@ -72,4 +72,28 @@ | @@ -72,4 +72,28 @@ | ||
72 | padding-right:0px; | 72 | padding-right:0px; |
73 | padding-left: 0px; | 73 | padding-left: 0px; |
74 | } | 74 | } |
75 | +} | ||
76 | + | ||
77 | +@media(min-width: 541px) { | ||
78 | + .mobile-menu .item { | ||
79 | + font-size: 45px; | ||
80 | + width: 70px; | ||
81 | + height: 65px; | ||
82 | + } | ||
83 | + | ||
84 | + .bottom-menu { | ||
85 | + height: 90px; | ||
86 | + } | ||
87 | +} | ||
88 | + | ||
89 | +@media(max-width: 540px) { | ||
90 | + .mobile-menu .item { | ||
91 | + font-size: 35px; | ||
92 | + width: 55px; | ||
93 | + height: 50px; | ||
94 | + } | ||
95 | + | ||
96 | + .bottom-menu { | ||
97 | + height: 80px; | ||
98 | + } | ||
75 | } | 99 | } |
76 | \ No newline at end of file | 100 | \ No newline at end of file |
amadeus/templates/base.html
@@ -149,7 +149,7 @@ | @@ -149,7 +149,7 @@ | ||
149 | <div class="row"> | 149 | <div class="row"> |
150 | <div id="sidebar-menu-div" class="col-md-1 col-lg-1 hidden-xs hidden-sm"> | 150 | <div id="sidebar-menu-div" class="col-md-1 col-lg-1 hidden-xs hidden-sm"> |
151 | {% block sidebar %} | 151 | {% block sidebar %} |
152 | - <ul id="sidebar-menu"> | 152 | + <ul id="sidebar-menu"> |
153 | <li class="item {{ subjects_menu_active }}" id="subjects-link" data-toggle="tooltip" data-placement="right" title="{% trans "Subjects" %}"> | 153 | <li class="item {{ subjects_menu_active }}" id="subjects-link" data-toggle="tooltip" data-placement="right" title="{% trans "Subjects" %}"> |
154 | <a href="{% url 'subjects:index' %}"> | 154 | <a href="{% url 'subjects:index' %}"> |
155 | <i class="fa fa-graduation-cap" aria-hidden="true"></i> | 155 | <i class="fa fa-graduation-cap" aria-hidden="true"></i> |
@@ -167,7 +167,7 @@ | @@ -167,7 +167,7 @@ | ||
167 | <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Analytics" %}"> | 167 | <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Analytics" %}"> |
168 | <i class="fa fa-bar-chart" aria-hidden="true"></i> | 168 | <i class="fa fa-bar-chart" aria-hidden="true"></i> |
169 | </li> | 169 | </li> |
170 | - </ul> | 170 | + </ul> |
171 | {% endblock %} | 171 | {% endblock %} |
172 | </div> | 172 | </div> |
173 | <div class="col-xs-12 col-sm-12 col-md-11 col-lg-11"> | 173 | <div class="col-xs-12 col-sm-12 col-md-11 col-lg-11"> |
@@ -185,6 +185,35 @@ | @@ -185,6 +185,35 @@ | ||
185 | </div> | 185 | </div> |
186 | </div> | 186 | </div> |
187 | 187 | ||
188 | + {% block bottommenu %} | ||
189 | + <div class="clearfix visible-xs visible-sm"></div> | ||
190 | + <div class="bottom-menu visible-xs visible-sm"> | ||
191 | + <div class="row"> | ||
192 | + <div class="col-sm-12 col-xs-12 text-center"> | ||
193 | + <ul class="mobile-menu"> | ||
194 | + <li class="item {{ subjects_menu_active }}" data-toggle="tooltip" data-placement="top" title="{% trans "Subjects" %}"> | ||
195 | + <a href="{% url 'subjects:index' %}"> | ||
196 | + <i class="fa fa-graduation-cap" aria-hidden="true"></i> | ||
197 | + </a> | ||
198 | + </li> | ||
199 | + <li class="item" data-toggle="tooltip" data-placement="top" title="{% trans "Timeline" %}"> | ||
200 | + <i class="fa fa-list" aria-hidden="true" ></i> | ||
201 | + </li> | ||
202 | + <li class="item" data-toggle="tooltip" data-placement="top" title="{% trans "Messages" %}"> | ||
203 | + <i class="fa fa-envelope-o" aria-hidden="true"></i> | ||
204 | + </li> | ||
205 | + <li class="item" data-toggle="tooltip" data-placement="top" title="{% trans "Pendencias" %}"> | ||
206 | + <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> | ||
207 | + </li> | ||
208 | + <li class="item" data-toggle="tooltip" data-placement="top" title="{% trans "Analytics" %}"> | ||
209 | + <i class="fa fa-bar-chart" aria-hidden="true"></i> | ||
210 | + </li> | ||
211 | + </ul> | ||
212 | + </div> | ||
213 | + </div> | ||
214 | + </div> | ||
215 | + {% endblock %} | ||
216 | + | ||
188 | <!-- Init material Bootstrap --> | 217 | <!-- Init material Bootstrap --> |
189 | <script type="text/javascript">$.material.init()</script> | 218 | <script type="text/javascript">$.material.init()</script> |
190 | <script type="text/javascript"> | 219 | <script type="text/javascript"> |
users/templates/users/forgot_password.html
users/templates/users/login.html
users/templates/users/new_password.html
users/templates/users/register.html