Add skeleton-sass and convert css files to scss.

This commit is contained in:
JC Brand 2014-12-13 00:14:11 +01:00
parent 889d5cf5c9
commit 063e31e39e
5 changed files with 2130 additions and 1761 deletions

View File

@ -3,9 +3,10 @@ BOWER ?= node_modules/.bin/bower
BUILDDIR = ./docs
PAPER =
PHANTOMJS ?= node_modules/.bin/phantomjs
SPHINXBUILD = ./bin/sphinx-build
SPHINXBUILD ?= ./bin/sphinx-build
SPHINXOPTS =
POTOJSON ?= node_modules/.bin/po2json
PO2JSON ?= node_modules/.bin/po2json
SASS ?= sass
# Internal variables.
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) ./docs/source
@ -42,7 +43,7 @@ po:
merge: po
po2json:
find ./locale -maxdepth 1 -mindepth 1 -type d -exec $(POTOJSON) -p -f jed -d converse {}/LC_MESSAGES/converse.po {}/LC_MESSAGES/converse.json \;
find ./locale -maxdepth 1 -mindepth 1 -type d -exec $(PO2JSON) -p -f jed -d converse {}/LC_MESSAGES/converse.po {}/LC_MESSAGES/converse.json \;
########################################################################
## Release management
@ -88,8 +89,7 @@ dev: clean
## Builds
css::
./node_modules/.bin/lessc less/styles.less > css/theme.css
./node_modules/.bin/lessc less/converse.less > css/converse.css
${SASS} sass/converse.scss > css/converse.css
build::
./node_modules/.bin/grunt jst

View File

@ -29,7 +29,8 @@
"bootstrapJS": "https://raw.githubusercontent.com/jcbrand/bootstrap/7d96a5f60d26c67b5348b270a775518b96a702c8/dist/js/bootstrap.js",
"fontawesome": "~4.1.0",
"typeahead.js": "https://raw.githubusercontent.com/jcbrand/typeahead.js/eedfb10505dd3a20123d1fafc07c1352d83f0ab3/dist/typeahead.jquery.js",
"strophejs-plugins": "https://github.com/strophe/strophejs-plugins.git#conversejs"
"strophejs-plugins": "https://github.com/strophe/strophejs-plugins.git#conversejs",
"skeleton-sass": "~2.0.3"
},
"exportsOverride": {}
}

File diff suppressed because it is too large Load Diff

View File

