diff --git a/app/assets/stylesheets/client/common.css.scss b/app/assets/stylesheets/client/common.css.scss index 688c53e87..9a5df1043 100644 --- a/app/assets/stylesheets/client/common.css.scss +++ b/app/assets/stylesheets/client/common.css.scss @@ -8,6 +8,7 @@ $ColorScreenPrimary: #ed3618; /* Orange */ $ColorElementPrimary: #0b6672; /* Teal */ $ColorText: #ffffff; /* White */ $ColorLink: #9ec030; /* Lime */ +$ColorSidebarText: #a0b9bd; $ColorScreenBackground: lighten($ColorUIBackground, 10%); $color1: #006AB6; /* mid blue */ diff --git a/app/assets/stylesheets/client/sidebar.css.scss b/app/assets/stylesheets/client/sidebar.css.scss index 503060f54..7db94b9d7 100644 --- a/app/assets/stylesheets/client/sidebar.css.scss +++ b/app/assets/stylesheets/client/sidebar.css.scss @@ -10,6 +10,7 @@ padding:0px; cursor:pointer; } + .panelcontents { overflow-y:auto; overflow-x:hidden; @@ -21,7 +22,7 @@ padding: 3px 0px 3px 10px; font-size: 180%; font-weight: 100; - color:#a0b9bd; + color: $ColorSidebarText; cursor:pointer; } @@ -64,25 +65,12 @@ margin-left: 0px; } - /*.expander {*/ - /*position:relative;*/ - /*text-align:right;*/ - /*padding: 0px 0px 8px 0px;*/ - /*}*/ - - /*.expander p span {*/ - /*padding: 0px 4px;*/ - /*margin: 0px 2px;*/ - /*background-color: $ColorElementPrimary;*/ - /*color: lighten($ColorElementPrimary, 15);*/ - /*}*/ - .search form { margin: 0px; padding: 0px; } - .search input[type="text"] { + input[type="text"] { background-color:#227985; border: solid 1px #01545f; font-weight:400; @@ -99,6 +87,10 @@ clear:both; } + li strong { + font-weight:bold; + } + li.offline { background-color: shade($ColorElementPrimary, 20); color: shade($text, 10); @@ -151,11 +143,6 @@ color:#FFF; } - /*li img {*/ - /*margin: 8px;*/ - /*float:left;*/ - /*}*/ - .name { display:block; position:absolute; @@ -179,5 +166,36 @@ font-family: LatoItalic, Arial, sans-serif; font-size: 100%; } + + #chat-fixed { + position:static; + } + .chat-select { + font-size:12px; + text-align:center; + margin-top:4px; + } + + .chat-select select { + font-family:Raleway; + font-size:12px; + color:$ColorSidebarText; + background-color:shade($ColorElementPrimary, 20); + border:none; + } + + .chat-text { + float:left; + width:180px; + font-size:11px; + margin-top:5px; + margin-bottom:5px; + color:#D5E2E4; + } + + .chat-text em { + color:#9DB8AF + } + } diff --git a/app/views/clients/_sidebar.html.erb b/app/views/clients/_sidebar.html.erb index 5f4504261..081fafcb6 100644 --- a/app/views/clients/_sidebar.html.erb +++ b/app/views/clients/_sidebar.html.erb @@ -87,44 +87,6 @@

- - @@ -136,10 +98,63 @@
-

chat

+

chat
48

- Chat contents go here. + +
+
+ + +
Send to:
+
+