From 6fe2fcda8cd72403b580c0898233d38bb482a56a Mon Sep 17 00:00:00 2001
From: Jean-Roch Maitre <jr@2600hz.com>
Date: Tue, 21 Oct 2014 15:12:50 -0700
Subject: [PATCH] UI-772: New CSS Format

---
 app.css                                    |  15 ---------------
 app.js                                     |   8 ++++++--
 style/app.css                              |  15 +++++++++++++++
 {static => style/static}/images/xavier.jpg | Bin
 4 files changed, 21 insertions(+), 17 deletions(-)
 delete mode 100644 app.css
 create mode 100644 style/app.css
 rename {static => style/static}/images/xavier.jpg (100%)

diff --git a/app.css b/app.css
deleted file mode 100644
index e6b927d..0000000
--- a/app.css
+++ /dev/null
@@ -1,15 +0,0 @@
-@import url('submodules/devices/devices.css');
-@import url('submodules/groups/groups.css');
-@import url('submodules/myOffice/myOffice.css');
-@import url('submodules/numbers/numbers.css');
-@import url('submodules/strategy/strategy.css');
-@import url('submodules/callLogs/callLogs.css');
-@import url('submodules/users/users.css');
-
-#voip_container .left-menu #my_office {
-	margin-bottom: 20px;
-}
-
-#voip_container .left-menu > div {
-	margin-top: 10px;
-}
\ No newline at end of file
diff --git a/app.js b/app.js
index 705a6bb..251b8d9 100644
--- a/app.js
+++ b/app.js
@@ -4,10 +4,14 @@ define(function(require){
 		monster = require('monster');
 
 	var app = {
-
 		name: 'voip',
 
-		i18n: [ 'en-US', 'fr-FR' ],
+		css: [ 'app' ],
+
+		i18n: { 
+			'en-US': { customCss: false },
+			'fr-FR': { customCss: false }
+		},
 
 		requests: {
 			'voip.users.getUsers': {
diff --git a/style/app.css b/style/app.css
new file mode 100644
index 0000000..55abffd
--- /dev/null
+++ b/style/app.css
@@ -0,0 +1,15 @@
+@import url('../submodules/devices/devices.css');
+@import url('../submodules/groups/groups.css');
+@import url('../submodules/myOffice/myOffice.css');
+@import url('../submodules/numbers/numbers.css');
+@import url('../submodules/strategy/strategy.css');
+@import url('../submodules/callLogs/callLogs.css');
+@import url('../submodules/users/users.css');
+
+#voip_container .left-menu #my_office {
+	margin-bottom: 20px;
+}
+
+#voip_container .left-menu > div {
+	margin-top: 10px;
+}
\ No newline at end of file
diff --git a/static/images/xavier.jpg b/style/static/images/xavier.jpg
similarity index 100%
rename from static/images/xavier.jpg
rename to style/static/images/xavier.jpg