Some work on bundling bootstrap within the css files.
Will likely later have to create versions which exclude bootstrap
This commit is contained in:
parent
799b53c098
commit
7f8b42faf0
2
Gemfile
2
Gemfile
@ -1,2 +1,2 @@
|
|||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
gem 'sass', '~> 3.3'
|
gem 'sass', '~> 3.5.5'
|
||||||
|
14
Gemfile.lock
14
Gemfile.lock
@ -1,13 +1,21 @@
|
|||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
sass (3.4.14)
|
ffi (1.9.18)
|
||||||
|
rb-fsevent (0.10.2)
|
||||||
|
rb-inotify (0.9.10)
|
||||||
|
ffi (>= 0.5.0, < 2)
|
||||||
|
sass (3.5.5)
|
||||||
|
sass-listen (~> 4.0.0)
|
||||||
|
sass-listen (4.0.0)
|
||||||
|
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||||
|
rb-inotify (~> 0.9, >= 0.9.7)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
sass (~> 3.3)
|
sass (~> 3.5.5)
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
1.10.3
|
1.16.1
|
||||||
|
11
Makefile
11
Makefile
@ -2,7 +2,8 @@ SHELL := /bin/bash --login
|
|||||||
# You can set these variables from the command line.
|
# You can set these variables from the command line.
|
||||||
UGLIFYJS ?= node_modules/.bin/uglifyjs
|
UGLIFYJS ?= node_modules/.bin/uglifyjs
|
||||||
BABEL ?= node_modules/.bin/babel
|
BABEL ?= node_modules/.bin/babel
|
||||||
BOURBON_TEMPLATES = ./node_modules/bourbon/app/assets/stylesheets/
|
BOURBON = ./node_modules/bourbon/app/assets/stylesheets/
|
||||||
|
BOOTSTRAP = ./node_modules/bootstrap/scss/
|
||||||
BUILDDIR = ./docs
|
BUILDDIR = ./docs
|
||||||
BUNDLE ?= ./.bundle/bin/bundle
|
BUNDLE ?= ./.bundle/bin/bundle
|
||||||
CHROMIUM ?= ./node_modules/.bin/run-headless-chromium
|
CHROMIUM ?= ./node_modules/.bin/run-headless-chromium
|
||||||
@ -133,19 +134,19 @@ dev: stamp-bundler stamp-npm
|
|||||||
css: sass/*.scss css/converse.css css/converse.min.css css/mobile.min.css css/theme.min.css css/converse-muc-embedded.min.css css/inverse.css css/inverse.min.css
|
css: sass/*.scss css/converse.css css/converse.min.css css/mobile.min.css css/theme.min.css css/converse-muc-embedded.min.css css/inverse.css css/inverse.min.css
|
||||||
|
|
||||||
css/inverse.css:: stamp-bundler sass sass/*
|
css/inverse.css:: stamp-bundler sass sass/*
|
||||||
$(SASS) -I $(BOURBON_TEMPLATES) sass/inverse/inverse.scss css/inverse.css
|
$(SASS) -I $(BOURBON) -I $(BOOTSTRAP) sass/inverse/inverse.scss css/inverse.css
|
||||||
|
|
||||||
css/inverse.min.css:: css/inverse.css
|
css/inverse.min.css:: css/inverse.css
|
||||||
$(CLEANCSS) css/inverse.css > css/inverse.min.css
|
$(CLEANCSS) css/inverse.css > css/inverse.min.css
|
||||||
|
|
||||||
css/converse-muc-embedded.css:: stamp-bundler sass/*
|
css/converse-muc-embedded.css:: stamp-bundler sass/*
|
||||||
$(SASS) -I $(BOURBON_TEMPLATES) sass/_muc_embedded.scss css/converse-muc-embedded.css
|
$(SASS) -I $(BOURBON) -I $(BOOTSTRAP) sass/_muc_embedded.scss css/converse-muc-embedded.css
|
||||||
|
|
||||||
css/converse-muc-embedded.min.css:: stamp-bundler sass css/converse-muc-embedded.css
|
css/converse-muc-embedded.min.css:: stamp-bundler sass css/converse-muc-embedded.css
|
||||||
$(CLEANCSS) css/converse-muc-embedded.css > css/converse-muc-embedded.min.css
|
$(CLEANCSS) css/converse-muc-embedded.css > css/converse-muc-embedded.min.css
|
||||||
|
|
||||||
css/converse.css:: stamp-bundler sass/*
|
css/converse.css:: stamp-bundler sass/*
|
||||||
$(SASS) -I $(BOURBON_TEMPLATES) sass/converse/converse.scss css/converse.css
|
$(SASS) -I $(BOURBON) -I $(BOOTSTRAP) sass/converse/converse.scss css/converse.css
|
||||||
|
|
||||||
css/converse.min.css:: css/converse.css
|
css/converse.min.css:: css/converse.css
|
||||||
$(CLEANCSS) css/converse.css > css/converse.min.css
|
$(CLEANCSS) css/converse.css > css/converse.min.css
|
||||||
@ -158,7 +159,7 @@ css/mobile.min.css:: stamp-npm sass/*
|
|||||||
|
|
||||||
.PHONY: watch
|
.PHONY: watch
|
||||||
watch: stamp-bundler
|
watch: stamp-bundler
|
||||||
$(SASS) --watch -I ./node_modules/bourbon/app/assets/stylesheets/ sass/converse/converse.scss:css/converse.css sass/_muc_embedded.scss:css/converse-muc-embedded.css sass/inverse/inverse.scss:css/inverse.css
|
$(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
|
.PHONY: watchjs
|
||||||
watchjs: stamp-npm
|
watchjs: stamp-npm
|
||||||
|
5301
css/converse.css
5301
css/converse.css
File diff suppressed because it is too large
Load Diff
6512
css/inverse.css
6512
css/inverse.css
File diff suppressed because it is too large
Load Diff
@ -4,7 +4,6 @@
|
|||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
<title>Converse.js Mockups</title>
|
<title>Converse.js Mockups</title>
|
||||||
<link type="text/css" rel="stylesheet" media="screen" href="../../node_modules/bootstrap/dist/css/bootstrap.css" />
|
|
||||||
<link type="text/css" rel="stylesheet" media="screen" href="../../node_modules/font-awesome/css/font-awesome.css" />
|
<link type="text/css" rel="stylesheet" media="screen" href="../../node_modules/font-awesome/css/font-awesome.css" />
|
||||||
<link type="text/css" rel="stylesheet" media="screen" href="../../css/inverse.css" />
|
<link type="text/css" rel="stylesheet" media="screen" href="../../css/inverse.css" />
|
||||||
</head>
|
</head>
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
<title>Converse.js Mockups</title>
|
<title>Converse.js Mockups</title>
|
||||||
<link type="text/css" rel="stylesheet" media="screen" href="../../node_modules/bootstrap/dist/css/bootstrap.css" />
|
|
||||||
<link type="text/css" rel="stylesheet" media="screen" href="../../node_modules/font-awesome/css/font-awesome.css" />
|
<link type="text/css" rel="stylesheet" media="screen" href="../../node_modules/font-awesome/css/font-awesome.css" />
|
||||||
<link type="text/css" rel="stylesheet" media="screen" href="../../css/inverse.css" />
|
<link type="text/css" rel="stylesheet" media="screen" href="../../css/inverse.css" />
|
||||||
</head>
|
</head>
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
<title>inVerse Mockups</title>
|
<title>inVerse Mockups</title>
|
||||||
<link type="text/css" rel="stylesheet" media="screen" href="../../node_modules/bootstrap/dist/css/bootstrap.css" />
|
|
||||||
<link type="text/css" rel="stylesheet" media="screen" href="../../node_modules/font-awesome/css/font-awesome.css" />
|
<link type="text/css" rel="stylesheet" media="screen" href="../../node_modules/font-awesome/css/font-awesome.css" />
|
||||||
<link type="text/css" rel="stylesheet" media="screen" href="../../css/converse.css" />
|
<link type="text/css" rel="stylesheet" media="screen" href="../../css/converse.css" />
|
||||||
</head>
|
</head>
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
<title>Converse.js Mockups</title>
|
<title>Converse.js Mockups</title>
|
||||||
<link type="text/css" rel="stylesheet" media="screen" href="../../node_modules/bootstrap/dist/css/bootstrap.css" />
|
|
||||||
<link type="text/css" rel="stylesheet" media="screen" href="../../node_modules/font-awesome/css/font-awesome.css" />
|
<link type="text/css" rel="stylesheet" media="screen" href="../../node_modules/font-awesome/css/font-awesome.css" />
|
||||||
<link type="text/css" rel="stylesheet" media="screen" href="../../css/converse.css" />
|
<link type="text/css" rel="stylesheet" media="screen" href="../../css/converse.css" />
|
||||||
<link type="text/css" rel="stylesheet" media="screen" href="css/mockup.css" />
|
<link type="text/css" rel="stylesheet" media="screen" href="css/mockup.css" />
|
||||||
|
@ -6,6 +6,9 @@
|
|||||||
* Licensed under the Mozilla Public License
|
* Licensed under the Mozilla Public License
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#conversejs {
|
||||||
|
@import "bootstrap";
|
||||||
|
}
|
||||||
@import "bourbon";
|
@import "bourbon";
|
||||||
@import "variables";
|
@import "variables";
|
||||||
@import "../fonts";
|
@import "../fonts";
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
* Licensed under the Mozilla Public License
|
* Licensed under the Mozilla Public License
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@import "bootstrap";
|
||||||
@import "bourbon";
|
@import "bourbon";
|
||||||
@import "variables";
|
@import "variables";
|
||||||
@import "../fonts";
|
@import "../fonts";
|
||||||
|
Loading…
Reference in New Issue
Block a user