Download as
Browse Code »

Commit 8f46f01bfa19d81d0f237283e97386a9a20c4ae7

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

modified css for organization

Showing 3 changed files with 44 additions and 45 deletions   Show diff stats
amadeus/static/css/base/amadeus.css
  Diff comments   View file @8f46f01
... ... @@ -620,14 +620,6 @@ a:focus {
620 620 height: 60px;
621 621 }
622 622  
623   -.bottom-menu {
624   - position: fixed;
625   - bottom: 0px;
626   - width: 100%;
627   - padding: 0px 30px;
628   - z-index: 999;
629   - height: 50px;
630   -}
631 623  
632 624 .mobile-menu {
633 625 -webkit-padding-start: 0px;
... ...
amadeus/static/css/themes/green.css
  Diff comments   View file @8f46f01
... ... @@ -40,21 +40,24 @@ a, a:focus, a:hover {
40 40 }
41 41  
42 42 /*
43   -* === SUBJECT APP ===
44   -*/
45   -
46   -/*
47   -* — Home —
  43 +* — Language selector —
48 44 */
49 45  
  46 +.language-selector .dropdown-menu > .active > a {
  47 + background: #EEEEEE;
  48 + color: #009688;
  49 +}
50 50  
51   -
52   -.my-subjects-title {
53   - color: #26A69A;
  51 +.language-selector .dropdown-menu > .active > a:hover {
  52 + color: #009688;
54 53 }
55 54  
  55 +/*
  56 +* — Sidebar menu in every page —
  57 +*/
  58 +
56 59 #sidebar-menu .item {
57   - background-color: #009688;
  60 + background-color: #009688;
58 61 color: white;
59 62 }
60 63  
... ... @@ -70,6 +73,36 @@ a, a:focus, a:hover {
70 73 background-color: #00695C;
71 74 }
72 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;
  103 +}
  104 +
  105 +
73 106 .panel-invisible{
74 107 background-color: #BDBDBD !important;
75 108 color: #F5F5F5;
... ... @@ -344,9 +377,6 @@ a, a:focus, a:hover {
344 377 border-bottom: 1px solid #D2D2D2;
345 378 }
346 379  
347   -.bottom-menu {
348   - background: #009688;
349   -}
350 380  
351 381 .mobile-menu .item {
352 382 color: #FFFFFF;
... ... @@ -498,21 +528,6 @@ a.add-row {
498 528 color: #BDBDBD;
499 529 }
500 530  
501   -.users-cloud .small a {
502   - color: #2E8B57;
503   -}
504   -
505   -.users-cloud .big a {
506   - color: #6B8E23;
507   -}
508   -
509   -.users-cloud .medium a {
510   - color: #66CDAA;
511   -}
512   -
513   -.users-cloud .tiny a {
514   - color: #654321;
515   -}
516 531  
517 532 .no-subscribe-btn{
518 533 background-color: #BDBDBD !important;
... ... @@ -632,14 +647,6 @@ a.add-row {
632 647 background-color: initial;
633 648 }
634 649  
635   -.language-selector .dropdown-menu > .active > a {
636   - background: #EEEEEE;
637   - color: #009688;
638   -}
639   -
640   -.language-selector .dropdown-menu > .active > a:hover {
641   - color: #009688;
642   -}
643 650  
644 651 @media(max-width: 768px) {
645 652 .navbar .navbar-nav .dropdown .dropdown-menu li > a {
... ...
subjects/templates/subjects/initial.html
  Diff comments   View file @8f46f01
... ... @@ -14,7 +14,7 @@
14 14 {% endfor %}
15 15 {% endif %}
16 16  
17   - <h2 class=" my-subjects-title"><b><i>{% trans "Palavras-chave mais populares" %}</i></b></h2>
  17 + <h2 class=" my-subjects-title"><b><i>{% trans "Most popular keywords" %}</i></b></h2>
18 18 <div id="" class="col-md-12">
19 19 <div class="users-cloud div-users-cloud">
20 20 <ul class=" users-cloud">
... ... @@ -40,7 +40,7 @@
40 40 </div>
41 41  
42 42 <div class="col-md-12 cards-content">
43   - <h2 class=" my-subjects-title"><b><i>{% trans "Meus Assuntos" %} ({{ total_subs }})</i></b></h2>
  43 + <h2 class=" my-subjects-title"><b><i>{% trans "My Subjects" %} ({{ total_subs }})</i></b></h2>
44 44  
45 45 {% if subjects|length > 0 %}
46 46 <div class="panel-group" id="subject-accordion" role="tablist" aria-multiselectable="true">
... ...