Download as
Browse Code »

Commit 0872c975cec14221ff25b447460812e2253be946

Authored by felipebormann
1 parent 7cc0ac9c
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

fixed bottom menu

Showing 3 changed files with 414 additions and 46 deletions   Show diff stats
amadeus/static/css/base/amadeus.css
  Diff comments   View file @0872c97
@@ -33,6 +33,15 @@ a:focus { @@ -33,6 +33,15 @@ a:focus {
33 width: 20%; 33 width: 20%;
34 } 34 }
35 35
  36 +.bottom-menu {
  37 + position: fixed;
  38 + bottom: 0px;
  39 + width: 100%;
  40 + padding: 0px 30px;
  41 + z-index: 999;
  42 + height: 50px;
  43 +}
  44 +
36 /* Initial page starts */ 45 /* Initial page starts */
37 .users-cloud { 46 .users-cloud {
38 47
amadeus/static/css/themes/green.css
  Diff comments   View file @0872c97
@@ -33,7 +33,9 @@ a, a:focus, a:hover { @@ -33,7 +33,9 @@ a, a:focus, a:hover {
33 background-color: #FF0000 !important; 33 background-color: #FF0000 !important;
34 } 34 }
35 35
36 - 36 +.bottom-menu{
  37 + background: #009688;
  38 +}
37 39
38 #btn-search:hover { 40 #btn-search:hover {
39 background: #00695C; 41 background: #00695C;
amadeus/static/css/themes/red.css
  Diff comments   View file @0872c97
  1 +/*
  2 +* === COMMON TAGS (Body, h4, p, etc...) and base.html ===
  3 +*/
  4 +
1 body .container .jumbotron-inverse, body .container .well-inverse, body .container-fluid .jumbotron-inverse, body .container-fluid .well-inverse { 5 body .container .jumbotron-inverse, body .container .well-inverse, body .container-fluid .jumbotron-inverse, body .container-fluid .well-inverse {
2 background-color: white; 6 background-color: white;
3 } 7 }
4 8
5 a, a:focus, a:hover { 9 a, a:focus, a:hover {
6 - color: #7B241C; 10 + color: #009688;
7 } 11 }
8 12
9 .radio input[type=radio]:checked~.check, label.radio-inline input[type=radio]:checked~.check { 13 .radio input[type=radio]:checked~.check, label.radio-inline input[type=radio]:checked~.check {
10 - background-color: #7B241C; 14 + background-color: #009688;
11 } 15 }
12 16
13 .radio input[type=radio]:checked~.circle, label.radio-inline input[type=radio]:checked~.circle { 17 .radio input[type=radio]:checked~.circle, label.radio-inline input[type=radio]:checked~.circle {
14 - border-color: #7B241C; 18 + border-color: #009688;
15 } 19 }
16 20
17 .pagination > .active > a, .pagination > .active > span, .pagination > .active > a:hover, .pagination > .active > span:hover, .pagination > .active > a:focus, .pagination > .active > span:focus { 21 .pagination > .active > a, .pagination > .active > span, .pagination > .active > a:hover, .pagination > .active > span:hover, .pagination > .active > a:focus, .pagination > .active > span:focus {
@@ -21,16 +25,39 @@ a, a:focus, a:hover { @@ -21,16 +25,39 @@ a, a:focus, a:hover {
21 } 25 }
22 26
23 .navbar, .navbar.navbar-default { 27 .navbar, .navbar.navbar-default {
24 - background-color: #7B241C; 28 + background-color: #009688;
25 color: rgba(255,255,255,.84); 29 color: rgba(255,255,255,.84);
26 } 30 }
27 31
28 -.my-subjects-title {  
29 - color: #B03A2E; 32 +.notify_badge {
  33 + background-color: #FF0000 !important;
  34 +}
  35 +
  36 +
  37 +
  38 +#btn-search:hover {
  39 + background: #00695C;
30 } 40 }
31 41
  42 +/*
  43 +* — Language selector —
  44 +*/
  45 +
  46 +.language-selector .dropdown-menu > .active > a {
  47 + background: #EEEEEE;
  48 + color: #009688;
  49 +}
  50 +
  51 +.language-selector .dropdown-menu > .active > a:hover {
  52 + color: #009688;
  53 +}
  54 +
  55 +/*
  56 +* — Sidebar menu in every page —
  57 +*/
  58 +
32 #sidebar-menu .item { 59 #sidebar-menu .item {
33 - background-color: #B03A2E; 60 + background-color: #009688;
34 color: white; 61 color: white;
35 } 62 }
36 63
@@ -39,24 +66,145 @@ a, a:focus, a:hover { @@ -39,24 +66,145 @@ a, a:focus, a:hover {
39 } 66 }
40 67
41 #sidebar-menu > .subjects_menu_active { 68 #sidebar-menu > .subjects_menu_active {
42 - background-color: #641E16; 69 + background-color: #00695C;
43 } 70 }
44 71
45 #sidebar-menu > .item:hover{ 72 #sidebar-menu > .item:hover{
46 - background-color: #641E16; 73 + background-color: #00695C;
  74 +}
  75 +
  76 +/*
  77 +* === SUBJECT APP ===
  78 +*/
  79 +
  80 +/*
  81 +* — Home —
  82 +*/
  83 +
  84 +.users-cloud .small a {
  85 + color: #2E8B57;
  86 +}
  87 +
  88 +.users-cloud .big a {
  89 + color: #6B8E23;
  90 +}
  91 +
  92 +.users-cloud .medium a {
  93 + color: #66CDAA;
  94 +}
  95 +
  96 +.users-cloud .tiny a {
  97 + color: #654321;
  98 +}
  99 +
  100 +
  101 +.my-subjects-title {
  102 + color: #26A69A;
47 } 103 }
48 104
  105 +
