Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Remove neat grid fm again. We won't be using it.

Browse Source
This commit is contained in:
JC Brand 2014-12-31 12:17:01 +01:00
parent d02838eaee
commit b176545605
3 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
css/converse.css
View File

@ -27,10 +27,6 @@
content: "\e600"; } content: "\e600"; }
#conversejs { #conversejs {
/* Neat 1.7.0
* http://neat.bourbon.io
* Copyright 2012-2014 thoughtbot, inc.
* MIT License */
color: #6C4C44; color: #6C4C44;
font-size: 14px; font-size: 14px;
bottom: 0; bottom: 0;
@ -46,14 +42,10 @@
box-sizing: border-box; box-sizing: border-box;
/* @group Tabs */ /* @group Tabs */
/* status dropdown styles */ } /* status dropdown styles */ }
#conversejs html { #conversejs *, #conversejs *:before, #conversejs *:after {
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; } box-sizing: border-box; }
#conversejs *, #conversejs *:before, #conversejs *:after {
-webkit-box-sizing: inherit;
-moz-box-sizing: inherit;
box-sizing: inherit; }
#conversejs a, #conversejs a:visited { #conversejs a, #conversejs a:visited {
text-decoration: none; text-decoration: none;
color: #436F64; color: #436F64;
@ -462,8 +454,6 @@
border: 0; border: 0;
background-color: #ffffff; background-color: #ffffff;
line-height: 1.3em; line-height: 1.3em;
box-sizing: border-box;
-moz-box-sizing: border-box;
height: 206px; height: 206px;
height: calc(100% - 84px); } height: calc(100% - 84px); }
#conversejs .chat-info { #conversejs .chat-info {
@ -1073,9 +1063,9 @@
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
border: 0; border: 0;
height: 64px; height: 64px;
padding: 8px; padding: 0.5em;
resize: none; width: 100%;
width: 100%; } resize: none; }
#conversejs .chat-toolbar { #conversejs .chat-toolbar {
font-size: 14px; font-size: 14px;
margin: 0; margin: 0;
@ -1229,5 +1219,3 @@
margin-left: 0; margin-left: 0;
cursor: n-resize; cursor: n-resize;
z-index: 20; } z-index: 20; }
/*# sourceMappingURL=converse.css.map */

7
css/converse.css.map Normal file
View File

File diff suppressed because one or more lines are too long

11
sass/converse.scss
View File

@ -32,7 +32,6 @@
#conversejs { #conversejs {
@import "../bourbon/bourbon"; @import "../bourbon/bourbon";
@import "../components/neat/app/assets/stylesheets/neat";
@import "variables"; @import "variables";
color: $text-color; color: $text-color;
@ -45,7 +44,11 @@
right: 0; right: 0;
z-index: 30; z-index: 30;
display: block; display: block;
@include box-sizing(border-box); @include box-sizing(border-box);
*, *:before, *:after {
@include box-sizing(border-box);
}
a, a:visited { a, a:visited {
text-decoration: none; text-decoration: none;
@ -393,8 +396,6 @@
border: 0; border: 0;
background-color: #ffffff; background-color: #ffffff;
line-height: 1.3em; line-height: 1.3em;
box-sizing: border-box;
-moz-box-sizing: border-box;
height: 206px; height: 206px;
height: calc(100% - #{$toolbar-height + $chat-textarea-height}); height: calc(100% - #{$toolbar-height + $chat-textarea-height});
} }
@ -1240,9 +1241,9 @@
@include border-bottom-radius(4px); @include border-bottom-radius(4px);
border: 0; border: 0;
height: $chat-textarea-height; height: $chat-textarea-height;
padding: 8px; padding: 0.5em;
resize: none;
width: 100%; width: 100%;
resize: none;
} }
} }