Commit 3b8b3da40730ac3c571a4834f592201ff29e7bcf
1 parent
ad20219d
Exists in
master
and in
3 other branches
Adjusting icon colors and removing unnecessary icons
Showing
5 changed files
with
30 additions
and
16 deletions
Show diff stats
amadeus/static/css/themes/green.css
@@ -55,10 +55,26 @@ a, a:focus, a:hover { | @@ -55,10 +55,26 @@ a, a:focus, a:hover { | ||
55 | background-color: #015E96 !important; | 55 | background-color: #015E96 !important; |
56 | } | 56 | } |
57 | 57 | ||
58 | +.category-panel .category-header .category-card-items i { | ||
59 | + color: #014e7d; | ||
60 | +} | ||
61 | + | ||
62 | +.category-panel .category-header .category-card-items i:hover { | ||
63 | + color: #ffffff; | ||
64 | +} | ||
65 | + | ||
58 | .subject-panel > .panel-heading { | 66 | .subject-panel > .panel-heading { |
59 | background-color: #0277BD !important; | 67 | background-color: #0277BD !important; |
60 | } | 68 | } |
61 | 69 | ||
70 | +.subject-panel .category-header .category-card-items i { | ||
71 | + color: #0267a4; | ||
72 | +} | ||
73 | + | ||
74 | +.subject-panel .category-header .category-card-items i:hover { | ||
75 | + color: #ffffff; | ||
76 | +} | ||
77 | + | ||
62 | .group-panel > .panel-heading { | 78 | .group-panel > .panel-heading { |
63 | background-color: #FFFFFF !important; | 79 | background-color: #FFFFFF !important; |
64 | } | 80 | } |
@@ -76,6 +92,14 @@ a, a:focus, a:hover { | @@ -76,6 +92,14 @@ a, a:focus, a:hover { | ||
76 | background-color: #1d8fe0 !important; | 92 | background-color: #1d8fe0 !important; |
77 | } | 93 | } |
78 | 94 | ||
95 | +.topic-panel .category-header .category-card-items i { | ||
96 | + color: #1772b3; | ||
97 | +} | ||
98 | + | ||
99 | +.topic-panel .category-header .category-card-items i:hover { | ||
100 | + color: #ffffff; | ||
101 | +} | ||
102 | + | ||
79 | .topic-panel > .category-panel-content, .topic-panel-invisible > .category-panel-content { | 103 | .topic-panel > .category-panel-content, .topic-panel-invisible > .category-panel-content { |
80 | background: #FFFFFF; | 104 | background: #FFFFFF; |
81 | } | 105 | } |
@@ -102,7 +126,7 @@ a, a:focus, a:hover { | @@ -102,7 +126,7 @@ a, a:focus, a:hover { | ||
102 | } | 126 | } |
103 | 127 | ||
104 | .category-header .dropdown-menu i { | 128 | .category-header .dropdown-menu i { |
105 | - color: inherit; | 129 | + color: inherit !important; |
106 | } | 130 | } |
107 | 131 | ||
108 | #create-category { | 132 | #create-category { |
@@ -390,7 +414,11 @@ a.add-row { | @@ -390,7 +414,11 @@ a.add-row { | ||
390 | } | 414 | } |
391 | 415 | ||
392 | .resource_list .category-card-items i { | 416 | .resource_list .category-card-items i { |
393 | - color: #CCCCCC; | 417 | + color: #e5e5e5; |
418 | +} | ||
419 | + | ||
420 | +.resource_list .category-card-items i:hover { | ||
421 | + color: #7f7f7f; | ||
394 | } | 422 | } |
395 | 423 | ||
396 | .resource_list .category-card-items .dropdown-menu i { | 424 | .resource_list .category-card-items .dropdown-menu i { |
categories/templates/categories/list.html
@@ -76,8 +76,6 @@ | @@ -76,8 +76,6 @@ | ||
76 | {% endif %} | 76 | {% endif %} |
77 | <a href=""><i class="fa fa-bar-chart" aria-hidden="true"></i></a> | 77 | <a href=""><i class="fa fa-bar-chart" aria-hidden="true"></i></a> |
78 | <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a> | 78 | <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a> |
79 | - <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a> | ||
80 | - <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a> | ||
81 | </div> | 79 | </div> |
82 | </div> | 80 | </div> |
83 | </div> | 81 | </div> |
@@ -123,8 +121,6 @@ | @@ -123,8 +121,6 @@ | ||
123 | {% endif %} | 121 | {% endif %} |
124 | <a href=""><i class="fa fa-bar-chart" aria-hidden="true"></i></a> | 122 | <a href=""><i class="fa fa-bar-chart" aria-hidden="true"></i></a> |
125 | <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a> | 123 | <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a> |
126 | - <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a> | ||
127 | - <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a> | ||
128 | </div> | 124 | </div> |
129 | </div> | 125 | </div> |
130 | </div> | 126 | </div> |
subjects/templates/subjects/list.html
@@ -85,8 +85,6 @@ | @@ -85,8 +85,6 @@ | ||
85 | <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> | 85 | <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> |
86 | {% notifies_cat_number category request.user %} | 86 | {% notifies_cat_number category request.user %} |
87 | </a> | 87 | </a> |
88 | - <a href="" class="pull-right action_icon"><i class="fa fa-envelope-o" aria-hidden="true"></i></a> | ||
89 | - <a href="" class="pull-right action_icon"><i class="fa fa-list" aria-hidden="true"></i></a> | ||
90 | </div> | 88 | </div> |
91 | </div> | 89 | </div> |
92 | </div> | 90 | </div> |
@@ -153,8 +151,6 @@ | @@ -153,8 +151,6 @@ | ||
153 | <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> | 151 | <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> |
154 | {% notifies_cat_number category request.user %} | 152 | {% notifies_cat_number category request.user %} |
155 | </a> | 153 | </a> |
156 | - <a href="" class="pull-right action_icon"><i class="fa fa-envelope-o" aria-hidden="true"></i></a> | ||
157 | - <a href="" class="pull-right action_icon"><i class="fa fa-list" aria-hidden="true"></i></a> | ||
158 | </div> | 154 | </div> |
159 | </div> | 155 | </div> |
160 | </div> | 156 | </div> |
subjects/templates/subjects/subject_card.html
@@ -33,16 +33,12 @@ | @@ -33,16 +33,12 @@ | ||
33 | <li><a href="javascript:delete_subject.get('{% url 'subjects:delete' subject.slug %}?view=index','#subject','#modal_subject')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i> {% trans 'Remove' %}</a></li> | 33 | <li><a href="javascript:delete_subject.get('{% url 'subjects:delete' subject.slug %}?view=index','#subject','#modal_subject')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i> {% trans 'Remove' %}</a></li> |
34 | </ul> | 34 | </ul> |
35 | {% endif %} | 35 | {% endif %} |
36 | - | ||
37 | - | ||
38 | 36 | ||
39 | <a href="" class="pull-right action_icon"><i class="fa fa-bar-chart" aria-hidden="true"></i></a> | 37 | <a href="" class="pull-right action_icon"><i class="fa fa-bar-chart" aria-hidden="true"></i></a> |
40 | <a href="{% url 'notifications:view' subject.slug %}" class="pull-right action_icon"> | 38 | <a href="{% url 'notifications:view' subject.slug %}" class="pull-right action_icon"> |
41 | <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> | 39 | <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> |
42 | {% notifies_number subject request.user %} | 40 | {% notifies_number subject request.user %} |
43 | </a> | 41 | </a> |
44 | - <a href="" class="pull-right action_icon"><i class="fa fa-envelope-o" aria-hidden="true"></i></a> | ||
45 | - <a href="" class="pull-right action_icon"><i class="fa fa-list" aria-hidden="true"></i></a> | ||
46 | </div> | 42 | </div> |
47 | </div> | 43 | </div> |
48 | </div> | 44 | </div> |
subjects/templates/subjects/view.html
@@ -60,8 +60,6 @@ | @@ -60,8 +60,6 @@ | ||
60 | <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> | 60 | <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> |
61 | {% notifies_number subject request.user %} | 61 | {% notifies_number subject request.user %} |
62 | </a> | 62 | </a> |
63 | - <a href="" class="pull-right action_icon"><i class="fa fa-envelope-o" aria-hidden="true"></i></a> | ||
64 | - <a href="" class="pull-right action_icon"><i class="fa fa-list" aria-hidden="true"></i></a> | ||
65 | </div> | 63 | </div> |
66 | </div> | 64 | </div> |
67 | </div> | 65 | </div> |