diff --git a/public/css/_variables.styl b/public/css/_variables.styl index 5d70147..99ac32c 100644 --- a/public/css/_variables.styl +++ b/public/css/_variables.styl @@ -13,6 +13,19 @@ $dkgray = #202020 $blue = #00aeef $dkblue = #006991 +// new colors + +$activeBlue = #00aeef +$actionPink = #ec008c + +$sidebarBg = #0b1316 +$sidebarActive = #192a47 + +$baseText = #565656 +$textSecondary = #b7b7b7 + +$grayBackground = #f7f7f7 +$grayOutline = #e4e4e4 // font sizes diff --git a/public/css/app/chat.styl b/public/css/app/chat.styl index ae46453..394a46e 100644 --- a/public/css/app/chat.styl +++ b/public/css/app/chat.styl @@ -115,7 +115,7 @@ .chatBox borderbox() - border-top: 1px solid rgba(0,0,0,.08) + border-top: 1px solid $grayOutline bottom: 0px position: fixed right: 0px @@ -123,11 +123,8 @@ z-index: 200 form - gradient: #e1e4e6 #cacdce + background: $grayBackground padding: 11px - border-top: 1px solid #fff - border-left: 1px solid #ddd - border-right: 1px solid #ddd .formwrap borderbox() @@ -139,22 +136,20 @@ background-color: #fff width: 100% height: 30px - border: 1px solid #ccc - border-top-color: #bbb - roundall: 5px - innerShadow: rgba(0,0,0,.1) 0 -1px 3px + border: 1px solid $grayOutline + roundall: 3px line-height: 18px outline: none resize: none color: #222f3b font-size: 14px -webkit-font-smoothing: antialiased + -webkit-appearance: none padding: 5px borderbox() &:focus border-color: #bbb - border-top-color: #aaa &.editing background-color: yellow diff --git a/public/css/otalk.css b/public/css/otalk.css index 482bb09..a7b6b56 100644 --- a/public/css/otalk.css +++ b/public/css/otalk.css @@ -570,7 +570,7 @@ td { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - border-top: 1px solid rgba(0,0,0,0.08); + border-top: 1px solid #e4e4e4; bottom: 0px; position: fixed; right: 0px; @@ -578,13 +578,8 @@ td { z-index: 200; } .chatBox form { - background: #e1e4e6; - background-image: -moz-linear-gradient(top, #e1e4e6, #cacdce); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #e1e4e6), color-stop(1, #cacdce)); + background: #f7f7f7; padding: 11px; - border-top: 1px solid #fff; - border-left: 1px solid #ddd; - border-right: 1px solid #ddd; } .chatBox .formwrap { -moz-box-sizing: border-box; @@ -598,23 +593,20 @@ td { background-color: #fff; width: 100%; height: 30px; - border: 1px solid #ccc; - border-top-color: #bbb; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - -khtml-border-radius: 5px; - -o-border-radius: 5px; - -border-radius: 5px; - border-radius: 5px; - -moz-box-shadow: inset rgba(0,0,0,0.1) 0 -1px 3px; - -webkit-box-shadow: inset rgba(0,0,0,0.1) 0 -1px 3px; - box-shadow: inset rgba(0,0,0,0.1) 0 -1px 3px; + border: 1px solid #e4e4e4; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + -khtml-border-radius: 3px; + -o-border-radius: 3px; + -border-radius: 3px; + border-radius: 3px; line-height: 18px; outline: none; resize: none; color: #222f3b; font-size: 14px; -webkit-font-smoothing: antialiased; + -webkit-appearance: none; padding: 5px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -622,7 +614,6 @@ td { } .chatBox textarea:focus { border-color: #bbb; - border-top-color: #aaa; } .chatBox textarea.editing { background-color: #ff0;