Commit 1cec976b authored by JC Brand's avatar JC Brand

Don't build theme.css from sass

The theme is still bootstrap3 based and there isn't enough time
currently to redo on bootstrap4.
parent 2705ec81
......@@ -48,7 +48,7 @@ help:
@echo " release Prepare a new release of converse.js. E.g. make release VERSION=0.9.5"
@echo " serve Serve this directory via a webserver on port 8000."
@echo " stamp-npm Install NPM dependencies
@echo " gems Install Bundler (Ruby) dependencies
@echo " stamp-bundler Install Bundler (Ruby) dependencies
@echo " watch Tells Sass to watch the .scss files for changes and then automatically update the CSS files."
......@@ -108,14 +108,12 @@ stamp-npm: package.json package-lock.json
npm install
touch stamp-npm
.bundle: Gemfile
stamp-bundler: Gemfile
mkdir -p .bundle
$(RVM_USE)
gem install --user bundler --bindir .bundle/bin
$(BUNDLE) install --path .bundle --binstubs .bundle/bin
.PHONY: gems
gems: .bundle
touch stamp-bundler
.PHONY: clean
clean:
......@@ -127,7 +125,7 @@ clean:
rm css/*.map
.PHONY: dev
dev: .bundle stamp-npm
dev: stamp-bundler stamp-npm
########################################################################
## Builds
......@@ -135,31 +133,28 @@ dev: .bundle stamp-npm
.PHONY: css
css: dev sass/*.scss css/converse.css css/converse.min.css css/theme.min.css css/converse-muc-embedded.min.css css/inverse.css css/inverse.min.css
css/inverse.css:: gems sass sass
css/inverse.css:: dev sass sass
$(SASS) -I $(BOURBON) -I $(BOOTSTRAP) sass/inverse/inverse.scss css/inverse.css
css/converse-muc-embedded.css:: gems sass
css/converse-muc-embedded.css:: dev sass
$(SASS) -I $(BOURBON) -I $(BOOTSTRAP) sass/_muc_embedded.scss css/converse-muc-embedded.css
css/converse.css:: gems sass
css/converse.css:: dev sass
$(SASS) -I $(BOURBON) -I $(BOOTSTRAP) sass/converse/converse.scss css/converse.css
css/theme.css:: dev sass
$(SASS) -I $(BOOTSTRAP) sass/theme.scss $@
css/%.min.css:: css/%.css
make dev
$(CLEANCSS) $< > $@
.PHONY: watch
watch: gems
watch: dev
$(SASS) --watch -I $(BOURBON) -I $(BOOTSTRAP) sass/converse/converse.scss:css/converse.css sass/_muc_embedded.scss:css/converse-muc-embedded.css sass/inverse/inverse.scss:css/inverse.css
.PHONY: watchjs
watchjs: stamp-npm
watchjs: dev
$(BABEL) --source-maps --watch=./src --out-dir=./builds
transpile: stamp-npm src
transpile: dev src
$(BABEL) --source-maps --out-dir=./builds ./src
$(BABEL) --source-maps --out-dir=./builds ./node_modules/backbone.vdomview/backbone.vdomview.js
touch transpile
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
html {
width: 100%;
height: 100%; }
body {
width: 100%;
height: 100%;
font-family: "Lora", "Helvetica Neue", Helvetica, Arial, sans-serif;
color: #ffffff;
background-color: #211018;
webkit-tap-highlight-color: rgba(255, 255, 255, 0.2); }
body .brand-heading {
margin: auto;
font-size: 6em;
font-weight: bold; }
body .brand-heading .icon-conversejs {
font-size: 0.88em; }
h1, h2, h3, h4, h5, h6 {
}
html {
width: 100%;
height: 100%;
}
h1,
h2,
h3,
h4,
h5,
h6 {
margin: 0 0 35px;
font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 700;
letter-spacing: 1px; }
letter-spacing: 1px;
}
p {
margin: 0 0 25px;
font-size: 18px;
line-height: 1.5; }
line-height: 1.5;
}
@media (min-width: 767px) {
p {
margin: 0 0 35px;
font-size: 20px;
line-height: 1.6; } }
line-height: 1.6;
}
}
a {
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; }
transition: all 0.2s ease-in-out;
}
a:hover,
a:focus {
text-decoration: none;
color: #00aaff; }
.converse-bg {
position: relative;
height: 100vh;
text-align: center;
color: #fff; }
color: #00aaff;
}
.light {
font-weight: 400; }
font-weight: 400;
}
.navbar {
margin-bottom: 0;
border-bottom: 1px solid rgba(255, 255, 255, 0.3);
text-transform: uppercase;
font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif;
background-color: #211018; }
background-color: #211018;
}
.navbar-brand {
font-weight: 700; }
font-weight: 700;
}
.navbar-brand:focus {
outline: none; }
outline: none;
}
.navbar-custom a {
color: #ffffff; }
color: #ffffff;
}
.navbar-custom .nav li a {
-webkit-transition: background 0.3s ease-in-out;
-moz-transition: background 0.3s ease-in-out;
transition: background 0.3s ease-in-out; }
transition: background 0.3s ease-in-out;
}
.navbar-custom .nav li a:hover,
.navbar-custom .nav li a:focus,
.navbar-custom .nav li.active {
outline: none;
background-color: rgba(255, 255, 255, 0.2); }
background-color: rgba(255, 255, 255, 0.2);
}
.navbar-toggle {
padding: 4px 6px;
font-size: 16px;
color: #ffffff; }
color: #ffffff;
}
.navbar-toggle:focus,
.navbar-toggle:active {
outline: none; }
outline: none;
}
@media (min-width: 767px) {
.navbar {
padding: 20px 0;
......@@ -96,63 +90,70 @@ a:focus {
background: transparent;
-webkit-transition: background 0.5s ease-in-out, padding 0.5s ease-in-out;
-moz-transition: background 0.5s ease-in-out, padding 0.5s ease-in-out;
transition: background 0.5s ease-in-out, padding 0.5s ease-in-out; }
transition: background 0.5s ease-in-out, padding 0.5s ease-in-out;
}
.top-nav-collapse {
padding: 0;
background-color: #211018; }
background-color: #211018;
}
.navbar-custom.top-nav-collapse {
border-bottom: 1px solid rgba(255, 255, 255, 0.3); } }
border-bottom: 1px solid rgba(255, 255, 255, 0.3);
}
}
@media (max-width: 480px) {
.navbar {
display: none; } }
.navbar {
display: none;
}
}
.features-section,
.outro,
.intro {
width: 100%;
padding: 100px 0;
text-align: center;
color: #fff; }
color: #fff;
}
.intro {
background: url(images/header.jpg) no-repeat bottom center scroll;
background-color: #211018;
-webkit-background-size: cover;
-moz-background-size: cover;
background-size: cover;
-o-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, #85505f, #384955, #655361); }
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: #82B397; }
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); }
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);
}
.brand-heading {
font-size: 2em;
text-align: center;
margin-top: 2.5em; }
margin-top: 2.5em;
}
.brand-heading-embedded {
margin-top: 1.5em; }
margin-top: 1.5em;
}
.intro-text {
font-size: 18px; }
font-size: 18px;
}
@media (min-width: 767px) {
.intro {
height: 100%;
padding: 0; }
padding: 0;
}
.brand-heading {
font-size: 80px; }
font-size: 80px;
}
.intro-text {
font-size: 25px; } }
font-size: 25px;
}
}
.btn-circle {
width: 70px;
height: 70px;
......@@ -165,20 +166,20 @@ a:focus {
background: transparent;
-webkit-transition: background 0.3s ease-in-out;
-moz-transition: background 0.3s ease-in-out;
transition: background 0.3s ease-in-out; }
transition: background 0.3s ease-in-out;
}
.btn-circle:hover,
.btn-circle:focus {
outline: none;
color: #ffffff;
background: rgba(255, 255, 255, 0.1); }
background: rgba(255, 255, 255, 0.1);
}
.page-scroll .btn-circle i.animated {
-webkit-transition-property: -webkit-transform;
-webkit-transition-duration: 1s;
-moz-transition-property: -moz-transform;
-moz-transition-duration: 1s; }
-moz-transition-duration: 1s;
}
.page-scroll .btn-circle:hover i.animated {
-webkit-animation-name: pulse;
-moz-animation-name: pulse;
......@@ -187,8 +188,8 @@ a:focus {
-webkit-animation-iteration-count: infinite;
-moz-animation-iteration-count: infinite;
-webkit-animation-timing-function: linear;
-moz-animation-timing-function: linear; }
-moz-animation-timing-function: linear;
}
/*
@-webkit-keyframes pulse {
0 {
......@@ -220,67 +221,97 @@ a:focus {
}
*/
.content-section {
padding-top: 100px; }
padding-top: 100px;
}
.donate-section {
width: 100%;
padding: 50px 0;
color: #ffffff;
background-color: #211018; }
background-color: #211018;
}
.donate-section p.bitcoin-header {
margin: 0 0 5px; }
margin: 0 0 5px;
}
@media (min-width: 767px) {
.content-section {
padding-top: 150px;
padding-bottom: 50px; }
padding-bottom: 50px;
}
.donate-section {
padding: 100px 0; } }
padding: 100px 0;
}
}
.btn {
text-transform: uppercase;
font-family: FontAwesome;
font-weight: 400;
-webkit-transition: all 0.3s ease-in-out;
-moz-transition: all 0.3s ease-in-out;
transition: all 0.3s ease-in-out;
}
.btn-default {
border: 1px solid #82B397;
color: #82B397;
background-color: transparent;
}
.btn-default:hover,
.btn-default:focus {
border: 1px solid #82B397;
outline: none;
color: #211018;
background-color: #82B397;
}
.btn-huge {
padding: 25px;
font-size: 26px;
}
.banner-social-buttons {
padding-top: 3em; }
padding-top: 3em;
}
::-moz-selection {
text-shadow: none;
background: #fcfcfc;
background: rgba(255, 255, 255, 0.2); }
background: rgba(255, 255, 255, 0.2);
}
::selection {
text-shadow: none;
background: #fcfcfc;
background: rgba(255, 255, 255, 0.2); }
background: rgba(255, 255, 255, 0.2);
}
img::selection {
background: transparent; }
background: transparent;
}
img::-moz-selection {
background: transparent; }
background: transparent;
}
body {
webkit-tap-highlight-color: rgba(255, 255, 255, 0.2);
}
ul.contact,
ul.integration,
ul.screencasts,
ul.features {
text-align: left;
font-size: 19px; }
font-size: 19px;
}
.feature-icon {
display: inline-block;
position: relative;
padding-bottom: 5em;
margin-bottom: 2.75em;
cursor: default;
color: #fff; }
.feature-icon .fa {
display: inline-block;
width: 2em;
height: 2em;
font-size: 4em;
border-radius: 100%;
box-shadow: inset 0 0 0 1px white;
color: white;
line-height: 2.1em; }
color: #fff;
}
.feature-icon .fa {
display: inline-block;
width: 2em;
height: 2em;
font-size: 4em;
border-radius: 100%;
box-shadow: inset 0 0 0 1px white;
color: white;
line-height: 2.1em;
}
.feature-icon:before {
content: '';
background: white;
......@@ -291,8 +322,8 @@ ul.features {
width: 0.65em;
height: 0.65em;
display: block;
border-radius: 100%; }
border-radius: 100%;
}
.feature-icon:after {
content: '';
position: absolute;
......@@ -301,39 +332,35 @@ ul.features {
width: 1px;
height: 4.35em;
background: white;
margin-left: -0.5px; }
margin-left: -0.5px;
}
.row {
margin-left: 0;
margin-right: 0; }
margin-left: 0;
margin-right: 0;
}
.mastodon {
width: 4em;
height: 4em;
margin-top: 0.9em; }
width: 4em;
height: 4em;
margin-top: 0.9em;
}
.sponsors {
clear: both;
font-size: 1.4em;
padding: 2em 0 6em 0; }
clear: both;
font-size: 1.4em;
padding: 2em 0 6em 0;
}
.sponsors h2 {
text-align: center; }
text-align: center;
}
.sponsors ul {
margin: 0 0 1em 0; }
margin: 0 0 1em 0;
}
.sponsors ul li {
margin: 1em 0;
list-style: none; }
margin: 1em 0;
list-style: none;
}
.sponsors-text {
text-align: left;
padding: 0 0 2em 0; }
@media (max-width: 767.98px) {
.intro {
padding: 0;
height: 100vh; } }
/*# sourceMappingURL=theme.css.map */
text-align: left;
padding: 0 0 2em 0;
}
......@@ -9,8 +9,6 @@
<meta name="author" content="JC Brand" />
<meta name="keywords" content="xmpp chat webchat converse.js" />
<link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/>
<link type="text/css" rel="stylesheet" media="screen" href="node_modules/bootstrap/dist/css/bootstrap.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="css/theme.css" />
<link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
<script src="node_modules/requirejs/require.js"></script>
<script src="src/config.js"></script>
......@@ -60,6 +58,7 @@
// 'jdev@conference.jabber.org'
// ],
hide_open_bookmarks: true,
allow_public_bookmarks: true,
notify_all_room_messages: [
'discuss@conference.conversejs.org'
],
......
......@@ -8,12 +8,17 @@
<meta name="description" content="Converse.js: An XMPP chat client which can be integrated into any website" />
<meta name="author" content="JC Brand" />
<meta name="keywords" content="xmpp chat webchat converse.js" />
<!-- These files are NOT needed when using converse.js in your own project. -->
<link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/>
<link type="text/css" rel="stylesheet" media="screen" href="css/bootstrap.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="css/theme.min.css" />
<script type="text/javascript" src="analytics.js"></script>
<link type="text/css" rel="stylesheet" media="screen" href="css/font-awesome.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="css/theme.css" />
<noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
<script src="src/website.js"></script>
<script type="text/javascript" src="analytics.js"></script>
<!-- *********************************************************************** -->
<![if gte IE 11]>
<link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
<script src="dist/converse.js"></script>
......@@ -215,7 +220,6 @@
<ul>
<li><a href="https://www.keycdn.com/" target="_blank" rel="noopener"><img style="height: 3em" src="/logo/keycdn.svg" alt="KeyCDN"></a></li>
<li><a href="http://wikisuite.org" target="_blank" rel="noopener"><img style="height: 4em" src="/logo/wikisuite-white.png" alt="WikiSuite"></a></li>
<li><a href="https://diasporing.ch" target="_blank" rel="noopener"><img style="height: 2em" src="/logo/diasporing.svg" alt="Diasporing.ch"></a></li>
</ul>
</div>
......
@import "bootstrap/scss/functions";
@import "bootstrap/scss/variables";
@import "bootstrap/scss/mixins";
html {
width: 100%;
height: 100%;
}
body {
width: 100%;
height: 100%;
font-family: "Lora", "Helvetica Neue", Helvetica, Arial, sans-serif;
color: #ffffff;
background-color: #211018;
webkit-tap-highlight-color: rgba(255, 255, 255, 0.2);
.brand-heading {
margin: auto;
font-size: 6em;
font-weight: bold;
}
.brand-heading .icon-conversejs {
font-size: 0.88em;
}
}
h1, h2, h3, h4, h5, h6 {
margin: 0 0 35px;
font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 700;
letter-spacing: 1px;
}
p {
margin: 0 0 25px;
font-size: 18px;
line-height: 1.5;
}
@media (min-width: 767px) {
p {
margin: 0 0 35px;
font-size: 20px;
line-height: 1.6;
}
}
a {
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;
}
a:hover,
a:focus {
text-decoration: none;
color: #00aaff;
}
.converse-bg {
position: relative;
height: 100vh;
text-align: center;
color: #fff;
}
.light {
font-weight: 400;
}
.navbar {
margin-bottom: 0;
border-bottom: 1px solid rgba(255, 255, 255, 0.3);
text-transform: uppercase;
font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif;
background-color: #211018;
}
.navbar-brand {
font-weight: 700;
}
.navbar-brand:focus {
outline: none;
}
.navbar-custom a {
color: #ffffff;
}
.navbar-custom .nav li a {
-webkit-transition: background 0.3s ease-in-out;
-moz-transition: background 0.3s ease-in-out;
transition: background 0.3s ease-in-out;
}
.navbar-custom .nav li a:hover,
.navbar-custom .nav li a:focus,
.navbar-custom .nav li.active {
outline: none;
background-color: rgba(255, 255, 255, 0.2);
}
.navbar-toggle {
padding: 4px 6px;
font-size: 16px;
color: #ffffff;
}
.navbar-toggle:focus,
.navbar-toggle:active {
outline: none;
}
@media (min-width: 767px) {
.navbar {
padding: 20px 0;
border-bottom: none;
letter-spacing: 1px;
background: transparent;
-webkit-transition: background 0.5s ease-in-out, padding 0.5s ease-in-out;
-moz-transition: background 0.5s ease-in-out, padding 0.5s ease-in-out;
transition: background 0.5s ease-in-out, padding 0.5s ease-in-out;
}
.top-nav-collapse {
padding: 0;
background-color: #211018;
}
.navbar-custom.top-nav-collapse {
border-bottom: 1px solid rgba(255, 255, 255, 0.3);
}
}
@media (max-width: 480px) {
.navbar {
display: none;
}
}
.features-section,
.outro,
.intro {
width: 100%;
padding: 100px 0;
text-align: center;
color: #fff;
}
.intro {
background: url(images/header.jpg) no-repeat bottom center scroll;
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, #85505f, #384955, #655361);
}
.features-section a {
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);
}
.brand-heading {
font-size: 2em;
text-align: center;
margin-top: 2.5em;
}
.brand-heading-embedded {
margin-top: 1.5em;
}
.intro-text {
font-size: 18px;
}
@media (min-width: 767px) {
.intro {
height: 100%;
padding: 0;
}
.brand-heading {
font-size: 80px;
}
.intro-text {
font-size: 25px;
}
}
.btn-circle {
width: 70px;
height: 70px;
margin-top: 15px;
padding: 7px 16px;
border: 2px solid #ffffff;
border-radius: 35px;
font-size: 40px;
color: #ffffff;
background: transparent;
-webkit-transition: background 0.3s ease-in-out;
-moz-transition: background 0.3s ease-in-out;
transition: background 0.3s ease-in-out;
}
.btn-circle:hover,
.btn-circle:focus {
outline: none;
color: #ffffff;
background: rgba(255, 255, 255, 0.1);
}
.page-scroll .btn-circle i.animated {
-webkit-transition-property: -webkit-transform;
-webkit-transition-duration: 1s;
-moz-transition-property: -moz-transform;
-moz-transition-duration: 1s;
}
.page-scroll .btn-circle:hover i.animated {
-webkit-animation-name: pulse;
-moz-animation-name: pulse;
-webkit-animation-duration: 1.5s;
-moz-animation-duration: 1.5s;
-webkit-animation-iteration-count: infinite;
-moz-animation-iteration-count: infinite;
-webkit-animation-timing-function: linear;
-moz-animation-timing-function: linear;
}
/*
@-webkit-keyframes pulse {
0 {
-webkit-transform: scale(1);
transform: scale(1);
}
50% {
-webkit-transform: scale(1.2);
transform: scale(1.2);
}
100% {
-webkit-transform: scale(1);
transform: scale(1);
}
}
@-moz-keyframes pulse {
0 {
-moz-transform: scale(1);
transform: scale(1);
}
50% {
-moz-transform: scale(1.2);
transform: scale(1.2);
}
100% {
-moz-transform: scale(1);
transform: scale(1);
}
}
*/
.content-section {
padding-top: 100px;
}
.donate-section {
width: 100%;
padding: 50px 0;
color: #ffffff;
background-color: #211018;
}
.donate-section p.bitcoin-header {
margin: 0 0 5px;
}
@media (min-width: 767px) {
.content-section {
padding-top: 150px;
padding-bottom: 50px;
}
.donate-section {
padding: 100px 0;
}
}
.banner-social-buttons {
padding-top: 3em;
}
::-moz-selection {
text-shadow: none;
background: #fcfcfc;
background: rgba(255, 255, 255, 0.2);
}
::selection {
text-shadow: none;
background: #fcfcfc;
background: rgba(255, 255, 255, 0.2);
}
img::selection {
background: transparent;
}
img::-moz-selection {
background: transparent;
}
ul.contact,
ul.integration,
ul.screencasts,
ul.features {
text-align: left;
font-size: 19px;
}
.feature-icon {
display: inline-block;
position: relative;
padding-bottom: 5em;
margin-bottom: 2.75em;
cursor: default;
color: #fff;
.fa {
display: inline-block;
width: 2em;
height: 2em;
font-size: 4em;
border-radius: 100%;
box-shadow: inset 0 0 0 1px white;
color: white;
line-height: 2.1em;
}
}
.feature-icon:before {
content: '';
background: white;
position: absolute;
bottom: 0;
left: 50%;
margin-left: -0.325em;
width: 0.65em;
height: 0.65em;
display: block;
border-radius: 100%;
}
.feature-icon:after {
content: '';
position: absolute;
left: 50%;
bottom: 0.65em;
width: 1px;
height: 4.35em;
background: white;
margin-left: -0.5px;
}
.row {
margin-left: 0;
margin-right: 0;
}
.mastodon {
width: 4em;
height: 4em;
margin-top: 0.9em;
}
.sponsors {
clear: both;
font-size: 1.4em;
padding: 2em 0 6em 0;
}
.sponsors h2 {
text-align: center;
}
.sponsors ul {
margin: 0 0 1em 0;
}
.sponsors ul li {
margin: 1em 0;
list-style: none;
}
.sponsors-text {
text-align: left;
padding: 0 0 2em 0;
}
@include media-breakpoint-down(sm) {
.intro {
padding: 0;
height: 100vh;
}
}
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