Commit 64a58f7a authored by JC Brand's avatar JC Brand

Some more tweaks and remove skeleton-sass, will try bourbon-neat instead.

parent b01b4b55
......@@ -33,8 +33,9 @@
}
#conversejs {
@import "components/skeleton-sass/skeleton";
@import "components/neat/app/assets/stylesheets/neat";
/* XXX: These should be moved to a separate file */
$link-color: #436F64;
$link-shadow-color: #FAFAFA;
$text-shadow-color: #FAFAFA;
......@@ -57,13 +58,24 @@
$chat-width: 200px;
$chat-height: 400px;
color: $text-color;
font-size: $font-size;
bottom: 0;
direction: ltr;
height: 25px;
left: 0;
position: fixed;
right: 0;
z-index: 30;
display: block;
@include box-sizing(border-box);
a, a:visited {
text-decoration: none;
color: $link-color;
text-shadow: none;
}
div { box-sizing: border-box; }
ul li { height: auto; }
div, span, h1, h2, h3, h4, h5, h6, p, blockquote,
pre, a, em, img, strong, dl, dt, dd, ol, ul, li,
......@@ -78,12 +90,17 @@
vertical-align: baseline;
}
input[type=submit] {
margin-top: 5px;
}
textarea,
input[type=text], input[type=password],
button {
font-size: $font-size;
padding: 0.5em;
min-height: 0;
margin: 5px 0;
}
strong {
......@@ -103,20 +120,6 @@
margin: 0 0 15px 0;
}
color: $text-color;
font-size: $font-size;
bottom: 0;
direction: ltr;
height: 25px;
left: 0;
position: fixed;
right: 0;
z-index: 30;
display: block;
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
[data-icon]:before {
font-family: 'Converse-js';
content: attr(data-icon);
......@@ -238,11 +241,7 @@
.no-text-select {
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: -moz-none;
-ms-user-select: none;
user-select: none;
@include user-select(none);
}
.emoticon {
......@@ -794,21 +793,18 @@
.filter-type {
display: table-cell;
height: 24px;
padding: 0;
margin: 0 0 0.5em -2px;
display: inline-block;
padding: 0;
width: 85px;
font-size: $font-size;
}
.roster-filter {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAABNSURBVHjaXI7BDcAwCAMvyQjMyQ6dAbZiKfqoUK34g2zJh1dENIC7M8pMAPYdzAVY3d0ajNz9aypS/b5R6o+ZPdqoKgCq6h80KH3xDgBqNR97p8oAGQAAAABJRU5ErkJggg== ) no-repeat right -20px center;
border: 1px solid #999;
display: table-cell;
padding: 2px;
height: 24px;
margin: 0 0 0.5em 6px;
padding: 2px;
width: 104px;
height: 24px;
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAABNSURBVHjaXI7BDcAwCAMvyQjMyQ6dAbZiKfqoUK34g2zJh1dENIC7M8pMAPYdzAVY3d0ajNz9aypS/b5R6o+ZPdqoKgCq6h80KH3xDgBqNR97p8oAGQAAAABJRU5ErkJggg== ) no-repeat right -20px center;
border: 1px solid #999;
display: inline-block;
}
/* (jQ addClass:) if input has value: */
.roster-filter.x {
......@@ -880,15 +876,14 @@
}
dd.available-chatroom {
display: inline-block;
overflow-x: hidden;
text-overflow: ellipsis;
white-space: nowrap;
display: inline-block;
}
dd.available-chatroom a.open-room {
a.open-room {
width: 148px;
}
}
#available-chatrooms {
text-align: left;
......@@ -1021,10 +1016,6 @@
.chatroom {
width: 300px;
label {
margin-left: 2px;
font-size: 12px;
}
.box-flyout {
width: 300px;
}
......@@ -1125,6 +1116,7 @@
#converse-login input {
width: 100%;
height: 30px;
margin: 5px 0;
}
#converse-register {
......@@ -1166,8 +1158,6 @@
#converse-register label,
#converse-login label {
height: auto;
font-size: $font-size;
margin: 4px;
font-weight: bold;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment