# HG changeset patch
# User verrierj
# Date 1325516318 -3600
# Node ID 7c4bedd3b77dd3c9c79daa02173946cdc5cf8f8e
# Parent  dd4a26c7f3d24ee58543411f16d56c37b42ab857# Parent  877f89ec1efa9042a993fce53c76aea723fcb9e8
Merge with 877f89ec1efa9042a993fce53c76aea723fcb9e8

diff -r 877f89ec1efa -r 7c4bedd3b77d src/ldt/ldt/ldt_utils/views/lignesdetemps.py
diff -r 877f89ec1efa -r 7c4bedd3b77d src/ldt/ldt/ldt_utils/views/workspace.py
diff -r 877f89ec1efa -r 7c4bedd3b77d src/ldt/ldt/static/ldt/css/workspace.css
--- a/src/ldt/ldt/static/ldt/css/workspace.css	Mon Jan 02 15:57:32 2012 +0100
+++ b/src/ldt/ldt/static/ldt/css/workspace.css	Mon Jan 02 15:58:38 2012 +0100
@@ -212,3 +212,12 @@
 	float: left;
 	padding-right: 5px;	
 }
+
+.leftcolumn {
+	width: 30%;
+   	text-align: right;
+}
+   	
+#profile_forms input[type="text"], #profile_forms input[type="password"], select {
+	width: 250px;
+}
diff -r 877f89ec1efa -r 7c4bedd3b77d src/ldt/ldt/user/templates/ldt/user/change_profile.html
--- a/src/ldt/ldt/user/templates/ldt/user/change_profile.html	Mon Jan 02 15:57:32 2012 +0100
+++ b/src/ldt/ldt/user/templates/ldt/user/change_profile.html	Mon Jan 02 15:58:38 2012 +0100
@@ -6,18 +6,6 @@
 
 {% block css_import %}
 	{{ block.super }}
-    <style type="text/css">
-    
-  	.leftcolumn {
-   		width: 30%;
-   		text-align: right;
-   	}
-   	
-   	#profile_forms input[type="text"], #profile_forms input[type="password"], select {
-   		width: 250px;
-   	}
-   	   	
-	</style>
 {% endblock %}