Browse Source

Merges css files.

master
Boris Grozev 9 years ago
parent
commit
d0b254ca15
5 changed files with 11 additions and 21 deletions
  1. 1
    0
      .gitignore
  2. 5
    2
      Makefile
  3. 2
    2
      debian/jitsi-meet.install
  4. 1
    16
      index.html
  5. 2
    1
      package.json

+ 1
- 0
.gitignore View File

5
 .*.tmp
5
 .*.tmp
6
 deploy-local.sh
6
 deploy-local.sh
7
 libs/app.bundle.*
7
 libs/app.bundle.*
8
+all.css

+ 5
- 2
Makefile View File

2
 BROWSERIFY = ./node_modules/.bin/browserify
2
 BROWSERIFY = ./node_modules/.bin/browserify
3
 UGLIFYJS = ./node_modules/.bin/uglifyjs
3
 UGLIFYJS = ./node_modules/.bin/uglifyjs
4
 EXORCIST = ./node_modules/.bin/exorcist
4
 EXORCIST = ./node_modules/.bin/exorcist
5
+CLEANCSS = ./node_modules/.bin/cleancss
6
+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
5
 DEPLOY_DIR = libs
7
 DEPLOY_DIR = libs
6
 BROWSERIFY_FLAGS = -d
8
 BROWSERIFY_FLAGS = -d
7
 OUTPUT_DIR = .
9
 OUTPUT_DIR = .
17
 deploy:
19
 deploy:
18
 	mkdir -p $(DEPLOY_DIR) && \
20
 	mkdir -p $(DEPLOY_DIR) && \
19
 	cp $(OUTPUT_DIR)/app.bundle.min.js $(OUTPUT_DIR)/app.bundle.min.map $(DEPLOY_DIR) && \
21
 	cp $(OUTPUT_DIR)/app.bundle.min.js $(OUTPUT_DIR)/app.bundle.min.map $(DEPLOY_DIR) && \
22
+	(cd css; cat $(CSS_FILES)) | $(CLEANCSS) > css/all.css && \
20
 	([ ! -x deploy-local.sh ] || ./deploy-local.sh)
23
 	([ ! -x deploy-local.sh ] || ./deploy-local.sh)
21
 
24
 
22
 uglify:
25
 uglify:
24
 
27
 
25
 
28
 
26
 source-package:
29
 source-package:
27
-	mkdir -p source_package/jitsi-meet && \
28
-	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 && \
30
+	mkdir -p source_package/jitsi-meet/css && \
31
+	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 && \
29
 	(cd source_package ; tar cjf ../jitsi-meet.tar.bz2 jitsi-meet) && \
32
 	(cd source_package ; tar cjf ../jitsi-meet.tar.bz2 jitsi-meet) && \
30
 	rm -rf source_package
33
 	rm -rf source_package

+ 2
- 2
debian/jitsi-meet.install View File

2
 *.json					/usr/share/jitsi-meet/
2
 *.json					/usr/share/jitsi-meet/
3
 *.html					/usr/share/jitsi-meet/
3
 *.html					/usr/share/jitsi-meet/
4
 *.ico					/usr/share/jitsi-meet/
4
 *.ico					/usr/share/jitsi-meet/
5
+*.css					/usr/share/jitsi-meet/
5
 libs					/usr/share/jitsi-meet/
6
 libs					/usr/share/jitsi-meet/
6
 service					/usr/share/jitsi-meet/
7
 service					/usr/share/jitsi-meet/
7
-css					/usr/share/jitsi-meet/
8
 sounds					/usr/share/jitsi-meet/
8
 sounds					/usr/share/jitsi-meet/
9
 fonts					/usr/share/jitsi-meet/
9
 fonts					/usr/share/jitsi-meet/
10
 images					/usr/share/jitsi-meet/
10
 images					/usr/share/jitsi-meet/
11
-lang					/usr/share/jitsi-meet/
11
+lang					/usr/share/jitsi-meet/

+ 1
- 16
index.html View File

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

+ 2
- 1
package.json View File

41
     "exorcist": "*",
41
     "exorcist": "*",
42
     "jshint": "2.8.0",
42
     "jshint": "2.8.0",
43
     "precommit-hook": "3.0.0",
43
     "precommit-hook": "3.0.0",
44
-    "uglify-js": "2.4.24"
44
+    "uglify-js": "2.4.24",
45
+    "clean-css": "*"
45
   },
46
   },
46
   "license": "Apache-2.0",
47
   "license": "Apache-2.0",
47
   "scripts": {
48
   "scripts": {

Loading…
Cancel
Save