From 41e31e50604807e04edbb10ea16c60c8c4798b1b Mon Sep 17 00:00:00 2001 From: Maxime Roux Date: Tue, 26 Aug 2014 12:01:33 -0700 Subject: [PATCH] UI-650: Updated the order of the left menu items --- app.css | 8 ++++++++ submodules/callLogs/callLogs.css | 2 +- submodules/devices/devices.css | 2 +- views/app.html | 31 +++++++++++++------------------ 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/app.css b/app.css index a93d5ac..e6b927d 100644 --- a/app.css +++ b/app.css @@ -5,3 +5,11 @@ @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/submodules/callLogs/callLogs.css b/submodules/callLogs/callLogs.css index f33f1e7..8302c73 100644 --- a/submodules/callLogs/callLogs.css +++ b/submodules/callLogs/callLogs.css @@ -38,7 +38,7 @@ } #call_logs_container .call-logs-content { - margin-top: 20px; + margin-top: 12px; } #call_logs_container .call-logs-grid { diff --git a/submodules/devices/devices.css b/submodules/devices/devices.css index 424585e..9df32a3 100644 --- a/submodules/devices/devices.css +++ b/submodules/devices/devices.css @@ -35,7 +35,7 @@ background: #fcfcfc; border: 1px solid #ddd; border-radius: 4px; - margin-top: 10px; + margin-top: 20px; } #devices_container .devices-grid i.icon-plus { diff --git a/views/app.html b/views/app.html index ba0f8c5..ae7f5f0 100644 --- a/views/app.html +++ b/views/app.html @@ -7,6 +7,13 @@ +
+
+ + {{ i18n.menuTitles.mainNumber }} +
+
+
@@ -22,39 +29,27 @@
-
-
- - {{ i18n.menuTitles.numbers }} -
-
-
{{ i18n.menuTitles.devices }}
-
-
-
- - {{ i18n.menuTitles.mainNumber }} +
+
+ + {{ i18n.menuTitles.numbers }} +
+
{{ i18n.menuTitles.callLogs }}
-