From cafb68c74a6fa0582f1bf182c6ac23ba72cb859e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Fri, 5 Feb 2016 13:20:17 +0100 Subject: [PATCH] backoffice: sync style with gadjo (#9881) --- wcs/qommon/static/css/dc2/admin.css | 4 ++-- wcs/qommon/static/css/dc2/gadjo.css | 5 +++-- wcs/qommon/static/js/wcs.listing.js | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/wcs/qommon/static/css/dc2/admin.css b/wcs/qommon/static/css/dc2/admin.css index e2d7cbc..4f8a459 100644 --- a/wcs/qommon/static/css/dc2/admin.css +++ b/wcs/qommon/static/css/dc2/admin.css @@ -507,12 +507,12 @@ ul#menu li.active a:hover { } div#main-content { - width: 70%; + width: 75%; } div#sidebar { float: right; - width: 23%; + width: 21%; margin-right: 2%; color: #666; } diff --git a/wcs/qommon/static/css/dc2/gadjo.css b/wcs/qommon/static/css/dc2/gadjo.css index 96f1d17..9fc3784 100644 --- a/wcs/qommon/static/css/dc2/gadjo.css +++ b/wcs/qommon/static/css/dc2/gadjo.css @@ -11,7 +11,7 @@ html, body { margin: 0; font-family: "Bitstream Vera Sans", "Verdana", sans-serif; - background: #eee; + background: #f2f2f2; color: #3c3c33; } @@ -124,7 +124,7 @@ div#header h1 { /* main content */ div#main-content { - width: 95%; + width: 100%; margin-left: 0; padding: 0 6px 0 16px; border: 1px solid #ccc; @@ -134,6 +134,7 @@ div#main-content { position: relative; overflow-x: auto; overflow-y: hidden; + box-sizing: border-box; } div#main-content h2 { diff --git a/wcs/qommon/static/js/wcs.listing.js b/wcs/qommon/static/js/wcs.listing.js index a870de9..aceed6b 100644 --- a/wcs/qommon/static/js/wcs.listing.js +++ b/wcs/qommon/static/js/wcs.listing.js @@ -170,11 +170,11 @@ $(function() { $('#main-content').after($('')); $('#sidebar-toggle').click(function() { if ($('#sidebar').css('display') === 'none') { - $('#main-content').animate({width: '70%'}, 400, + $('#main-content').animate({width: '75%'}, 400, function() {$('#sidebar').show()}); } else { $('#sidebar').hide(); - $('#main-content').animate({width: '95%'}); + $('#main-content').animate({width: '99%'}); } }); /* automatically refresh on filter change */ -- 2.7.0