From 33b419fe2b130fd162df09d0160740ab536a18a1 Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard Date: Tue, 5 Jan 2016 23:13:33 -0600 Subject: [PATCH 1/2] Add syndicate tgui style; overhaul colors --- tgui/assets/tgui.css | 2 +- tgui/colors.json | 75 +++++++++++++++++++--------- tgui/images/nanotrasen.svg | 2 +- tgui/images/syndicate.svg | 9 ++++ tgui/styles/components/bar.styl | 4 +- tgui/styles/components/button.styl | 12 ++--- tgui/styles/components/display.styl | 6 +-- tgui/styles/components/notice.styl | 16 +++--- tgui/styles/components/resize.styl | 2 +- tgui/styles/components/titlebar.styl | 10 ++-- tgui/styles/core/document.styl | 6 +-- tgui/styles/core/text.styl | 2 +- tgui/styles/styles/nanotrasen.styl | 4 +- tgui/styles/styles/syndicate.styl | 5 ++ 14 files changed, 97 insertions(+), 58 deletions(-) create mode 100644 tgui/images/syndicate.svg create mode 100644 tgui/styles/styles/syndicate.styl diff --git a/tgui/assets/tgui.css b/tgui/assets/tgui.css index aaa092768ba..b8ac6f4daa0 100644 --- a/tgui/assets/tgui.css +++ b/tgui/assets/tgui.css @@ -1 +1 @@ -.normal{color:#40628a}.good{color:#537d29}.average{color:#be6209}.bad{color:#b00e0e}.highlight,.label{color:#8ba5c4}.dark{color:#272727}html{box-sizing:border-box;min-height:100%;margin:0;cursor:default}*,:after,:before{box-sizing:inherit}body{min-height:100%;height:100%;margin:0 6px;background-color:#202020;font-family:Verdana,Geneva,sans-serif;font-size:12px;color:#fff}main{display:block;margin-top:32px;padding-top:3px}hr{height:2px;background-color:#40628a;border:none}h1,h2,h3,h4{display:inline-block;margin:0;padding:6px 0}h1{font-size:18px}h2{font-size:16px}h3{font-size:14px}h4{font-size:12px}.bar .barText,span.button{color:#fff;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}.bold{font-weight:700}.italic{font-style:italic}[unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #40628a;background:#272727}.bar .barText{position:absolute;top:0;right:3px}.bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#40628a}.bar .barFill.good{background-color:#537d29}.bar .barFill.average{background-color:#be6209}.bar .barFill.bad{background-color:#b00e0e}.bar .barFill.highlight{background-color:#8ba5c4}span.button{display:inline-block;vertical-align:middle;height:20px;line-height:19px;padding:0 5px;white-space:nowrap}span.button .fa{padding-right:2px}span.button.normal{transition:background-color .5s;background-color:#40628a}span.button.normal.active:focus,span.button.normal.active:hover{transition:background-color .25s;background-color:#4f78aa;outline:0}span.button.disabled{transition:background-color .5s;background-color:#999}span.button.disabled.active:focus,span.button.disabled.active:hover{transition:background-color .25s;background-color:#a8a8a8;outline:0}span.button.selected{transition:background-color .5s;background-color:#2f943c}span.button.selected.active:focus,span.button.selected.active:hover{transition:background-color .25s;background-color:#3ab84b;outline:0}span.button.caution{transition:background-color .5s;background-color:#9a9d00}span.button.caution.active:focus,span.button.caution.active:hover{transition:background-color .25s;background-color:#ced200;outline:0}span.button.danger{transition:background-color .5s;background-color:#9d0808}span.button.danger.active:focus,span.button.danger.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}span.button.gridable{width:125px;margin:2px 0}div.display,div.notice{width:100%;padding:4px;margin:6px 0;background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000);background-color:rgba(0,0,0,.33);box-shadow:inset 0 0 5px rgba(0,0,0,.5)}div.display header,div.notice header,div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;border-bottom:2px solid #40628a}div.display header .buttonRight,div.notice header .buttonRight,div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}div.display article,div.notice article,div.subdisplay article{display:table;width:100%;border-spacing:4px 6px}div.notice{background-color:#bb9b68;background-image:repeating-linear-gradient(-45deg,#bb9b68,#bb9b68 10px,#b1905d 0,#b1905d 20px);margin:8px 0;box-shadow:none;color:#000;font-weight:700;font-style:italic}div.notice .button{outline:1px solid #272727}div.notice .label{color:#000}div.notice hr{background-color:#272727}div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #363636;-webkit-transform:rotate(1turn);-ms-transform:rotate(1turn);transform:rotate(1turn)}section .content,section .label,section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle}section{display:table-row;width:100%;padding:3px 0}section:not(first-child){padding-top:4px}section .label{width:1%;padding-right:32px;white-space:nowrap;color:#8ba5c4}section .content:not(:last-child){padding-right:16px}section .line{width:100%}section .buttoninfo{margin-left:5px}div.subdisplay{width:100%;margin:0}header.titlebar .close,header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#98b0c3}header.titlebar .close:hover,header.titlebar .minimize:hover{color:#a7bccc}header.titlebar{position:fixed;top:0;left:0;width:100%;height:32px;background-color:#363636;box-shadow:0 3px 3px rgba(0,0,0,.1)}header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}header.titlebar .title{position:absolute;top:6px;left:46px;color:#98b0c3;font-size:16px;white-space:nowrap}header.titlebar .minimize{position:absolute;top:6px;right:46px}header.titlebar .close{position:absolute;top:4px;right:12px}.wf-inactive .minimize:after{content:"-"}.wf-inactive .close:after{content:"X"}body.generic{background:linear-gradient(180deg,#2a2a2a 0,#202020)}body.generic,body.nanotrasen{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2a2a2a',endColorstr='#ff202020',GradientType=0)}body.nanotrasen{background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjAiIHZpZXdCb3g9IjAgMCA0MjUgMjAwIiBvcGFjaXR5PSIuMjUiPgogIDxwYXRoIGQ9Im0gMTc4LjAwMzk5LDAuMDM4NjkgLTcxLjIwMzkzLDAgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIC02Ljc2MTM0LDYuMDI1NTUgbCAwLDE4Ny44NzE0NyBhIDYuNzYxMzQyMiw2LjAyNTU0OTUgMCAwIDAgNi43NjEzNCw2LjAyNTU0IGwgNTMuMTA3MiwwIGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA2Ljc2MTM1LC02LjAyNTU0IGwgMCwtMTAxLjU0NDAxOCA3Mi4yMTYyOCwxMDQuNjk5Mzk4IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA1Ljc2MDE1LDIuODcwMTYgbCA3My41NTQ4NywwIGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA2Ljc2MTM1LC02LjAyNTU0IGwgMCwtMTg3Ljg3MTQ3IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCAtNi43NjEzNSwtNi4wMjU1NSBsIC01NC43MTY0NCwwIGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCAtNi43NjEzMyw2LjAyNTU1IGwgMCwxMDIuNjE5MzUgTCAxODMuNzY0MTMsMi45MDg4NiBhIDYuNzYxMzQyMiw2LjAyNTU0OTUgMCAwIDAgLTUuNzYwMTQsLTIuODcwMTcgeiIgLz4KICA8cGF0aCBkPSJNIDQuODQ0NjMzMywyMi4xMDg3NSBBIDEzLjQxMjAzOSwxMi41MDE4NDIgMCAwIDEgMTMuNDc3NTg4LDAuMDM5MjQgbCA2Ni4xMTgzMTUsMCBhIDUuMzY0ODE1OCw1LjAwMDczNyAwIDAgMSA1LjM2NDgyMyw1LjAwMDczIGwgMCw3OS44NzkzMSB6IiAvPgogIDxwYXRoIGQ9Im0gNDIwLjE1NTM1LDE3Ny44OTExOSBhIDEzLjQxMjAzOCwxMi41MDE4NDIgMCAwIDEgLTguNjMyOTUsMjIuMDY5NTEgbCAtNjYuMTE4MzIsMCBhIDUuMzY0ODE1Miw1LjAwMDczNyAwIDAgMSAtNS4zNjQ4MiwtNS4wMDA3NCBsIDAsLTc5Ljg3OTMxIHoiIC8+Cjwvc3ZnPgo=") no-repeat fixed center/70% 70%,linear-gradient(180deg,#2a2a2a 0,#202020)} \ No newline at end of file +.normal{color:#40628a}.good{color:#537d29}.average{color:#be6209}.bad{color:#b00e0e}.highlight,.label{color:#8ba5c4}html{box-sizing:border-box;min-height:100%;margin:0;cursor:default}*,:after,:before{box-sizing:inherit}body{min-height:100%;height:100%;margin:0 6px;font-family:Verdana,Geneva,sans-serif;font-size:12px;color:#fff}main{display:block;margin-top:32px;padding-top:3px}hr{height:2px;background-color:#40628a;border:none}h1,h2,h3,h4{display:inline-block;margin:0;padding:6px 0}h1{font-size:18px}h2{font-size:16px}h3{font-size:14px}h4{font-size:12px}.bar .barText,span.button{color:#fff;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}.bold{font-weight:700}.italic{font-style:italic}[unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #40628a;background:#272727}.bar .barText{position:absolute;top:0;right:3px}.bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#40628a}.bar .barFill.good{background-color:#537d29}.bar .barFill.average{background-color:#be6209}.bar .barFill.bad{background-color:#b00e0e}.bar .barFill.highlight{background-color:#8ba5c4}span.button{display:inline-block;vertical-align:middle;height:20px;line-height:19px;padding:0 5px;white-space:nowrap}span.button .fa{padding-right:2px}span.button.normal{transition:background-color .5s;background-color:#40628a}span.button.normal.active:focus,span.button.normal.active:hover{transition:background-color .25s;background-color:#4f78aa;outline:0}span.button.disabled{transition:background-color .5s;background-color:#999}span.button.disabled.active:focus,span.button.disabled.active:hover{transition:background-color .25s;background-color:#a8a8a8;outline:0}span.button.selected{transition:background-color .5s;background-color:#2f943c}span.button.selected.active:focus,span.button.selected.active:hover{transition:background-color .25s;background-color:#3ab84b;outline:0}span.button.caution{transition:background-color .5s;background-color:#9a9d00}span.button.caution.active:focus,span.button.caution.active:hover{transition:background-color .25s;background-color:#ced200;outline:0}span.button.danger{transition:background-color .5s;background-color:#9d0808}span.button.danger.active:focus,span.button.danger.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}span.button.gridable{width:125px;margin:2px 0}div.display,div.notice{width:100%;padding:4px;margin:6px 0;background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000);background-color:rgba(0,0,0,.33);box-shadow:inset 0 0 5px rgba(0,0,0,.5)}div.display header,div.notice header,div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;border-bottom:2px solid #40628a}div.display header .buttonRight,div.notice header .buttonRight,div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}div.display article,div.notice article,div.subdisplay article{display:table;width:100%;border-spacing:4px 6px}div.notice{background-image:repeating-linear-gradient(-45deg,#bb9b68,#bb9b68 10px,#b1905d 0,#b1905d 20px);margin:8px 0;box-shadow:none;color:#000;font-weight:700;font-style:italic}div.notice .button{outline:1px solid #272727}div.notice .label{color:#000}div.notice hr{background-color:#272727}div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #363636;-webkit-transform:rotate(1turn);-ms-transform:rotate(1turn);transform:rotate(1turn)}section .content,section .label,section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle}section{display:table-row;width:100%;padding:3px 0}section:not(first-child){padding-top:4px}section .label{width:1%;padding-right:32px;white-space:nowrap;color:#8ba5c4}section .content:not(:last-child){padding-right:16px}section .line{width:100%}section .buttoninfo{margin-left:5px}div.subdisplay{width:100%;margin:0}header.titlebar .close,header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#98b0c3}header.titlebar .close:hover,header.titlebar .minimize:hover{color:#a7bccc}header.titlebar{position:fixed;top:0;left:0;width:100%;height:32px;background-color:#363636;box-shadow:0 3px 3px rgba(0,0,0,.1)}header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}header.titlebar .title{position:absolute;top:6px;left:46px;color:#98b0c3;font-size:16px;white-space:nowrap}header.titlebar .minimize{position:absolute;top:6px;right:46px}header.titlebar .close{position:absolute;top:4px;right:12px}.wf-inactive .minimize:after{content:"-"}.wf-inactive .close:after{content:"X"}body.generic{background:linear-gradient(180deg,0,100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff000000',endColorstr='#ff000000',GradientType=0)}body.nanotrasen{background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjAiIHZpZXdCb3g9IjAgMCA0MjUgMjAwIiBvcGFjaXR5PSIuMzMiPgogIDxwYXRoIGQ9Im0gMTc4LjAwMzk5LDAuMDM4NjkgLTcxLjIwMzkzLDAgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIC02Ljc2MTM0LDYuMDI1NTUgbCAwLDE4Ny44NzE0NyBhIDYuNzYxMzQyMiw2LjAyNTU0OTUgMCAwIDAgNi43NjEzNCw2LjAyNTU0IGwgNTMuMTA3MiwwIGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA2Ljc2MTM1LC02LjAyNTU0IGwgMCwtMTAxLjU0NDAxOCA3Mi4yMTYyOCwxMDQuNjk5Mzk4IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA1Ljc2MDE1LDIuODcwMTYgbCA3My41NTQ4NywwIGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA2Ljc2MTM1LC02LjAyNTU0IGwgMCwtMTg3Ljg3MTQ3IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCAtNi43NjEzNSwtNi4wMjU1NSBsIC01NC43MTY0NCwwIGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCAtNi43NjEzMyw2LjAyNTU1IGwgMCwxMDIuNjE5MzUgTCAxODMuNzY0MTMsMi45MDg4NiBhIDYuNzYxMzQyMiw2LjAyNTU0OTUgMCAwIDAgLTUuNzYwMTQsLTIuODcwMTcgeiIgLz4KICA8cGF0aCBkPSJNIDQuODQ0NjMzMywyMi4xMDg3NSBBIDEzLjQxMjAzOSwxMi41MDE4NDIgMCAwIDEgMTMuNDc3NTg4LDAuMDM5MjQgbCA2Ni4xMTgzMTUsMCBhIDUuMzY0ODE1OCw1LjAwMDczNyAwIDAgMSA1LjM2NDgyMyw1LjAwMDczIGwgMCw3OS44NzkzMSB6IiAvPgogIDxwYXRoIGQ9Im0gNDIwLjE1NTM1LDE3Ny44OTExOSBhIDEzLjQxMjAzOCwxMi41MDE4NDIgMCAwIDEgLTguNjMyOTUsMjIuMDY5NTEgbCAtNjYuMTE4MzIsMCBhIDUuMzY0ODE1Miw1LjAwMDczNyAwIDAgMSAtNS4zNjQ4MiwtNS4wMDA3NCBsIDAsLTc5Ljg3OTMxIHoiIC8+Cjwvc3ZnPgo=") no-repeat fixed center/70% 70%,linear-gradient(180deg,#2a2a2a 0,#202020);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2a2a2a',endColorstr='#ff202020',GradientType=0)}body.syndicate{background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjAiIHZpZXdCb3g9IjAgMCA4NS4yNSAxMTQuMzUiIG9wYWNpdHk9Ii4zMyI+CiAgPHRleHQKICAgIHN0eWxlPSJmb250LXNpemU6MjAwcHg7Zm9udC1mYW1pbHk6J1ZlcmRhbmEnLHNhbnMtc2VyaWYiCiAgICB4PSItMTAuNzQyMTg4IgogICAgeT0iMTExLjcxODc1Ij4KICAgIDx0c3Bhbj5zPC90c3Bhbj4KICA8L3RleHQ+Cjwvc3ZnPgo=") no-repeat fixed center/70% 70%,linear-gradient(180deg,#b30f0f 0,#740d0d);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb30f0f',endColorstr='#ff740d0d',GradientType=0)} \ No newline at end of file diff --git a/tgui/colors.json b/tgui/colors.json index b3bad42f0b8..fe73bc9ed61 100644 --- a/tgui/colors.json +++ b/tgui/colors.json @@ -1,26 +1,53 @@ { - "normal":"#40628a", - "good":"#537d29", - "average":"#be6209", - "bad":"#b00e0e", - "highlight":"#8ba5c4", - "info":"#e9C183", - "label":"#8ba5c4", - "dark":"#272727", - "title":"#98b0c3", - "text":"white", - "textinverse":"black", - "titlebar":"#363636", - "background-start":"#2a2a2a", - "background-end":"#202020", - "resize":"#363636", - "border":"#272727", - "rule":"#40628a", - "notice1":"#bb9b68", - "notice2":"#b1905d", - "hover":"15%", - "selected":"#2f943c", - "caution":"#9a9d00", - "danger":"#9d0808", - "disabled":"#999999" + "normal": "#40628a", + "good": "#537d29", + "average": "#be6209", + "bad": "#b00e0e", + "highlight": "#8ba5c4", + "label": "#8ba5c4", + "text": { + "normal": "white", + "inverse": "black", + "title": "#98b0c3" + }, + "rule": { + "normal": "#40628a", + "dark": "#272727" + }, + "titlebar": { + "background": "#363636", + "shadow": "alpha(#000, 0.1)" + }, + "resize": { + "border": "#363636" + }, + "display": { + "background": "alpha(#000, 0.33)", + "shadow": "alpha(#000, 0.5)" + }, + "notice": { + "first": "#bb9b68", + "second": "#b1905d", + "border": "#272727" + }, + "bar": { + "border": "#40628a", + "background": "#272727" + }, + "buttons": { + "normal": "#40628a", + "disabled": "#999999", + "selected": "#2f943c", + "caution": "#9a9d00", + "danger": "#9d0808", + "hover": "15%" + }, + "nanotrasen": { + "background-start": "#2a2a2a", + "background-end": "#202020" + }, + "syndicate": { + "background-start": "#b30f0f", + "background-end": "#740d0d" + } } diff --git a/tgui/images/nanotrasen.svg b/tgui/images/nanotrasen.svg index d93b01a9545..b4b09a1ac46 100644 --- a/tgui/images/nanotrasen.svg +++ b/tgui/images/nanotrasen.svg @@ -1,5 +1,5 @@ - + diff --git a/tgui/images/syndicate.svg b/tgui/images/syndicate.svg new file mode 100644 index 00000000000..4bae2c70cba --- /dev/null +++ b/tgui/images/syndicate.svg @@ -0,0 +1,9 @@ + + + + s + + diff --git a/tgui/styles/components/bar.styl b/tgui/styles/components/bar.styl index c55738dac5c..d2bae9d82f7 100644 --- a/tgui/styles/components/bar.styl +++ b/tgui/styles/components/bar.styl @@ -7,8 +7,8 @@ line-height: 17px padding: 1px - border: 1px solid colors.normal - background: colors.dark + border: 1px solid colors.bar.border + background: colors.bar.background .barText @extend $fontReset diff --git a/tgui/styles/components/button.styl b/tgui/styles/components/button.styl index 554193488be..a396ae1cf88 100644 --- a/tgui/styles/components/button.styl +++ b/tgui/styles/components/button.styl @@ -5,7 +5,7 @@ buttoncolor(selector, color) &.{selector}.active:hover, &.{selector}.active:focus transition: background-color 0.25s - background-color: lighten(color, colors.hover) + background-color: lighten(color, colors.buttons.hover) outline: 0 @@ -21,11 +21,11 @@ span.button .fa padding-right: 2px - buttoncolor(normal, colors.normal) - buttoncolor(disabled, colors.disabled) - buttoncolor(selected, colors.selected) - buttoncolor(caution, colors.caution) - buttoncolor(danger, colors.danger) + buttoncolor(normal, colors.buttons.normal) + buttoncolor(disabled, colors.buttons.disabled) + buttoncolor(selected, colors.buttons.selected) + buttoncolor(caution, colors.buttons.caution) + buttoncolor(danger, colors.buttons.danger) &.gridable width: 125px diff --git a/tgui/styles/components/display.styl b/tgui/styles/components/display.styl index 0dd58c482e5..dbae05996d1 100644 --- a/tgui/styles/components/display.styl +++ b/tgui/styles/components/display.styl @@ -3,8 +3,8 @@ div.display padding: 4px margin: 6px 0 - background-color: alpha(#000, 0.33) // Transparent background. - box-shadow: inset 0 0 5px alpha(#000, 0.5) + background-color: colors.display.background // Transparent background. + box-shadow: inset 0 0 5px colors.display.shadow header display: block @@ -13,7 +13,7 @@ div.display padding: 0 4px margin-bottom: 6px - border-bottom: 2px solid colors.rule + border-bottom: 2px solid colors.rule.normal .buttonRight position: absolute diff --git a/tgui/styles/components/notice.styl b/tgui/styles/components/notice.styl index 999631aadb0..37f462579c4 100644 --- a/tgui/styles/components/notice.styl +++ b/tgui/styles/components/notice.styl @@ -4,10 +4,10 @@ $noticeStripes background-color: colors.notice1 // Fallback for old browers. background-image: repeating-linear-gradient( -45deg, - colors.notice1, - colors.notice1 10px, - colors.notice2 10px, - colors.notice2 20px + colors.notice.first, + colors.notice.first 10px, + colors.notice.second 10px, + colors.notice.second 20px ) div.notice @@ -16,15 +16,15 @@ div.notice box-shadow: none - color: colors.textinverse + color: colors.text.inverse font-weight: bold font-style: italic .button - outline: 1px solid colors.border + outline: 1px solid colors.notice.border .label - color: colors.textinverse + color: colors.text.inverse hr - background-color: colors.border + background-color: colors.rule.dark diff --git a/tgui/styles/components/resize.styl b/tgui/styles/components/resize.styl index 74cc43c0a0a..482b0db0de9 100644 --- a/tgui/styles/components/resize.styl +++ b/tgui/styles/components/resize.styl @@ -7,6 +7,6 @@ div.resize border-style: solid; border-width: 0 0 45px 45px; - border-color: transparent transparent colors.resize transparent + border-color: transparent transparent colors.resize.border transparent transform: rotate(360deg) diff --git a/tgui/styles/components/titlebar.styl b/tgui/styles/components/titlebar.styl index 7d9f36e1827..312977c94bb 100644 --- a/tgui/styles/components/titlebar.styl +++ b/tgui/styles/components/titlebar.styl @@ -4,10 +4,10 @@ $titleButton padding: 7px // To make a bigger clickable area. margin: -7px - color: colors.title; + color: colors.text.title; &:hover - color: lighten(colors.title, colors.hover) + color: lighten(colors.text.title, colors.buttons.hover) header.titlebar position: fixed; @@ -16,8 +16,8 @@ header.titlebar width: 100%; height: 32px; - background-color: colors.titlebar - box-shadow: 0 3px 3px alpha(#000, 0.1) + background-color: colors.titlebar.background + box-shadow: 0 3px 3px colors.titlebar.shadow .statusicon position: absolute @@ -30,7 +30,7 @@ header.titlebar top: 6px left: 46px - color: colors.title + color: colors.text.title font-size: 16px white-space: nowrap diff --git a/tgui/styles/core/document.styl b/tgui/styles/core/document.styl index ba2822cad88..6406c3635d2 100644 --- a/tgui/styles/core/document.styl +++ b/tgui/styles/core/document.styl @@ -14,11 +14,9 @@ body height: 100% margin: 0 6px - background-color: colors.background-end; // Fallback for old browsers. - font-family: font font-size: fontsize - color: colors.text + color: colors.text.normal main display: block @@ -28,5 +26,5 @@ main hr height: 2px - background-color: colors.rule + background-color: colors.rule.normal border: none diff --git a/tgui/styles/core/text.styl b/tgui/styles/core/text.styl index 387cc59f0b1..14f2cbd8857 100644 --- a/tgui/styles/core/text.styl +++ b/tgui/styles/core/text.styl @@ -1,6 +1,6 @@ // Helper to reset font options to default. $fontReset - color: colors.text + color: colors.text.normal font-size: fontsize font-weight: normal font-style: normal diff --git a/tgui/styles/styles/nanotrasen.styl b/tgui/styles/styles/nanotrasen.styl index 0625ef88dff..192c98f612d 100644 --- a/tgui/styles/styles/nanotrasen.styl +++ b/tgui/styles/styles/nanotrasen.styl @@ -1,5 +1,5 @@ body.nanotrasen background: data-url('nanotrasen.svg') no-repeat fixed center/70% 70%, linear-gradient(to bottom, - colors.background-start 0%, - colors.background-end 100%) + colors.nanotrasen.background-start 0%, + colors.nanotrasen.background-end 100%) diff --git a/tgui/styles/styles/syndicate.styl b/tgui/styles/styles/syndicate.styl new file mode 100644 index 00000000000..5577a96354b --- /dev/null +++ b/tgui/styles/styles/syndicate.styl @@ -0,0 +1,5 @@ +body.syndicate + background: data-url('syndicate.svg') no-repeat fixed center/70% 70%, + linear-gradient(to bottom, + colors.syndicate.background-start 0%, + colors.syndicate.background-end 100%) From 0acc8971483cd19438db00a73d7d4690f055eef4 Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard Date: Tue, 5 Jan 2016 23:17:54 -0600 Subject: [PATCH 2/2] Remove some junk colors --- tgui/assets/tgui.css | 2 +- tgui/colors.json | 4 +++- tgui/styles/components/section.styl | 2 +- tgui/styles/core/colors.styl | 4 ---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tgui/assets/tgui.css b/tgui/assets/tgui.css index b8ac6f4daa0..a79f25a2dbf 100644 --- a/tgui/assets/tgui.css +++ b/tgui/assets/tgui.css @@ -1 +1 @@ -.normal{color:#40628a}.good{color:#537d29}.average{color:#be6209}.bad{color:#b00e0e}.highlight,.label{color:#8ba5c4}html{box-sizing:border-box;min-height:100%;margin:0;cursor:default}*,:after,:before{box-sizing:inherit}body{min-height:100%;height:100%;margin:0 6px;font-family:Verdana,Geneva,sans-serif;font-size:12px;color:#fff}main{display:block;margin-top:32px;padding-top:3px}hr{height:2px;background-color:#40628a;border:none}h1,h2,h3,h4{display:inline-block;margin:0;padding:6px 0}h1{font-size:18px}h2{font-size:16px}h3{font-size:14px}h4{font-size:12px}.bar .barText,span.button{color:#fff;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}.bold{font-weight:700}.italic{font-style:italic}[unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #40628a;background:#272727}.bar .barText{position:absolute;top:0;right:3px}.bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#40628a}.bar .barFill.good{background-color:#537d29}.bar .barFill.average{background-color:#be6209}.bar .barFill.bad{background-color:#b00e0e}.bar .barFill.highlight{background-color:#8ba5c4}span.button{display:inline-block;vertical-align:middle;height:20px;line-height:19px;padding:0 5px;white-space:nowrap}span.button .fa{padding-right:2px}span.button.normal{transition:background-color .5s;background-color:#40628a}span.button.normal.active:focus,span.button.normal.active:hover{transition:background-color .25s;background-color:#4f78aa;outline:0}span.button.disabled{transition:background-color .5s;background-color:#999}span.button.disabled.active:focus,span.button.disabled.active:hover{transition:background-color .25s;background-color:#a8a8a8;outline:0}span.button.selected{transition:background-color .5s;background-color:#2f943c}span.button.selected.active:focus,span.button.selected.active:hover{transition:background-color .25s;background-color:#3ab84b;outline:0}span.button.caution{transition:background-color .5s;background-color:#9a9d00}span.button.caution.active:focus,span.button.caution.active:hover{transition:background-color .25s;background-color:#ced200;outline:0}span.button.danger{transition:background-color .5s;background-color:#9d0808}span.button.danger.active:focus,span.button.danger.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}span.button.gridable{width:125px;margin:2px 0}div.display,div.notice{width:100%;padding:4px;margin:6px 0;background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000);background-color:rgba(0,0,0,.33);box-shadow:inset 0 0 5px rgba(0,0,0,.5)}div.display header,div.notice header,div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;border-bottom:2px solid #40628a}div.display header .buttonRight,div.notice header .buttonRight,div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}div.display article,div.notice article,div.subdisplay article{display:table;width:100%;border-spacing:4px 6px}div.notice{background-image:repeating-linear-gradient(-45deg,#bb9b68,#bb9b68 10px,#b1905d 0,#b1905d 20px);margin:8px 0;box-shadow:none;color:#000;font-weight:700;font-style:italic}div.notice .button{outline:1px solid #272727}div.notice .label{color:#000}div.notice hr{background-color:#272727}div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #363636;-webkit-transform:rotate(1turn);-ms-transform:rotate(1turn);transform:rotate(1turn)}section .content,section .label,section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle}section{display:table-row;width:100%;padding:3px 0}section:not(first-child){padding-top:4px}section .label{width:1%;padding-right:32px;white-space:nowrap;color:#8ba5c4}section .content:not(:last-child){padding-right:16px}section .line{width:100%}section .buttoninfo{margin-left:5px}div.subdisplay{width:100%;margin:0}header.titlebar .close,header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#98b0c3}header.titlebar .close:hover,header.titlebar .minimize:hover{color:#a7bccc}header.titlebar{position:fixed;top:0;left:0;width:100%;height:32px;background-color:#363636;box-shadow:0 3px 3px rgba(0,0,0,.1)}header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}header.titlebar .title{position:absolute;top:6px;left:46px;color:#98b0c3;font-size:16px;white-space:nowrap}header.titlebar .minimize{position:absolute;top:6px;right:46px}header.titlebar .close{position:absolute;top:4px;right:12px}.wf-inactive .minimize:after{content:"-"}.wf-inactive .close:after{content:"X"}body.generic{background:linear-gradient(180deg,0,100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff000000',endColorstr='#ff000000',GradientType=0)}body.nanotrasen{background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjAiIHZpZXdCb3g9IjAgMCA0MjUgMjAwIiBvcGFjaXR5PSIuMzMiPgogIDxwYXRoIGQ9Im0gMTc4LjAwMzk5LDAuMDM4NjkgLTcxLjIwMzkzLDAgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIC02Ljc2MTM0LDYuMDI1NTUgbCAwLDE4Ny44NzE0NyBhIDYuNzYxMzQyMiw2LjAyNTU0OTUgMCAwIDAgNi43NjEzNCw2LjAyNTU0IGwgNTMuMTA3MiwwIGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA2Ljc2MTM1LC02LjAyNTU0IGwgMCwtMTAxLjU0NDAxOCA3Mi4yMTYyOCwxMDQuNjk5Mzk4IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA1Ljc2MDE1LDIuODcwMTYgbCA3My41NTQ4NywwIGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA2Ljc2MTM1LC02LjAyNTU0IGwgMCwtMTg3Ljg3MTQ3IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCAtNi43NjEzNSwtNi4wMjU1NSBsIC01NC43MTY0NCwwIGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCAtNi43NjEzMyw2LjAyNTU1IGwgMCwxMDIuNjE5MzUgTCAxODMuNzY0MTMsMi45MDg4NiBhIDYuNzYxMzQyMiw2LjAyNTU0OTUgMCAwIDAgLTUuNzYwMTQsLTIuODcwMTcgeiIgLz4KICA8cGF0aCBkPSJNIDQuODQ0NjMzMywyMi4xMDg3NSBBIDEzLjQxMjAzOSwxMi41MDE4NDIgMCAwIDEgMTMuNDc3NTg4LDAuMDM5MjQgbCA2Ni4xMTgzMTUsMCBhIDUuMzY0ODE1OCw1LjAwMDczNyAwIDAgMSA1LjM2NDgyMyw1LjAwMDczIGwgMCw3OS44NzkzMSB6IiAvPgogIDxwYXRoIGQ9Im0gNDIwLjE1NTM1LDE3Ny44OTExOSBhIDEzLjQxMjAzOCwxMi41MDE4NDIgMCAwIDEgLTguNjMyOTUsMjIuMDY5NTEgbCAtNjYuMTE4MzIsMCBhIDUuMzY0ODE1Miw1LjAwMDczNyAwIDAgMSAtNS4zNjQ4MiwtNS4wMDA3NCBsIDAsLTc5Ljg3OTMxIHoiIC8+Cjwvc3ZnPgo=") no-repeat fixed center/70% 70%,linear-gradient(180deg,#2a2a2a 0,#202020);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2a2a2a',endColorstr='#ff202020',GradientType=0)}body.syndicate{background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjAiIHZpZXdCb3g9IjAgMCA4NS4yNSAxMTQuMzUiIG9wYWNpdHk9Ii4zMyI+CiAgPHRleHQKICAgIHN0eWxlPSJmb250LXNpemU6MjAwcHg7Zm9udC1mYW1pbHk6J1ZlcmRhbmEnLHNhbnMtc2VyaWYiCiAgICB4PSItMTAuNzQyMTg4IgogICAgeT0iMTExLjcxODc1Ij4KICAgIDx0c3Bhbj5zPC90c3Bhbj4KICA8L3RleHQ+Cjwvc3ZnPgo=") no-repeat fixed center/70% 70%,linear-gradient(180deg,#b30f0f 0,#740d0d);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb30f0f',endColorstr='#ff740d0d',GradientType=0)} \ No newline at end of file +.normal{color:#40628a}.good{color:#537d29}.average{color:#be6209}.bad{color:#b00e0e}.highlight{color:#8ba5c4}html{box-sizing:border-box;min-height:100%;margin:0;cursor:default}*,:after,:before{box-sizing:inherit}body{min-height:100%;height:100%;margin:0 6px;font-family:Verdana,Geneva,sans-serif;font-size:12px;color:#fff}main{display:block;margin-top:32px;padding-top:3px}hr{height:2px;background-color:#40628a;border:none}h1,h2,h3,h4{display:inline-block;margin:0;padding:6px 0}h1{font-size:18px}h2{font-size:16px}h3{font-size:14px}h4{font-size:12px}.bar .barText,span.button{color:#fff;font-size:12px;font-weight:400;font-style:normal;text-decoration:none}.bold{font-weight:700}.italic{font-style:italic}[unselectable=on]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.bar{display:inline-block;position:relative;vertical-align:middle;width:100%;height:20px;line-height:17px;padding:1px;border:1px solid #40628a;background:#272727}.bar .barText{position:absolute;top:0;right:3px}.bar .barFill{display:block;height:100%;transition:background-color 1s;background-color:#40628a}.bar .barFill.good{background-color:#537d29}.bar .barFill.average{background-color:#be6209}.bar .barFill.bad{background-color:#b00e0e}.bar .barFill.highlight{background-color:#8ba5c4}span.button{display:inline-block;vertical-align:middle;height:20px;line-height:19px;padding:0 5px;white-space:nowrap}span.button .fa{padding-right:2px}span.button.normal{transition:background-color .5s;background-color:#40628a}span.button.normal.active:focus,span.button.normal.active:hover{transition:background-color .25s;background-color:#4f78aa;outline:0}span.button.disabled{transition:background-color .5s;background-color:#999}span.button.disabled.active:focus,span.button.disabled.active:hover{transition:background-color .25s;background-color:#a8a8a8;outline:0}span.button.selected{transition:background-color .5s;background-color:#2f943c}span.button.selected.active:focus,span.button.selected.active:hover{transition:background-color .25s;background-color:#3ab84b;outline:0}span.button.caution{transition:background-color .5s;background-color:#9a9d00}span.button.caution.active:focus,span.button.caution.active:hover{transition:background-color .25s;background-color:#ced200;outline:0}span.button.danger{transition:background-color .5s;background-color:#9d0808}span.button.danger.active:focus,span.button.danger.active:hover{transition:background-color .25s;background-color:#ce0b0b;outline:0}span.button.gridable{width:125px;margin:2px 0}div.display,div.notice{width:100%;padding:4px;margin:6px 0;background-color:#000;-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000)";filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#54000000,endColorStr=#54000000);background-color:rgba(0,0,0,.33);box-shadow:inset 0 0 5px rgba(0,0,0,.5)}div.display header,div.notice header,div.subdisplay header{display:block;position:relative;width:100%;padding:0 4px;margin-bottom:6px;border-bottom:2px solid #40628a}div.display header .buttonRight,div.notice header .buttonRight,div.subdisplay header .buttonRight{position:absolute;bottom:6px;right:4px}div.display article,div.notice article,div.subdisplay article{display:table;width:100%;border-spacing:4px 6px}div.notice{background-image:repeating-linear-gradient(-45deg,#bb9b68,#bb9b68 10px,#b1905d 0,#b1905d 20px);margin:8px 0;box-shadow:none;color:#000;font-weight:700;font-style:italic}div.notice .button{outline:1px solid #272727}div.notice .label{color:#000}div.notice hr{background-color:#272727}div.resize{position:fixed;bottom:0;right:0;width:0;height:0;border-style:solid;border-width:0 0 45px 45px;border-color:transparent transparent #363636;-webkit-transform:rotate(1turn);-ms-transform:rotate(1turn);transform:rotate(1turn)}section .content,section .label,section .line{display:table-cell;margin:0;text-align:left;vertical-align:middle}section{display:table-row;width:100%;padding:3px 0}section:not(first-child){padding-top:4px}section .label{width:1%;padding-right:32px;white-space:nowrap;color:#8ba5c4}section .content:not(:last-child){padding-right:16px}section .line{width:100%}section .buttoninfo{margin-left:5px}div.subdisplay{width:100%;margin:0}header.titlebar .close,header.titlebar .minimize{display:inline-block;position:relative;padding:7px;margin:-7px;color:#98b0c3}header.titlebar .close:hover,header.titlebar .minimize:hover{color:#a7bccc}header.titlebar{position:fixed;top:0;left:0;width:100%;height:32px;background-color:#363636;box-shadow:0 3px 3px rgba(0,0,0,.1)}header.titlebar .statusicon{position:absolute;top:4px;left:12px;transition:color .5s}header.titlebar .title{position:absolute;top:6px;left:46px;color:#98b0c3;font-size:16px;white-space:nowrap}header.titlebar .minimize{position:absolute;top:6px;right:46px}header.titlebar .close{position:absolute;top:4px;right:12px}.wf-inactive .minimize:after{content:"-"}.wf-inactive .close:after{content:"X"}body.generic{background:linear-gradient(180deg,0,100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff000000',endColorstr='#ff000000',GradientType=0)}body.nanotrasen{background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjAiIHZpZXdCb3g9IjAgMCA0MjUgMjAwIiBvcGFjaXR5PSIuMzMiPgogIDxwYXRoIGQ9Im0gMTc4LjAwMzk5LDAuMDM4NjkgLTcxLjIwMzkzLDAgYSA2Ljc2MTM0MjIsNi4wMjU1NDk1IDAgMCAwIC02Ljc2MTM0LDYuMDI1NTUgbCAwLDE4Ny44NzE0NyBhIDYuNzYxMzQyMiw2LjAyNTU0OTUgMCAwIDAgNi43NjEzNCw2LjAyNTU0IGwgNTMuMTA3MiwwIGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA2Ljc2MTM1LC02LjAyNTU0IGwgMCwtMTAxLjU0NDAxOCA3Mi4yMTYyOCwxMDQuNjk5Mzk4IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA1Ljc2MDE1LDIuODcwMTYgbCA3My41NTQ4NywwIGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCA2Ljc2MTM1LC02LjAyNTU0IGwgMCwtMTg3Ljg3MTQ3IGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCAtNi43NjEzNSwtNi4wMjU1NSBsIC01NC43MTY0NCwwIGEgNi43NjEzNDIyLDYuMDI1NTQ5NSAwIDAgMCAtNi43NjEzMyw2LjAyNTU1IGwgMCwxMDIuNjE5MzUgTCAxODMuNzY0MTMsMi45MDg4NiBhIDYuNzYxMzQyMiw2LjAyNTU0OTUgMCAwIDAgLTUuNzYwMTQsLTIuODcwMTcgeiIgLz4KICA8cGF0aCBkPSJNIDQuODQ0NjMzMywyMi4xMDg3NSBBIDEzLjQxMjAzOSwxMi41MDE4NDIgMCAwIDEgMTMuNDc3NTg4LDAuMDM5MjQgbCA2Ni4xMTgzMTUsMCBhIDUuMzY0ODE1OCw1LjAwMDczNyAwIDAgMSA1LjM2NDgyMyw1LjAwMDczIGwgMCw3OS44NzkzMSB6IiAvPgogIDxwYXRoIGQ9Im0gNDIwLjE1NTM1LDE3Ny44OTExOSBhIDEzLjQxMjAzOCwxMi41MDE4NDIgMCAwIDEgLTguNjMyOTUsMjIuMDY5NTEgbCAtNjYuMTE4MzIsMCBhIDUuMzY0ODE1Miw1LjAwMDczNyAwIDAgMSAtNS4zNjQ4MiwtNS4wMDA3NCBsIDAsLTc5Ljg3OTMxIHoiIC8+Cjwvc3ZnPgo=") no-repeat fixed center/70% 70%,linear-gradient(180deg,#2a2a2a 0,#202020);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2a2a2a',endColorstr='#ff202020',GradientType=0)}body.syndicate{background:url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjAiIHZpZXdCb3g9IjAgMCA4NS4yNSAxMTQuMzUiIG9wYWNpdHk9Ii4zMyI+CiAgPHRleHQKICAgIHN0eWxlPSJmb250LXNpemU6MjAwcHg7Zm9udC1mYW1pbHk6J1ZlcmRhbmEnLHNhbnMtc2VyaWYiCiAgICB4PSItMTAuNzQyMTg4IgogICAgeT0iMTExLjcxODc1Ij4KICAgIDx0c3Bhbj5zPC90c3Bhbj4KICA8L3RleHQ+Cjwvc3ZnPgo=") no-repeat fixed center/70% 70%,linear-gradient(180deg,#b30f0f 0,#740d0d);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb30f0f',endColorstr='#ff740d0d',GradientType=0)} \ No newline at end of file diff --git a/tgui/colors.json b/tgui/colors.json index fe73bc9ed61..15feaa91db4 100644 --- a/tgui/colors.json +++ b/tgui/colors.json @@ -4,7 +4,6 @@ "average": "#be6209", "bad": "#b00e0e", "highlight": "#8ba5c4", - "label": "#8ba5c4", "text": { "normal": "white", "inverse": "black", @@ -30,6 +29,9 @@ "second": "#b1905d", "border": "#272727" }, + "section": { + "label": "#8ba5c4" + }, "bar": { "border": "#40628a", "background": "#272727" diff --git a/tgui/styles/components/section.styl b/tgui/styles/components/section.styl index 0ba06f8cc56..4cf55f5db7c 100644 --- a/tgui/styles/components/section.styl +++ b/tgui/styles/components/section.styl @@ -18,7 +18,7 @@ section padding-right: 32px white-space: nowrap - color: colors.label + color: colors.section.label .content @extend $cell diff --git a/tgui/styles/core/colors.styl b/tgui/styles/core/colors.styl index ae588547b89..ceb979aeaa0 100644 --- a/tgui/styles/core/colors.styl +++ b/tgui/styles/core/colors.styl @@ -8,7 +8,3 @@ color: colors.bad .highlight color: colors.highlight -.label - color: colors.label -.dark - color: colors.dark