Author: bleny Date: 2013-05-13 17:55:48 +0200 (Mon, 13 May 2013) New Revision: 147 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: introduce reduced css for some particuler screen Added: trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-05-13 12:40:35 UTC (rev 146) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-05-13 15:55:48 UTC (rev 147) @@ -30,6 +30,7 @@ </script> <script src="<s:url value='/js/receive-article-input.js' />"></script> <title>Réception d'un article</title> + <link rel="stylesheet" href="<s:url value='/css/magalie-ck3x-reduced.css' />"/> </head> <header> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-05-13 12:40:35 UTC (rev 146) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-05-13 15:55:48 UTC (rev 147) @@ -30,59 +30,7 @@ </script> <script src="<s:url value='/js/withdraw-item-input.js' />"></script> <title>Traitement des listes à servir</title> - <style> - - dl, - .control-group, - form, - .form-horizontal .control-group, - label { - margin: 0; - } - - select, - textarea, - input[type="text"], - input[type="password"], - input[type="datetime"], - input[type="datetime-local"], - input[type="date"], - input[type="month"], - input[type="time"], - input[type="week"], - input[type="number"], - input[type="email"], - input[type="url"], - input[type="search"], - input[type="tel"], - input[type="color"], - .uneditable-input, - .input-append .add-on, - .input-prepend .add-on { - padding: 1px; - } - - .form-horizontal .control-label { - padding-top: 3px; - } - - .form-horizontal .control-group { - margin-bottom: 1px; - } - - #storageMovements { - overflow-y: scroll; - height: 150px; - } - - #storageMovements dl { - margin: 0; - height: 50px; - box-sizing: border-box; - color: inherit; - } - - </style> + <link rel="stylesheet" href="<s:url value='/css/magalie-ck3x-reduced.css' />"/> </head> <header> Added: trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css (rev 0) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css 2013-05-13 15:55:48 UTC (rev 147) @@ -0,0 +1,55 @@ +@media screen and (max-width: 480px) and (max-height: 640px) and (orientation: portrait) { + +dl, +.control-group, +form, +.form-horizontal .control-group, +label { + margin: 0; +} + +select, +textarea, +input[type="text"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="search"], +input[type="tel"], +input[type="color"], +.uneditable-input, +.input-append .add-on, +.input-prepend .add-on { + padding: 1px; +} + +.form-horizontal .control-label { + padding-top: 3px; +} + +.form-horizontal .control-group { + margin-bottom: 1px; +} + +#storageMovements, +#locations { + overflow-y: scroll; + height: 150px; +} + +#storageMovements dl, +#locations dl { + margin: 0; + height: 50px; + box-sizing: border-box; + color: inherit; +} + +} Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-05-13 12:40:35 UTC (rev 146) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-05-13 15:55:48 UTC (rev 147) @@ -42,7 +42,7 @@ .dl-horizontal dd, .form-horizontal .controls { - margin-left: 120px; + margin-left: 110px; } .btn-group {