From bleny@users.forge.codelutin.com Fri Mar 29 12:17:12 2013
From: bleny@users.forge.codelutin.com
To: franciaflex-magalie-commits@list.forge.codelutin.com
Subject: [Franciaflex-magalie-commits] r57 - in
	trunk/magalie-web/src/main/webapp: WEB-INF/content css
Date: Fri, 29 Mar 2013 12:17:12 +0100
Message-ID: <20130329111712.397A215BD4@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1182519268357376037=="

--===============1182519268357376037==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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/revis=
ions/57

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-inp=
ut.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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>
=20
-<s:form cssClass=3D"form-horizontal">
-    <s:textfield name=3D"articleBarcode" label=3D"Article" inputAppendIcon=
=3D"barcode" cssClass=3D"input-small" />
+<s:form>
+    <s:textfield name=3D"articleBarcode" label=3D"Article" inputAppendIcon=
=3D"barcode" cssClass=3D"input-medium" />
=20
     <div class=3D"btn-group">
-        <s:submit name=3D"next" value=3D"Suivant" cssClass=3D"btn btn-primar=
y btn-small" />
+        <s:submit name=3D"next" value=3D"Suivant" cssClass=3D"btn btn-primar=
y" />
     </div>
 </s:form>
\ No newline at end of file

Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/login-input.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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>
=20
-<s:form cssClass=3D"form-horizontal">
+<s:form>
=20
     <s:select label=3D"Utilisateur"
            key=3D"login"
@@ -22,6 +22,6 @@
     />
=20
     <div class=3D"btn-group">
-        <s:submit value=3D"S'identifier" cssClass=3D"btn btn-primary btn-sma=
ll" />
+        <s:submit value=3D"S'identifier" cssClass=3D"btn btn-primary" />
     </div>
 </s:form>

Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-inp=
ut.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=3D"<s:url value=3D'/js/withdraw-item-input.js' />"></script>
     <title>Traitement des listes =C3=A0 servir</title>
+    <style>
+
+        dl,
+        .control-group,
+        form,
+        .form-horizontal .control-group,
+        label {
+            margin: 0;
+        }
+
+        select,
+        textarea,
+        input[type=3D"text"],
+        input[type=3D"password"],
+        input[type=3D"datetime"],
+        input[type=3D"datetime-local"],
+        input[type=3D"date"],
+        input[type=3D"month"],
+        input[type=3D"time"],
+        input[type=3D"week"],
+        input[type=3D"number"],
+        input[type=3D"email"],
+        input[type=3D"url"],
+        input[type=3D"search"],
+        input[type=3D"tel"],
+        input[type=3D"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>
=20
 <header>

Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css	2013-03-29 09:49:1=
3 UTC (rev 56)
+++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css	2013-03-29 11:17:1=
2 UTC (rev 57)
@@ -32,78 +32,26 @@
     overflow: auto;
 }
=20
-dl,
-.control-group,
-form,
-.form-horizontal .control-group,
-label {
-    margin: 0;
-}
-
-select,
-textarea,
-input[type=3D"text"],
-input[type=3D"password"],
-input[type=3D"datetime"],
-input[type=3D"datetime-local"],
-input[type=3D"date"],
-input[type=3D"month"],
-input[type=3D"time"],
-input[type=3D"week"],
-input[type=3D"number"],
-input[type=3D"email"],
-input[type=3D"url"],
-input[type=3D"search"],
-input[type=3D"tel"],
-input[type=3D"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;
 }
=20
 .dl-horizontal dd,
 .form-horizontal .controls {
-    margin-left: 60px;
+    margin-left: 120px;
 }
=20
-#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;
 }
-
 }
=20
-@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) {
=20
 body {
     background-color: grey;


--===============1182519268357376037==--