01/01: update style of form

28 May 2014

This is an automated email from the git hooks/post-receive script.

New commit to branch devel in repository Pollen.

See http://git.None/Pollen.git

commit b31fdd395c8d7edc133e9b2751f3e2074dd41743
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Wed May 28 17:33:34 2014 +0200

    update style of form
---
 pollen-ui-angular/src/main/webapp/css/style.css      |  5 +++++
 .../src/main/webapp/partials/user-edit.html          | 16 ++++++++--------
 .../src/main/webapp/partials/user-register.html      | 20 ++++++++++----------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/pollen-ui-angular/src/main/webapp/css/style.css b/pollen-ui-angular/src/main/webapp/css/style.css
index 66fad89..dcdd462 100644
--- a/pollen-ui-angular/src/main/webapp/css/style.css
+++ b/pollen-ui-angular/src/main/webapp/css/style.css
@@ -229,3 +229,8 @@ i.icon-collapse {
   width:200px;
   border-right:1px solid #DDD;
 }
+
+.container .control-group .form-control,  .container .control-group .control-label {
+  margin-bottom:15px;
+  vertical-align:center;
+}
diff --git a/pollen-ui-angular/src/main/webapp/partials/user-edit.html b/pollen-ui-angular/src/main/webapp/partials/user-edit.html
index 5c29acf..dda3568 100644
--- a/pollen-ui-angular/src/main/webapp/partials/user-edit.html
+++ b/pollen-ui-angular/src/main/webapp/partials/user-edit.html
@@ -24,10 +24,10 @@
 
 <form class="horizontal-form" ng-submit="editUser()">
   <div class="control-group">
-   <label for="formName" class="col-sm-3 text-right control-label">
+   <label for="formName" class="col-sm-5 text-right control-label">
      Nom
    </label>
-   <div class="col-sm-8">
+   <div class="col-sm-6">
      <input type="text" id="formName" class="form-control" ng-model="currentUser.name"/>
    </div>
    <div class="col-sm-1">
@@ -36,11 +36,11 @@
 
   <div class="control-group">
 
-   <label for="formEmail" class="col-sm-3 text-right control-label">
+   <label for="formEmail" class="col-sm-5 text-right control-label">
      Adresse E-Mail
    </label>
 
-   <div class="col-sm-8">
+   <div class="col-sm-6">
      <input type="email" id="formEmail" name="email" class="form-control" ng-model="currentUser.email"/>
    </div>
    <div class="col-sm-1">
@@ -49,10 +49,10 @@
   </div>
 
   <div class="control-group">
-   <label for="formPassword" class="col-sm-3 text-right control-label">
+   <label for="formPassword" class="col-sm-5 text-right control-label">
      Mot de passe Actuel
    </label>
-   <div class="col-sm-8">
+   <div class="col-sm-6">
      <input type="password" id="formPassword" class="form-control" ng-model="currentUser.password"/>
    </div>
    <div class="col-sm-1">
@@ -61,8 +61,8 @@
   </div>
 
   <div class="control-group">
-   <div class="col-sm-3"></div>
-   <div class="col-sm-8">
+   <div class="col-sm-5"></div>
+   <div class="col-sm-6">
     <button class="btn btn-primary" type="submit">Envoyer</button>
    </div>
    <div class="col-sm-1"></div>
diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html
index eb37772..982c6fc 100644
--- a/pollen-ui-angular/src/main/webapp/partials/user-register.html
+++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html
@@ -21,10 +21,10 @@
   <h2> Inscription sur Pollen</h2>
   <form ng-submit="submit()" class="form-horizontal">
     <div class="control-group">
-      <label for="formName" class="col-sm-3 text-right control-label">
+      <label for="formName" class="col-sm-5 text-right control-label">
         Nom d'utilisateur
       </label>
-      <div class="col-sm-8">
+      <div class="col-sm-6">
         <input type="text" id="formName" name="login" class="form-control" ng-model="data.user.login"/>
       </div>
       <div class="col-sm-1">
@@ -34,11 +34,11 @@
 
     <div class="control-group">
 
-      <label for="formEmail" class="col-sm-3 text-right control-label">
+      <label for="formEmail" class="col-sm-5 text-right control-label">
         Adresse E-Mail
       </label>
 
-      <div class="col-sm-8">
+      <div class="col-sm-6">
         <input type="email" id="formEmail" name="email" class="form-control" ng-model="data.user.email"/>
       </div>
       <div class="col-sm-1">
@@ -47,18 +47,18 @@
     </div>
 
     <div class="control-group">
-      <label for="formPassword" class="col-sm-3 text-right">
+      <label for="formPassword" class="col-sm-5 text-right control-label">
         Mot de passe
       </label>
-      <div class="col-sm-8">
+      <div class="col-sm-6">
         <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/>
       </div>
     </div>
     <div class="control-group">
-      <label for="formPassword2" class="col-sm-3 text-right">
+      <label for="formPassword2" class="col-sm-5 text-right control-label">
         Confirmation
       </label>
-      <div class="col-sm-8">
+      <div class="col-sm-6">
         <input type="password" id="formPassword2" name="password2" class="form-control" ng-model="data.user.password2"/>
       </div>
       <div class="col-sm-1">
@@ -68,8 +68,8 @@
 
 
     <div class="control-group">
-      <div class="col-sm-3"></div>
-      <div class="col-sm-8">
+      <div class="col-sm-5"></div>
+      <div class="col-sm-6">
         <button class="btn btn-primary" type="submit">Envoyer</button>
       </div>
       <div class="col-sm-1"></div>

-- 
To stop receiving notification emails like this one, please contact
Chorem.org SCM administrator <admin+scm@chorem.org>.

    

Chorem.org scm

tags

participants (1)