@ -3,7 +3,7 @@ body {
height: 100%;
font-family: "Lora", "Helvetica Neue", Helvetica, Arial, sans-serif;
color: #ffffff;
background-color: #000000;
background-color: #211018;
}
html {
width: 100%;
@ -34,7 +34,7 @@ p {
}
}
a {
color: #66ccff;
color: #82B397;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
@ -52,7 +52,7 @@ a:focus {
border-bottom: 1px solid rgba(255, 255, 255, 0.3);
text-transform: uppercase;
font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif;
background-color: #000000;
background-color: #211018;
}
.navbar-brand {
font-weight: 700;
@ -95,7 +95,7 @@ a:focus {
}
.top-nav-collapse {
padding: 0;
background-color: #000000;
background-color: #211018;
}
.navbar-custom.top-nav-collapse {
border-bottom: 1px solid rgba(255, 255, 255, 0.3);
@ -113,17 +113,17 @@ a:focus {
}
.intro {
background: url(images/header.jpg) no-repeat bottom center scroll;
background-color: #000;
background-color: #211018;
-webkit-background-size: cover;
-moz-background-size: cover;
background-size: cover;
-o-background-size: cover;
}
.features-section {
background: url('images/bgtr.svg') top right no-repeat, url('images/bgbl.svg') bottom left no-repeat, url('images/bgbl.svg') bottom left no-repeat, url('images/overlay.png'), linear-gradient(45deg, #b39c68, #a56365, #412e4c);
background: url('images/bgtr.svg') top right no-repeat, url('images/bgbl.svg') bottom left no-repeat, url('images/bgbl.svg') bottom left no-repeat, url('images/overlay.png'), linear-gradient(45deg, #85505f, #384955, #655361);
}
.features-section a {
color: #66ccff;
color: #82B397;
}
.outro {
background: url('images/bgtr.svg') top right no-repeat, url('images/bgbl.svg') bottom left no-repeat, url('images/overlay.png'), linear-gradient(45deg, #384955, #655361, #85505f);
@ -186,6 +186,7 @@ a:focus {
-webkit-animation-timing-function: linear;
-moz-animation-timing-function: linear;
}
/*
@-webkit-keyframes pulse {
0 {
-webkit-transform: scale(1);
@ -214,6 +215,7 @@ a:focus {
transform: scale(1);
}
}
*/
.content-section {
padding-top: 100px;
}
@ -221,7 +223,7 @@ a:focus {
width: 100%;
padding: 50px 0;
color: #ffffff;
background-color: #000000;
background-color: #211018;
}
.donate-section p.bitcoin-header {
margin: 0 0 5px;
@ -244,16 +246,16 @@ a:focus {
transition: all 0.3s ease-in-out;
}
.btn-default {
border: 1px solid #66ccff;
color: #66ccff;
border: 1px solid #82B397;
color: #82B397;
background-color: transparent;
}
.btn-default:hover,
.btn-default:focus {
border: 1px solid #66ccff;
border: 1px solid #82B397;
outline: none;
color: #000000;
background-color: #66ccff;
color: #211018;
background-color: #82B397;
}
.btn-huge {
padding: 25px;

View File

@ -8,7 +8,6 @@
@import "bourbon/bourbon";
@font-face {
font-family: 'Converse-js';
src: url('../fonticons/fonts/icomoon.eot?-mnoxh0');
@ -34,7 +33,64 @@
}
#conversejs {
color: #4f4f4f;
@import "components/skeleton-sass/skeleton";
$link-color: #436F64;
$link-shadow-color: #FAFAFA;
$text-shadow-color: #FAFAFA;
$text-color: #6C4C44;
$border-color: #CCC;
$warning-color: #681F2C;
$light-background-border-color: #F1DCD6;
$light-background-color: #F1E2DD;
$icon-color: #114327;
$highlight-color: #E3C9C1;
$chat-head-color: #436F64;
$chatroom-head-color: #0F592F;
$chat-head-text-color: white;
$chat-head-height: 40px;
$save-button-color: #436F64;
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,
fieldset, form, label, legend, table, caption, tbody,
tfoot, thead, tr, th, td, article, aside, canvas, details,
embed, figure, figcaption, footer, header, hgroup, menu,
nav, output, ruby, section, summary, time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font: inherit;
vertical-align: baseline;
}
strong {
font-weight: 700;
}
ol, ul {
list-style: none;
}
li {
height: 10px;
}
ul, ol, dl {
font: inherit;
margin: 0 0 15px 0;
}
color: $text-color;
font-size: 14px;
bottom: 0;
direction: ltr;
@ -122,7 +178,6 @@
.icon-newspaper:before { content: "\e001"; }
.icon-notebook:before { content: "\2710"; }
.icon-notification:before { content: "\e01f"; }
.icon-offline:before { content: "\e002"; }
.icon-online:before { content: "\25fc"; }
.icon-opened:before { content: "\25bc"; }
.icon-pencil:before { content: "\270e"; }
@ -146,7 +201,6 @@
.icon-strikethrough:before { content: "\e050"; }
.icon-thumbs-up:before { content: "\261d"; }
.icon-tongue:before { content: "\e038"; }
.icon-unavailable:before,
.icon-underline:before { content: "\e04e"; }
.icon-unlocked:before { content: "\e025"; }
.icon-user:before { content: "\e01a"; }
@ -163,6 +217,8 @@
.icon-wondering:before { content: "\2369"; }
.icon-wrench:before { content: "\e024"; }
.icon-xa:before,
.icon-unavailable:before,
.icon-offline:before { content: "\e002"; }
.icon-youtube:before { content: "\e055"; }
.icon-zoom-in:before { content: "\e02b"; }
.icon-zoom-out:before { content: "\e02a"; }
@ -176,45 +232,6 @@
user-select: 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,
fieldset, form, label, legend, table, caption, tbody,
tfoot, thead, tr, th, td, article, aside, canvas, details,
embed, figure, figcaption, footer, header, hgroup, menu,
nav, output, ruby, section, summary, time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font: inherit;
vertical-align: baseline;
}
strong {
font-weight: 700;
}
ol, ul {
list-style: none;
}
li {
height: 10px;
}
a {
text-decoration: none;
color: #2D617A;
text-shadow: none;
}
ul, ol, dl {
font: inherit;
margin: 0 0 15px 0;
}
.emoticon {
font-size: 14px;
}
@ -330,29 +347,12 @@
color: white;
}
.chat-head {
color: #ffffff;
font-size: 100%;
border-top-right-radius: 4px;
border-top-left-radius: 4px;
padding: 2px 2px 2px 4px;
margin: 0;
}
.chat-head-chatbox {
background-color: #2D617A;
}
.chat-head-chatroom {
background-color: #0F592F;
}
.chat-body {
background-color: white;
border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px;
height: 289px;
height: calc(100% - 35px);
@include calc(height, '100% - #{$chat-head-height}');
border-top: 0;
}
@ -461,9 +461,9 @@
.chat-content {
position: relative;
padding: 4px;
padding: 8px;
font-size: 13px;
color: #4f4f4f;
color: $text-color;
overflow-y: auto;
border: 0;
background-color: #ffffff;
@ -475,7 +475,7 @@
}
.chat-info {
color: #666666;
color: $text-color;
}
.chat-error {
@ -504,7 +504,7 @@
}
.chat-message-me {
color: #2D617A;
color: $link-color;
}
.chat-message-room {
@ -563,7 +563,7 @@
#converse-register .form-help .url {
font-weight: bold;
color: #2D617A;
color: $link-color;
}
.reg-feedback {
@ -583,14 +583,10 @@
font-weight: normal;
}
.chat-head .avatar {
float: left;
}
.restore-chat,
a.restore-chat,
.chat-title {
padding: 1px 0 1px 5px;
color: white;
color: $chat-head-text-color;
font-weight: bold;
line-height: 15px;
display: block;
@ -600,21 +596,48 @@
text-shadow: rgba(0, 0, 0, 0.51) 0 -1px 0;
}
a.restore-chat:visited {
color: $chat-head-text-color;
}
.chat-title a {
color: white;
color: $chat-head-text-color;
width: 100%;
text-overflow: ellipsis;
white-space: nowrap;
}
.chat-head {
color: #ffffff;
font-size: 100%;
border-top-right-radius: 4px;
border-top-left-radius: 4px;
padding: 2px 2px 2px 4px;
margin: 0;
}
.chat-head .avatar {
float: left;
}
.chat-head-chatbox,
.chat-head-chatroom {
height: 35px;
height: $chat-head-height;
position: relative;
padding: 3px;
}
.chat-head-chatroom {
background-color: $chatroom-head-color;
}
.chat-head-chatbox {
background-color: $chat-head-color;
}
p.user-custom-message,
p.chatroom-topic {
color: white;
font-size: 80%;
font-style: italic;
height: 1.3em;
@ -622,11 +645,7 @@
text-overflow: ellipsis;
white-space: nowrap;
margin: 0;
padding: 1px 0;
}
div.chat-head-chatbox a.user-custom-message {
color: white;
padding: 1px 0 1px 5px;
}
.activated {
@ -643,7 +662,7 @@
}
.fancy-dropdown {
border: 1px solid #ddd;
border: 1px solid $light-background-border-color;
height: 22px;
text-align: left;
}
@ -677,7 +696,7 @@
height: 22px;
width: 12px;
margin: 0px 5px 0 0;
color: #4f4f4f;
color: $link-color;
}
ul#found-users {
@ -700,9 +719,9 @@
color: #FFF;
border-top-right-radius: 4px;
border-top-left-radius: 4px;
height: 35px;
height: $chat-head-height;
clear: right;
background-color: #2D617A;
background-color: $link-color;
padding: 3px 0 0 0;
}
@ -713,8 +732,8 @@
background: -moz-linear-gradient(center top, #ffff00 5%, #f6f6f6 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='yellow', endColorstr='#f6f6f6');
border: 1px solid;
text-shadow: 1px 1px 0 #ccc;
color: darkred;
text-shadow: 1px 1px 0 $text-shadow-color;
color: $warning-color;
border-radius: 5px;
padding: 2px 4px;
font-size: 15px;
@ -746,13 +765,9 @@
top: 1px;
}
.controlbox-pane dt {
padding-bottom: 3px;
}
.chatroom-form-container {
height: 100%;
color: #666;
color: $text-color;
overflow-y: auto;
border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px;
@ -760,7 +775,7 @@
.chat-body p {
font-size: 14px;
color: #666;
color: $text-color;
padding: 5px;
margin: 0;
}
@ -791,7 +806,7 @@
#converse-roster dd.current-xmpp-contact span {
font-size: 16px;
float: left;
color: #4f4f4f;
color: $link-color;
}
.requesting-xmpp-contact .request-actions {
@ -799,15 +814,6 @@
float: right;
}
#converse-roster dd a,
#converse-roster dd span {
text-shadow: 0 1px 0 #fafafa;
display: inline-block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
#converse-roster span.req-contact-name {
width: 65%;
}
@ -817,10 +823,6 @@
width: 80%;
}
#converse-roster dd span {
padding: 0 5px 0 0;
}
#converse-roster {
text-align: left;
width: 100%;
@ -831,20 +833,28 @@
overflow: hidden;
}
#converse-roster .roster-filter {
padding: 0;
margin: 0 0 5px 0.5em;
width: 105px;
height: 20px;
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAABNSURBVHjaXI7BDcAwCAMvyQjMyQ6dAbZiKfqoUK34g2zJh1dENIC7M8pMAPYdzAVY3d0ajNz9aypS/b5R6o+ZPdqoKgCq6h80KH3xDgBqNR97p8oAGQAAAABJRU5ErkJggg== ) no-repeat right -20px center;
border: 1px solid #999;
display: inline-block;
#converse-roster .roster-filter-group {
display: table;
}
#converse-roster .filter-type {
height: 20px;
display: table-cell;
height: 24px;
padding: 0;
margin: 0 0 0 -5px;
margin: 0 0 0.5em -2px;
display: inline-block;
width: 85px;
}
#converse-roster .roster-filter {
display: table-cell;
padding: 2px;
margin: 0 0 0.5em 6px;
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: */
@ -863,10 +873,13 @@
overflow-x: hidden;
max-height: 195px;
max-height: calc(100% - 26px);
padding-bottom: 15px;
}
#converse-roster .group-toggle {
color: #666;
color: $text-color;
display: block;
width: 100%;
}
dd.available-chatroom {
@ -887,11 +900,10 @@
#available-chatrooms dt,
#converse-roster dt {
font-weight: normal;
font-size: 13px;
color: #666;
color: $text-color;
border: none;
padding: 0.3em 0 0 0.5em;
text-shadow: 0 1px 0 #fafafa;
padding: 5px;
text-shadow: 0 1px 0 $text-shadow-color;
}
#converse-roster dt {
@ -946,25 +958,37 @@
font-weight: bold;
border: none;
display: block;
padding: 1px 0 0 0.5em;
color: #666;
text-shadow: 0 1px 0 #fafafa;
padding: 4px 2px 0 4px;
color: $text-color;
text-shadow: 0 1px 0 $text-shadow-color;
clear: both;
height: 24px;
overflow-y: hidden;
}
#converse-roster dd {
line-height: 16px;
}
.group-toggle {
display: block;
width: 100%;
}
.roster-group:hover,
dd.available-chatroom:hover,
#converse-roster dd:hover {
background-color: #eee;
background-color: $highlight-color;
}
#converse-roster dd a,
#converse-roster dd span {
text-shadow: 0 1px 0 $link-shadow-color;
display: inline-block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
margin-left: 3px;
}
#converse-roster dd span {
padding: 0 5px 0 0;
margin-left: 3px;
}
#converse-roster dd a.decline-xmpp-request {
@ -976,7 +1000,7 @@
width: 22px;
margin: 0;
display: none;
color: #4f4f4f;
color: $text-color;
}
#converse-roster dd:hover a.remove-xmpp-contact {
@ -1008,9 +1032,9 @@
border: 0;
font-size: 14px;
height: 289px;
height: calc(100% - 35px);
@include calc(height, '100% - #{$chat-head-height}');
overflow-y: auto;
padding: 0;
padding: 5px 0;
position: absolute;
width: 100%;
}
@ -1048,7 +1072,7 @@
.form-help:hover,
#converse-register .instructions:hover {
color: #4f4f4f;
color: $text-color;
}
.form-help {
@ -1090,12 +1114,12 @@
#converse-register .cancel,
.chatroom-form .cancel-submit,
#converse-register .cancel-submit {
color: darkred;
color: $warning-color;
}
.chatroom-form .save-submit,
#converse-register .save-submit {
color: darkgreen;
color: $save-button-color;
}
.chatroom-form .save-submit,
@ -1113,11 +1137,12 @@
}
.chatroom-form label,
.controlbox-pane label,
#converse-register label,
#converse-login label {
height: auto;
font-size: 14px;
margin-top: 0.5em;
margin-top: 2px;
font-weight: bold;
}
@ -1137,17 +1162,18 @@
form.add-chatroom {
background: none;
padding: 3px;
}
form.add-chatroom input[type=text] {
width: 95%;
margin: 3px;
padding: 8px;
}
form.add-chatroom input[type=button],
form.add-chatroom input[type=submit],
form.add-chatroom input[type=text] {
margin: 3px 0;
width: 100%;
}
form.add-chatroom input[type=submit] {
width: 48%;
color: $save-button-color;
}
select#select-xmpp-status {
@ -1176,34 +1202,33 @@
ul#controlbox-tabs li a {
display: block;
font-size: 12px;
height: 34px;
line-height: 34px;
height: $chat-head-height - 1px;
line-height: $chat-head-height - 1px;
margin: 0;
text-align: center;
text-decoration: none;
border-top-right-radius: 4px;
border-top-left-radius: 4px;
color: #888;
text-shadow: 0 1px 0 #fafafa;
}
.chat-head #controlbox-tabs li a:hover {
color: #4f4f4f;
color: $text-color;
}
.chat-head #controlbox-tabs li a {
background-color: white;
box-shadow: inset 0 4px 12px rgba(0, 0, 0, 0.3);
border-bottom: 1px solid #CCC;
border-bottom: 1px solid $border-color;
}
ul#controlbox-tabs a.current,
ul#controlbox-tabs a.current:hover {
box-shadow: none;
border-bottom: 0;
height: 35px;
height: $chat-head-height;
cursor: default;
color: #666666;
color: $text-color;
}
div#chatrooms {
@ -1260,11 +1285,7 @@
}
.chat-toolbar a {
color: #4f4f4f;
}
.chat-toolbar ul li a:hover {
color: #8f2831;
color: $text-color;
}
.chat-toolbar ul {
@ -1272,7 +1293,7 @@
font-size: 12px;
position: absolute;
bottom: 100%;
margin-bottom: 1px;
margin: 0 0 1px 0;
right: 0;
background: #fff;
box-shadow: 0 -1px 2px 0 rgba(0, 0, 0, 0.4);
@ -1284,6 +1305,10 @@
cursor: pointer;
}
.chat-toolbar ul li a:hover {
color: #8f2831;
}
.chat-toolbar .toggle-smiley {
padding-left: 5px;
}
@ -1301,7 +1326,7 @@
}
.chat-toolbar ul li:hover {
background-color: #eee;
background-color: $highlight-color;
}
.chat-toolbar .toggle-otr ul li a {
@ -1356,7 +1381,7 @@
}
.chat-textarea-chatroom-selected {
border: 2px solid #2D617A;
border: 2px solid $link-color;
margin: 0;
}
@ -1375,7 +1400,7 @@
/* status dropdown styles */
.chatbox dl.dropdown {
margin: 0.5em;
background-color: #f0f0f0;
background-color: $light-background-color;
}
.chatbox .dropdown dd,
@ -1399,14 +1424,17 @@
}
form.add-xmpp-contact input {
width: 108px;
margin: 0 0 1rem;
}
form.add-xmpp-contact button {
width: 100%;
}
.chatbox .dropdown dt a span {
cursor: pointer;
display: block;
padding: 4px 7px 0 5px;
color: #4f4f4f;
}
.chatbox .dropdown dd ul {
@ -1415,11 +1443,11 @@
position: absolute;
left: 0;
top: 0;
border: 1px solid #ddd;
border: 1px solid $light-background-border-color;
border-top: 0;
width: 99%;
z-index: 21;
background-color: #f0f0f0;
background-color: $light-background-color;
}
.chatbox .dropdown li {
@ -1435,11 +1463,11 @@
}
.chatbox .dropdown dd ul li:hover {
background-color: #bed6e5;
background-color: $highlight-color;
}
.chatbox .dropdown dd.search-xmpp ul li:hover {
background-color: #bed6e5;
background-color: $light-background-color;
}
.xmpp-status-menu {
@ -1452,12 +1480,11 @@
.xmpp-status-menu li a.logout,
.xmpp-status-menu li a.logout span {
color: darkred;
color: $warning-color;
}
.xmpp-status-menu li a span {
padding: 0 5px 0 5px;
color: #4f4f4f;
}
.set-xmpp-status .dropdown dd ul {