From 1840e464d3e898629a7e3049159ef19088fbebe2 Mon Sep 17 00:00:00 2001 From: Michael RICOIS Date: Tue, 7 Jul 2015 05:31:30 +0000 Subject: [PATCH] Remove form.css --- application/controllers/DashboardController.php | 3 +-- application/controllers/UserController.php | 1 - public/themes/default/styles/form.css | 17 ----------------- public/themes/default/styles/main.css | 9 ++++++++- 4 files changed, 9 insertions(+), 21 deletions(-) delete mode 100644 public/themes/default/styles/form.css diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php index 83b5f66a7..a7fed5338 100644 --- a/application/controllers/DashboardController.php +++ b/application/controllers/DashboardController.php @@ -669,8 +669,7 @@ class DashboardController extends Zend_Controller_Action public function userAction() { $this->view->headLink() - ->appendStylesheet('/themes/default/styles/user.css', 'all') - ->appendStylesheet('/themes/default/styles/form.css', 'all'); + ->appendStylesheet('/themes/default/styles/user.css', 'all'); $this->view->headScript()->appendFile('/themes/default/scripts/user.js', 'text/javascript'); $request = $this->getRequest(); diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php index bc501b239..06a90c7fe 100644 --- a/application/controllers/UserController.php +++ b/application/controllers/UserController.php @@ -47,7 +47,6 @@ class UserController extends Zend_Controller_Action $this->view->assign('device_type', $user->getBrowserInfo()->mobile); $this->view->assign('browser_info', $user->getBrowserInfo()->name.' '.$user->getBrowserInfo()->version); - $this->view->headLink()->appendStylesheet('/themes/default/styles/form.css', 'all'); $this->view->headScript()->appendFile('/themes/default/scripts/user.js', 'text/javascript'); $request = $this->getRequest(); diff --git a/public/themes/default/styles/form.css b/public/themes/default/styles/form.css deleted file mode 100644 index 42bb8e730..000000000 --- a/public/themes/default/styles/form.css +++ /dev/null @@ -1,17 +0,0 @@ -.infoTitle { - clear:both; - float:left; - width:180px; - margin-left:30px; - padding:0 10px 5px 0; -} -.infoData { - float:left; - width:320px; - margin:2px 0; -} - -div.submit{ - clear:both; - text-align:center; -} \ No newline at end of file diff --git a/public/themes/default/styles/main.css b/public/themes/default/styles/main.css index 2d5060239..5062d7ede 100644 --- a/public/themes/default/styles/main.css +++ b/public/themes/default/styles/main.css @@ -726,9 +726,16 @@ table.greffe td.decision { min-width:150px; } table.greffe td.type { min-width:250px; } table.greffe td.saisie { border-top: 1px dashed; } +/* Form +----------------------------------*/ +.infoTitle { clear:both; float:left; width:180px; margin-left:30px; padding:0 10px 5px 0; } +.infoData { float:left; width:320px; margin:2px 0;} +div.submit{ clear:both; text-align:center; } + + .fa-hover a:hover { display: block; - padding: 2px 10px; + padding: 2px; border-radius: 4px; background-color: #FFF; text-decoration: none;