Skip to content

Commit 80f9bce

Browse files
authored
Merge branch 'dev' into jq-update
2 parents be9b840 + f164994 commit 80f9bce

File tree

6 files changed

+18
-0
lines changed

6 files changed

+18
-0
lines changed

Ion.egg-info/SOURCES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -945,6 +945,7 @@ intranet/static/css/dark/enrichment.scss
945945
intranet/static/css/dark/events.scss
946946
intranet/static/css/dark/files.scss
947947
intranet/static/css/dark/login.scss
948+
intranet/static/css/dark/logs.scss
948949
intranet/static/css/dark/lostfound.scss
949950
intranet/static/css/dark/nav.scss
950951
intranet/static/css/dark/oauth.scss

intranet/settings/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@
385385
"dark/eighth.schedule",
386386
"dark/oauth",
387387
"dark/sessionmgmt",
388+
"dark/logs",
388389
]
389390

390391
for name in LIST_OF_INDEPENDENT_CSS:

intranet/static/css/dark/logs.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
tr.shade:nth-child(even) {
2+
background-color: #292929;
3+
}
4+
5+
th.sticky {
6+
background-color: #121212;
7+
}

intranet/static/css/logs.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ td {
5757
color: green;
5858
}
5959

60+
tr.shade:nth-child(even) {
61+
background-color: #e7e7e7;
62+
}
63+
6064
.key-red {
6165
color: rgb(153, 0, 0);
6266
}

intranet/static/js/eighth/signup.search.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@ $(function() {
9696
show = true;
9797
}
9898
}
99+
// description
100+
if (activity.description.toLowerCase().indexOf(search) !== -1) {
101+
show = true;
102+
}
99103

100104
var cmd = search.split(":");
101105
if (cmd.length > 1) {

intranet/templates/logs/home.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
{% if dark_mode_enabled %}
2121
{% stylesheet 'dark/base' %}
2222
{% stylesheet 'dark/nav' %}
23+
{% stylesheet 'dark/logs' %}
2324
{% endif %}
2425
{% endblock %}
2526

0 commit comments

Comments
 (0)