Merge pull request #47 from alexnoox/bugfixes

Fix the dock center positioning
maestrano · Aug 23, 2016 · db361f3 · db361f3
2 parents 36c8835 + 041f13f
commit db361f3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/src/app/index.config.coffee b/src/app/index.config.coffee
@@ -87,6 +87,9 @@ angular.module 'mnoEnterpriseAngular'
     options =
       dataNotFoundConfig:
         linkUrl: '#/marketplace'
+      dhbErrorsConfig:
+        firstTimeCreated:
+          note: ''
 
     ImpacThemingProvider.configure(options)
 

diff --git a/src/app/views/layout.html b/src/app/views/layout.html
@@ -8,9 +8,9 @@
 </div>
 
 <div id="dashboard">
+  <dashboard-company-selectbox></dashboard-company-selectbox>
+  <dashboard-menu></dashboard-menu>
   <div class="container">
-    <dashboard-menu></dashboard-menu>
-    <dashboard-company-selectbox></dashboard-company-selectbox>
     <div ui-view></div>
   </div>
 </div>
diff --git a/src/app/views/layout.less b/src/app/views/layout.less
@@ -25,6 +25,14 @@
 #dashboard {
   margin-left: @menu-left-width;
 
+  .container {
+    position: relative;
+  }
+
+  @media (max-width: @screen-xs-max) {
+    padding-top: 40px;
+  }
+
   /* Fix the container width if the screen is sm+ */
   @media screen and (min-width: @screen-sm-min) {
     .container {
@@ -45,9 +53,4 @@
       width: @container-lg - @menu-left-width;
     }
   }
-
-  @media (max-width: @screen-xs-max) {
-    padding-top: 40px;
-    margin-left: 0;
-  }
 }