Author: bleny Date: 2013-03-29 12:17:12 +0100 (Fri, 29 Mar 2013) New Revision: 57 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: refactor css for c3kx Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/login-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/fulfil-kanban-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp 2013-03-29 09:49:13 UTC (rev 56) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp 2013-03-29 11:17:12 UTC (rev 57) @@ -5,10 +5,10 @@ <title>Traitement des kanbans</title> </head> -<s:form cssClass="form-horizontal"> - <s:textfield name="articleBarcode" label="Article" inputAppendIcon="barcode" cssClass="input-small" /> +<s:form> + <s:textfield name="articleBarcode" label="Article" inputAppendIcon="barcode" cssClass="input-medium" /> <div class="btn-group"> - <s:submit name="next" value="Suivant" cssClass="btn btn-primary btn-small" /> + <s:submit name="next" value="Suivant" cssClass="btn btn-primary" /> </div> </s:form> \ No newline at end of file Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/login-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/login-input.jsp 2013-03-29 09:49:13 UTC (rev 56) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/login-input.jsp 2013-03-29 11:17:12 UTC (rev 57) @@ -5,7 +5,7 @@ <title>Connexion</title> </head> -<s:form cssClass="form-horizontal"> +<s:form> <s:select label="Utilisateur" key="login" @@ -22,6 +22,6 @@ /> <div class="btn-group"> - <s:submit value="S'identifier" cssClass="btn btn-primary btn-small" /> + <s:submit value="S'identifier" cssClass="btn btn-primary" /> </div> </s:form> 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-03-29 09:49:13 UTC (rev 56) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-03-29 11:17:12 UTC (rev 57) @@ -29,6 +29,59 @@ </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> </head> <header> Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-03-29 09:49:13 UTC (rev 56) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-03-29 11:17:12 UTC (rev 57) @@ -32,78 +32,26 @@ overflow: auto; } -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; -} - - .dl-horizontal dt, .form-horizontal .control-label { - width: 50px; + width: 100px; } .dl-horizontal dd, .form-horizontal .controls { - margin-left: 60px; + margin-left: 120px; } -#storageMovements { - overflow-y: scroll; - height: 150px; -} - -#storageMovements dl { - margin: 0; - height: 50px; - box-sizing: border-box; - color: inherit; -} - .btn-group { margin-top: 3px; position: absolute; display: block; - right: 10px; - left: auto; + left: 10px; + right: auto; } - } -@media screen and (min-width: 240px) and (min-height: 320px) and (max-width: 480px) and (max-height: 640px) and (orientation: portrait) { +@media screen and (min-width: 300px) and (min-height: 400px) and (max-width: 480px) and (max-height: 640px) and (orientation: portrait) { body { background-color: grey;