Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Make minor noticeable in body scans #285

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

[MIRROR] Make minor noticeable in body scans #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b16c8b
Merge pull request #1029 from SierraKomodo/medical-minor-highlights
afterthought2 Dec 14, 2020
00e2cfa
Make minor noticeable in body scans
SkyratBot Dec 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions code/_helpers/medical_scans.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@
else if(I["is_bruised"])
row += "<td><span class='average'>Moderate</span></td>"
else if(I["is_damaged"])
row += "<td>Minor</td>"
row += "<td><span class='mild'>Minor</span></td>"
else
row += "<td>None</td>"
row += "<td>"
Expand Down Expand Up @@ -367,7 +367,6 @@
/proc/get_severity(amount, var/tag = FALSE)
if(!amount)
return "none"
. = "minor"
if(amount > 50)
if(tag)
. = "<span class='bad'>severe</span>"
Expand All @@ -382,4 +381,9 @@
if(tag)
. = "<span class='average'>moderate</span>"
else
. = "moderate"
. = "moderate"
else
if (tag)
.= "<span class='mild'>minor</span>"
else
.= "minor"
57 changes: 34 additions & 23 deletions html/browser/common.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
body
{
body
{
padding: 0;
margin: 0;
background-color: #272727;
Expand All @@ -15,8 +15,8 @@ hr
}

a, a:link, a:visited, a:active, .linkOn, .linkOff, input
{
color: #ffffff;
{
color: #ffffff;
text-decoration: none;
background: #3f595e;
border: 1px solid #161616;
Expand All @@ -26,15 +26,15 @@ a, a:link, a:visited, a:active, .linkOn, .linkOff, input
white-space:nowrap;
}

a:hover
{
a:hover
{
color: #3f595e;
background: #ffffff;
}

a.white, a.white:link, a.white:visited, a.white:active
{
color: #3f595e;
{
color: #3f595e;
text-decoration: none;
background: #ffffff;
border: 1px solid #161616;
Expand All @@ -43,22 +43,22 @@ a.white, a.white:link, a.white:visited, a.white:active
cursor:default;
}

a.white:hover
{
a.white:hover
{
color: #ffffff;
background: #3f595e;
}

.linkOn, a.linkOn:link, a.linkOn:visited, a.linkOn:active, a.linkOn:hover
{
color: #ffffff;
{
color: #ffffff;
background: #aa5f36;
border-color: #202020;
}

.linkOff, a.linkOff:link, a.linkOff:visited, a.linkOff:active, a.linkOff:hover
{
color: #ffffff;
{
color: #ffffff;
background: #999999;
border-color: #666666;
}
Expand Down Expand Up @@ -90,15 +90,15 @@ li
padding: 0 0 2px 0;
}

img, a img
{
border-style:none;
img, a img
{
border-style:none;
}

h1, h2, h3, h4, h5, h6
{
margin: 0;
padding: 16px 0 8px 0;
padding: 16px 0 8px 0;
color: #517087;
}

Expand Down Expand Up @@ -148,7 +148,7 @@ h4
right:0px;
z-index: 10
}

.uiTitleButtons
{
position:fixed;
Expand All @@ -167,7 +167,7 @@ h4
}

.uiContent
{
{
clear: both;
padding: 8px;
font-family: Verdana, Geneva, sans-serif;
Expand All @@ -178,9 +178,14 @@ h4
color: #00ff00;
}

.mild
{
color: #e0d000;
}

.average
{
color: #d09000;
color: #f09000;
}

.bad
Expand Down Expand Up @@ -210,7 +215,7 @@ h4
}

.notice.icon
{
{
padding: 2px 4px 0 20px;
}

Expand Down Expand Up @@ -274,10 +279,16 @@ div.notice
background: #00ff00;
}

.progressFill.mild
{
color: #ffffff;
background: #e0d000;
}

.progressFill.average
{
color: #ffffff;
background: #d09000;
background: #f09000;
}

.progressFill.bad
Expand Down
37 changes: 37 additions & 0 deletions html/changelogs/sierrakomodo-medical-minor-highlights.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# admin
#################################

# Your name.
author: SierraKomodo

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- tweak: "'Mild' labels in medical scans are now highlighted in yellow and bold to make them more noticeable."
9 changes: 7 additions & 2 deletions nano/css/shared.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,11 @@ abbr {
font-weight: bold;
}

.mild {
color: #cda500;
font-weight: bold;
}

.average {
color: #00ff00;
font-weight: bold;
Expand Down Expand Up @@ -576,7 +581,7 @@ div.notice {
text-align: center;
}

table.fixed {
table.fixed {
table-layout:fixed;
}

Expand Down Expand Up @@ -711,4 +716,4 @@ th.bot {
.redacted {
background-color: black;
color: black;
}
}