49 .panel-invisible{ 106 .panel-invisible{
50 background-color: #BDBDBD !important; 107 background-color: #BDBDBD !important;
51 color: #F5F5F5; 108 color: #F5F5F5;
52 } 109 }
53 110
54 .category-panel > .panel-heading { 111 .category-panel > .panel-heading {
55 - background-color: #666666 !important; 112 + background-color: #015E96 !important;
  113 +}
  114 +
  115 +.category-panel .category-header .category-card-items i {
  116 + color: #014e7d;
  117 +}
  118 +
  119 +.category-panel .category-header .category-card-items i:hover {
  120 + color: #ffffff;
56 } 121 }
57 122
58 .subject-panel > .panel-heading { 123 .subject-panel > .panel-heading {
59 - background-color: #777777 !important; 124 + background-color: #0277BD !important;
  125 +}
  126 +
  127 +.subject-panel .category-header .category-card-items i {
  128 + color: #0267a4;
  129 +}
  130 +
  131 +.subject-panel .category-header .category-card-items i:hover {
  132 + color: #ffffff;
  133 +}
  134 +
  135 +.resource-link{
  136 + color: #000000 !important;
  137 +}
  138 +
  139 +/*
  140 +* — subscribe.html —
  141 +*/
  142 +.modal-header {
  143 + border-bottom: 1px solid #E6E7E8 !important;
  144 +}
  145 +
  146 +.modal-footer {
  147 + border-top: 1px solid #E6E7E8 !important;
  148 +}
  149 +
  150 +/*
  151 +* — subject_card.html —
  152 +*/
  153 +
  154 +.access-subject {
  155 + background-color: #2eb82e !important;
  156 + color: white;
  157 +}
  158 +
  159 +/*
  160 +* — Groups App —
  161 +*/
  162 +
  163 +.group-panel > .panel-heading {
  164 + background-color: #FFFFFF !important;
  165 +}
  166 +
  167 +.group-panel .panel-title, .group-panel .category-header i, .group-panel .category-course-link {
  168 + color: #000000 !important;
  169 +}
  170 +
  171 +.group-panel-body {
  172 + background: #FFFFFF !important;
  173 + border-top: 1px solid #CCCCCC;
  174 +}
  175 +
  176 +
  177 +/*
  178 +* === Resources Common (ex: PDF, WebPage ) App ===
  179 +*/
  180 +
  181 +.topic-panel > .panel-heading {
  182 + background-color: #1d8fe0 !important;
  183 +}
  184 +
  185 +.topic-panel .category-header .category-card-items i, .topic-panel-invisible .category-header .category-card-items i {
  186 + color: #1772b3;
  187 +}
  188 +
  189 +.topic-panel .category-header .category-card-items i:hover, .topic-panel-invisible .category-header .category-card-items i:hover {
  190 + color: #ffffff;
  191 +}
  192 +
  193 +.topic-panel > .category-panel-content, .topic-panel-invisible > .category-panel-content {
  194 + background: #FFFFFF;
  195 +}
  196 +
  197 +.topic-panel-invisible > .panel-heading {
  198 + background-color: #BDBDBD !important;
  199 + color: #F5F5F5;
  200 +}
  201 +
  202 +.pendencies-content {
  203 + background: #FFFFFF;
  204 +}
  205 +
  206 +.pendencies-content .core-subjects-options li {
  207 + background: #F5F5F5;
60 } 208 }
61 209
62 .category-header i { 210 .category-header i {
@@ -68,7 +216,7 @@ a, a:focus, a:hover { @@ -68,7 +216,7 @@ a, a:focus, a:hover {
68 } 216 }
69 217
70 .category-header .dropdown-menu i { 218 .category-header .dropdown-menu i {
71 - color: inherit; 219 + color: inherit !important;
72 } 220 }
73 221
74 #create-category { 222 #create-category {
@@ -88,11 +236,11 @@ a, a:focus, a:hover { @@ -88,11 +236,11 @@ a, a:focus, a:hover {
88 236
89 .core-subjects-options li.active { 237 .core-subjects-options li.active {
90 color: inherit; 238 color: inherit;
91 - border-bottom-color: #641E16; 239 + border-bottom-color: #00695C;
92 } 240 }
93 241
94 .create-subject-btn { 242 .create-subject-btn {
95 - background-color: #B03A2E; 243 + background-color: #26A69A;
96 color: white; 244 color: white;
97 } 245 }
98 246
@@ -100,8 +248,14 @@ a, a:focus, a:hover { @@ -100,8 +248,14 @@ a, a:focus, a:hover {
100 background: #FFFFFF; 248 background: #FFFFFF;
101 } 249 }
102 250
  251 +/*
  252 +* === Amadeus APP ===
  253 +*/
  254 +
  255 +
  256 +
103 .navbar-brand:hover { 257 .navbar-brand:hover {
104 - background: #641E16 !important; 258 + background: #00695C !important;
105 } 259 }
106 260
107 .navbar .project_name { 261 .navbar .project_name {
@@ -109,24 +263,21 @@ a, a:focus, a:hover { @@ -109,24 +263,21 @@ a, a:focus, a:hover {
109 } 263 }
110 264
111 .navbar-nav li.open { 265 .navbar-nav li.open {
112 - background: #641E16; 266 + background: #00695C;
113 } 267 }
114 268
115 .navbar-nav li > a:hover { 269 .navbar-nav li > a:hover {
116 - background: #641E16 !important; 270 + background: #00695C !important;
117 } 271 }
118 272
119 .navbar-nav li.settings_menu_active { 273 .navbar-nav li.settings_menu_active {
120 - background: #641E16; 274 + background: #00695C
121 } 275 }
122 276
123 .top-search { 277 .top-search {
124 color: #F5F5F5; 278 color: #F5F5F5;
125 } 279 }
126 280
127 -#btn-search:hover {  
128 - background: #641E16;  
129 -}  
130 281
131 .dropdown-menu { 282 .dropdown-menu {
132 background: #F5F5F5; 283 background: #F5F5F5;
@@ -154,45 +305,42 @@ a, a:focus, a:hover { @@ -154,45 +305,42 @@ a, a:focus, a:hover {
154 } 305 }
155 306
156 #system_accordion > .panel > .panel-heading > a > .panel-title:hover { 307 #system_accordion > .panel > .panel-heading > a > .panel-title:hover {
157 - color: #7B241C; 308 + color: #009688;
158 } 309 }
159 310
160 #system_accordion > .panel > .panel-heading > a:hover { 311 #system_accordion > .panel > .panel-heading > a:hover {
161 - color: #7B241C; 312 + color: #009688;
162 } 313 }
163 314
164 #system_menu { 315 #system_menu {
165 background: #F5F5F5; 316 background: #F5F5F5;
166 } 317 }
167 318
168 -.modal-header {  
169 - border-bottom: 1px solid #E6E7E8 !important;  
170 -}  
171 -  
172 -.modal-footer {  
173 - border-top: 1px solid #E6E7E8 !important;  
174 -}  
175 319
176 #horizontal-line{ 320 #horizontal-line{
177 background-color: black; 321 background-color: black;
178 } 322 }
179 323
180 .breadcrumb > li > span.divider { 324 .breadcrumb > li > span.divider {
181 - color: #B03A2E; 325 + color: #26A69A;
182 } 326 }
183 327
184 .breadcrumb > li > a{ 328 .breadcrumb > li > a{
185 - color: #B03A2E; 329 + color: #26A69A;
186 } 330 }
187 331
188 .breadcrumb > li { 332 .breadcrumb > li {
189 color: #BDBDBD; 333 color: #BDBDBD;
190 } 334 }
191 335
192 -.panel-title{ /*Because we use an outer a tag*/ 336 +.panel-title { /*Because we use an outer a tag*/
193 color: rgba(255,255,255,.84); 337 color: rgba(255,255,255,.84);
194 } 338 }
195 339
  340 +.category-header > h4.panel-title span {
  341 + color: #FFFFFF;
  342 +}
  343 +
