Merges css files.

This commit is contained in:
Boris Grozev 2015-10-06 14:50:06 -05:00
parent 0ed2b55960
commit d0b254ca15
5 changed files with 11 additions and 21 deletions

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ node_modules
.*.tmp
deploy-local.sh
libs/app.bundle.*
all.css

View File

@ -2,6 +2,8 @@ NPM = npm
BROWSERIFY = ./node_modules/.bin/browserify
UGLIFYJS = ./node_modules/.bin/uglifyjs
EXORCIST = ./node_modules/.bin/exorcist
CLEANCSS = ./node_modules/.bin/cleancss
CSS_FILES = font.css toastr.css main.css videolayout_default.css font-awesome.css jquery-impromptu.css modaldialog.css notice.css popup_menu.css login_menu.css popover.css jitsi_popover.css contact_list.css chat.css welcome_page.css settingsmenu.css
DEPLOY_DIR = libs
BROWSERIFY_FLAGS = -d
OUTPUT_DIR = .
@ -17,6 +19,7 @@ clean:
deploy:
mkdir -p $(DEPLOY_DIR) && \
cp $(OUTPUT_DIR)/app.bundle.min.js $(OUTPUT_DIR)/app.bundle.min.map $(DEPLOY_DIR) && \
(cd css; cat $(CSS_FILES)) | $(CLEANCSS) > css/all.css && \
([ ! -x deploy-local.sh ] || ./deploy-local.sh)
uglify:
@ -24,7 +27,7 @@ uglify:
source-package:
mkdir -p source_package/jitsi-meet && \
cp -r analytics.js css external_api.js favicon.ico fonts images index.html interface_config.js libs plugin.*html sounds title.html unsupported_browser.html LICENSE config.js lang source_package/jitsi-meet && \
mkdir -p source_package/jitsi-meet/css && \
cp -r analytics.js css/all.css external_api.js favicon.ico fonts images index.html interface_config.js libs plugin.*html sounds title.html unsupported_browser.html LICENSE config.js lang source_package/jitsi-meet && \
(cd source_package ; tar cjf ../jitsi-meet.tar.bz2 jitsi-meet) && \
rm -rf source_package

View File

@ -2,10 +2,10 @@
*.json /usr/share/jitsi-meet/
*.html /usr/share/jitsi-meet/
*.ico /usr/share/jitsi-meet/
*.css /usr/share/jitsi-meet/
libs /usr/share/jitsi-meet/
service /usr/share/jitsi-meet/
css /usr/share/jitsi-meet/
sounds /usr/share/jitsi-meet/
fonts /usr/share/jitsi-meet/
images /usr/share/jitsi-meet/
lang /usr/share/jitsi-meet/
lang /usr/share/jitsi-meet/

View File

@ -14,22 +14,7 @@
<script src="interface_config.js?v=6"></script>
<script src="libs/app.bundle.min.js?v=138"></script>
<script src="analytics.js?v=1"></script><!-- google analytics plugin -->
<link rel="stylesheet" href="css/font.css?v=7"/>
<link rel="stylesheet" href="css/toastr.css?v=1">
<link rel="stylesheet" type="text/css" media="screen" href="css/main.css?v=31"/>
<link rel="stylesheet" type="text/css" media="screen" href="css/videolayout_default.css?v=20" id="videolayout_default"/>
<link rel="stylesheet" href="css/font-awesome.css">
<link rel="stylesheet" href="css/jquery-impromptu.css?v=4">
<link rel="stylesheet" href="css/modaldialog.css?v=3">
<link rel="stylesheet" href="css/notice.css?v=1">
<link rel="stylesheet" href="css/popup_menu.css?v=4">
<link rel="stylesheet" href="css/login_menu.css?v=1">
<link rel="stylesheet" href="css/popover.css?v=2">
<link rel="stylesheet" href="css/jitsi_popover.css?v=2">
<link rel="stylesheet" href="css/contact_list.css?v=4">
<link rel="stylesheet" href="css/chat.css?v=5">
<link rel="stylesheet" href="css/welcome_page.css?v=2">
<link rel="stylesheet" href="css/settingsmenu.css?v=2">
<link rel="stylesheet" href="css/all.css"/>
<!--
Link used for inline installation of chrome desktop streaming extension,
is updated automatically from the code with the value defined in config.js -->

View File

@ -41,7 +41,8 @@
"exorcist": "*",
"jshint": "2.8.0",
"precommit-hook": "3.0.0",
"uglify-js": "2.4.24"
"uglify-js": "2.4.24",
"clean-css": "*"
},
"license": "Apache-2.0",
"scripts": {