Commit abd8cf35 authored by JC Brand's avatar JC Brand

Some CSS tweaks to make converse.js look better in a bootstrap site.

parent c1d48b6f
...@@ -75,6 +75,8 @@ ...@@ -75,6 +75,8 @@
font-size: 14px; font-size: 14px;
padding: 0.25em; padding: 0.25em;
min-height: 0; } min-height: 0; }
#conversejs input[type=text] {
height: 25px; }
#conversejs strong { #conversejs strong {
font-weight: 700; } font-weight: 700; }
#conversejs ol, #conversejs ul { #conversejs ol, #conversejs ul {
...@@ -96,10 +98,14 @@ ...@@ -96,10 +98,14 @@
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; } -moz-osx-font-smoothing: grayscale; }
#conversejs [class^="icon-"], #conversejs [class*=" icon-"] { #conversejs [class^="icon-"], #conversejs [class*=" icon-"] {
background-position: 14px 14px;
background-image: none;
font-family: 'Converse-js'; font-family: 'Converse-js';
font-style: normal; font-style: normal;
font-variant: normal; font-variant: normal;
font-weight: normal; font-weight: normal;
width: auto;
height: auto;
line-height: 1; line-height: 1;
speak: none; speak: none;
text-transform: none; text-transform: none;
...@@ -306,30 +312,14 @@ ...@@ -306,30 +312,14 @@
padding-right: 22px; } padding-right: 22px; }
@-webkit-keyframes spin { @-webkit-keyframes spin {
from { from {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg); }
-moz-transform: rotate(0deg);
-ms-transform: rotate(0deg);
-o-transform: rotate(0deg);
transform: rotate(0deg); }
to { to {
-webkit-transform: rotate(359deg); -webkit-transform: rotate(359deg); } }
-moz-transform: rotate(359deg);
-ms-transform: rotate(359deg);
-o-transform: rotate(359deg);
transform: rotate(359deg); } }
@-moz-keyframes spin { @-moz-keyframes spin {
from { from {
-webkit-transform: rotate(0deg); -moz-transform: rotate(0deg); }
-moz-transform: rotate(0deg);
-ms-transform: rotate(0deg);
-o-transform: rotate(0deg);
transform: rotate(0deg); }
to { to {
-webkit-transform: rotate(359deg); -moz-transform: rotate(359deg); } }
-moz-transform: rotate(359deg);
-ms-transform: rotate(359deg);
-o-transform: rotate(359deg);
transform: rotate(359deg); } }
@keyframes spin { @keyframes spin {
from { from {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
......
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
* Licensed under the Mozilla Public License * Licensed under the Mozilla Public License
*/ */
@import "../ruby/1.9.1/gems/bourbon-4.2.1/app/assets/stylesheets/_bourbon";
@font-face { @font-face {
font-family: 'Converse-js'; font-family: 'Converse-js';
src: url('../fonticons/fonts/icomoon.eot?-mnoxh0'); src: url('../fonticons/fonts/icomoon.eot?-mnoxh0');
...@@ -31,7 +33,6 @@ ...@@ -31,7 +33,6 @@
} }
#conversejs { #conversejs {
@import "../bourbon/bourbon";
@import "variables"; @import "variables";
::selection { ::selection {
...@@ -87,6 +88,10 @@ ...@@ -87,6 +88,10 @@
min-height: 0; min-height: 0;
} }
input[type=text] {
height: 26px;
}
strong { strong {
font-weight: 700; font-weight: 700;
} }
...@@ -118,10 +123,14 @@ ...@@ -118,10 +123,14 @@
} }
[class^="icon-"], [class*=" icon-"] { [class^="icon-"], [class*=" icon-"] {
background-position: 14px 14px;
background-image: none;
font-family: 'Converse-js'; font-family: 'Converse-js';
font-style: normal; font-style: normal;
font-variant: normal; font-variant: normal;
font-weight: normal; font-weight: normal;
width: auto;
height: auto;
line-height: 1; line-height: 1;
speak: none; speak: none;
text-transform: none; text-transform: none;
......
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