196 .accordion { 344 .accordion {
197 background: white; 345 background: white;
198 } 346 }
@@ -229,13 +377,10 @@ a, a:focus, a:hover { @@ -229,13 +377,10 @@ a, a:focus, a:hover {
229 border-bottom: 1px solid #D2D2D2; 377 border-bottom: 1px solid #D2D2D2;
230 } 378 }
231 379
232 -.bottom-menu {  
233 - background: #B03A2E;  
234 -}  
235 380
236 .mobile-menu .item { 381 .mobile-menu .item {
237 color: #FFFFFF; 382 color: #FFFFFF;
238 - background: #B03A2E; 383 + background: #009688;
239 } 384 }
240 385
241 .mobile-menu .item a { 386 .mobile-menu .item a {
@@ -243,17 +388,13 @@ a, a:focus, a:hover { @@ -243,17 +388,13 @@ a, a:focus, a:hover {
243 } 388 }
244 389
245 .mobile-menu > .subjects_menu_active { 390 .mobile-menu > .subjects_menu_active {
246 - background-color: #641E16; 391 + background-color: #00695C;
247 } 392 }
248 393
249 .mobile-menu > .item:hover{ 394 .mobile-menu > .item:hover{
250 - background-color: #641E16; 395 + background-color: #00695C;
251 } 396 }
252 397
253 -.access-subject {  
254 - background-color: #2eb82e !important;  
255 - color: white;  
256 -}  
257 398
258 .page_selector h4 { 399 .page_selector h4 {
259 border-bottom: 1px solid #e5e5e5; 400 border-bottom: 1px solid #e5e5e5;
@@ -299,7 +440,223 @@ a, a:focus, a:hover { @@ -299,7 +440,223 @@ a, a:focus, a:hover {
299 } 440 }
300 441
301 .holder a.jp-current, a.jp-current:hover { 442 .holder a.jp-current, a.jp-current:hover {
302 - background: #337ab7; 443 + background: #039BE5;
303 color: #FFFFFF; 444 color: #FFFFFF;
304 - border-color: #337ab7; 445 + border-color: #039BE5;
  446 +}
  447 +
  448 +
  449 +/*
  450 +* — Pendencies Form —
  451 +*/
  452 +
  453 +.notifies {
  454 + border: 1px solid #EEEEEE;
  455 +}
  456 +
  457 +.bootstrap-datetimepicker-widget {
  458 + background-color: #fff;
  459 +}
  460 +
  461 +.notifies a.delete-row {
  462 + -webkit-box-shadow: 0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);
  463 + box-shadow: 0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);
  464 + background-color: #EEE;
  465 + color: rgba(0,0,0,.87);
  466 +}
  467 +
  468 +a.add-row {
  469 + -webkit-box-shadow: 0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);
  470 + box-shadow: 0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);
  471 + background-color: #59b75c;
  472 + color: rgba(255,255,255,.84);
  473 +}
  474 +
  475 +
  476 +/*
  477 +* — Resource List on topic templates —
  478 +*/
  479 +
  480 +.resource_list > .list-group-item {
  481 + background-color: #fff;
  482 + border: 1px solid #ddd;
  483 +}
  484 +
  485 +.resource_list > .disabled {
  486 + background-color: #eee;
  487 +}
  488 +
  489 +.resource_list > .disabled:hover {
  490 + background-color: #eee !important;
  491 +}
  492 +
  493 +.resource_list > .disabled a.resource_link {
  494 + color: #BDBDBD;
  495 +}
  496 +
  497 +.resource_list > .list-group-item:hover {
  498 + background: #F5F5F5;
  499 +}
  500 +
  501 +.resource_list > .list-group-item:last-child {
  502 + border-bottom: 1px solid #ddd !important;
  503 +}
  504 +
  505 +.resource_list .category-card-items i {
  506 + color: #e5e5e5;
  507 +}
  508 +
  509 +.resource_list .category-card-items i:hover {
  510 + color: #7f7f7f;
  511 +}
  512 +
  513 +.resource_list .category-card-items .dropdown-menu i {
  514 + color: #333;
  515 +}
  516 +
  517 +.resource_list a {
  518 + color: inherit;
  519 +}
  520 +
  521 +.resource_list .btn-group button:active, .resource_list .btn-group button:focus, .resource_list .btn-group button:hover {
  522 + background-color: initial !important;
  523 +}
  524 +
  525 +
  526 +
  527 +#search-results-title{
  528 + color: #BDBDBD;
  529 +}
  530 +
  531 +
  532 +.no-subscribe-btn{
  533 + background-color: #BDBDBD !important;
  534 + color: #F5F5F5 !important;
  535 +}
  536 +
  537 +.pendency {
  538 + border-color: #CCCCCC;
  539 +}
  540 +
  541 +.pendency .breadcrumb {
  542 + background-color: #FFFFFF;
  543 +}
  544 +
  545 +.pendency .meta {
  546 + color: #FF0000;
  547 +}
  548 +
  549 +.alert-low, .alert-medium {
  550 + background-color: #FFA500;
  551 + color: #FFFFFF;
  552 +}
  553 +
  554 +.no_button:hover, .no_button:focus, .no_button:active {
  555 + background-color: initial !important;
  556 +}
  557 +
  558 +.popover {
  559 + background: #FFF;
  560 + color: #333;
  561 +}
  562 +
  563 +.mural .post_make {
  564 + background: #FFFFFF;
  565 +}
  566 +
  567 +.mural .post_make .user-img, .post .post-img, .post .post-comment .user-img div, .comment .comment-img div {
  568 + background: #CCCCCC;
  569 +}
  570 +
  571 +.mural .post_make .post-field div {
  572 + border-color: #CCCCCC;
  573 +}
  574 +
  575 +.mural .post_make .post-field h4 {
  576 + color: #CCCCCC;
  577 +}
  578 +
  579 +.post_action i, .post .post-user .user-action i, .comment .comment-user .user-action i {
  580 + color: #1d8fe0;
  581 +}
  582 +
  583 +.post .post-user, .comment .comment-user, .marked_user {
  584 + color: #26A69A;
  585 +}
  586 +
  587 +.post .post-user .user-action {
  588 + color: #BBBBBB;
  589 +}
  590 +
  591 +.post .time {
  592 + color: #ABABAB;
  593 +}
  594 +
  595 +.post .post-comment {
  596 + border-top-color: #888888;
  597 + background: #e5e5e5;
  598 +}
  599 +
  600 +.post .post-comment .comment-field div {
  601 + border-color: #888888;
  602 + background: #FFFFFF;
  603 +}
  604 +
  605 +.comment-section {
  606 + background: #f5f5f5;
  607 + border-top-color: #AAAAAA;
  608 +}
  609 +
  610 +.comment .comment-user .user-action {
  611 + color: #999999;
  612 +}
  613 +
  614 +.comment-time {
  615 + color: #9A9A9A;
  616 +}
  617 +
  618 +.btn_unfav {
  619 + color: #FF0000 !important;
  620 +}
  621 +
  622 +.btn_fav {
  623 + color: #BBBBBB !important;
  624 +}
  625 +
  626 +.post-filter {
  627 + background: #f5f5f5;
  628 +}
  629 +
  630 +.post-filter h4 {
  631 + color: #26A69A;
  632 +}
  633 +
  634 +.post-filter label {
  635 + color: #333333;
  636 +}
  637 +
  638 +.post-filter i {
  639 + color: #FF0000;
  640 +}
  641 +
  642 +.suggestions {
  643 + background: #FFFFFF;
  644 +}
  645 +
  646 +.mural-category {
  647 + background: #EEE;
  648 +}
  649 +
  650 +.btn:not(.btn-raised):not(.btn-link):focus, .btn:not(.btn-raised):not(.btn-link):hover, .input-group-btn .btn:not(.btn-raised):not(.btn-link):focus, .input-group-btn .btn:not(.btn-raised):not(.btn-link):hover {
  651 + background-color: initial;
  652 +}
  653 +
  654 +
  655 +@media(max-width: 768px) {
  656 + .navbar .navbar-nav .dropdown .dropdown-menu li > a {
  657 + color: #333333 !important;
  658 + }
  659 + .navbar .navbar-nav .dropdown .dropdown-menu li > a:hover {
  660 + color: #009688 !important;
  661 + }
305 } 662 }
306 \ No newline at end of file 663 \ No newline at end of file