diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-08-11 13:19:59 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-08-11 13:19:59 +0400 |
| commit | f9b15e948fc9639ada0f925a5d450e6e158b5f56 (patch) | |
| tree | 3d6a25c8a271deee7d1136a11c11926be1d33529 /plugins/CoreAdminHome | |
| parent | a96ec40e983a8b64f4c25def541a519ff3670e6a (diff) | |
| parent | 64ca5d548c0cf0c4eef9f5f104901fbf14800127 (diff) | |
Merge remote-tracking branch 'origin/master' into plugin_namespaces
Conflicts:
core/Tracker/Request.php
core/ViewDataTable.php
core/ViewDataTable/HtmlTable/Goals.php
plugins/Actions/Actions.php
plugins/Annotations/API.php
plugins/CoreHome/CoreHome.php
plugins/DBStats/DBStats.php
plugins/DevicesDetection/DevicesDetection.php
plugins/Goals/Goals.php
plugins/Live/Live.php
plugins/Referers/Referers.php
plugins/UserSettings/UserSettings.php
plugins/UsersManager/API.php
plugins/VisitTime/VisitTime.php
plugins/VisitorInterest/VisitorInterest.php
Diffstat (limited to 'plugins/CoreAdminHome')
| -rw-r--r-- | plugins/CoreAdminHome/Controller.php | 3 | ||||
| -rw-r--r-- | plugins/CoreAdminHome/stylesheets/generalSettings.less | 5 | ||||
| -rw-r--r-- | plugins/CoreAdminHome/stylesheets/menu.less | 7 |
3 files changed, 10 insertions, 5 deletions
diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php index c70ad35501..f8a23c8dc2 100644 --- a/plugins/CoreAdminHome/Controller.php +++ b/plugins/CoreAdminHome/Controller.php @@ -36,7 +36,8 @@ class Controller extends \Piwik\Controller\Admin public function index() { - return $this->redirectToIndex('UsersManager', 'userSettings'); + $this->redirectToIndex('UsersManager', 'userSettings'); + return; } public function generalSettings() diff --git a/plugins/CoreAdminHome/stylesheets/generalSettings.less b/plugins/CoreAdminHome/stylesheets/generalSettings.less index 71871038b0..c372146971 100644 --- a/plugins/CoreAdminHome/stylesheets/generalSettings.less +++ b/plugins/CoreAdminHome/stylesheets/generalSettings.less @@ -7,13 +7,14 @@ } #content.admin { - margin: 0 15px 0 270px; + margin: 0 0 0 260px; padding: 0 0 40px; + display: table; font: 13px Arial, Helvetica, sans-serif; } .admin #header_message { - margin-top: -10px; + margin-top: 10px; } table.admin { diff --git a/plugins/CoreAdminHome/stylesheets/menu.less b/plugins/CoreAdminHome/stylesheets/menu.less index 4621613aae..f6686a3cdb 100644 --- a/plugins/CoreAdminHome/stylesheets/menu.less +++ b/plugins/CoreAdminHome/stylesheets/menu.less @@ -1,8 +1,11 @@ +#container { + clear: left; +} + #menu { - padding: 0 0 0 0; + padding: 0; float: left; width: 240px; - position: absolute; } #tablist { |