Merge pull request #72 from ArcBees/jl_file_upload

Fix image upload layout
ArcBees · May 4, 2016 · 3601b59 · 3601b59
2 parents 3edf55e + 68fbf27
commit 3601b59
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/src/main/java/com/arcbees/bourseje/client/admin/add/AddView.ui.xml b/src/main/java/com/arcbees/bourseje/client/admin/add/AddView.ui.xml
@@ -12,7 +12,9 @@
  <section class="{res.styles.main_content_desktop}">
  <div class="{page.style.addedit} {res.styles.wrapper_desktop}">
  <form class="{res.grid.row} {res.styles.clearfix}">
- <arcbees:ReplacePanel ui:field="uploaderPanel"/>
+ <div class="{res.grid.col} {res.grid.col_m_1_4}">
+ <arcbees:ReplacePanel ui:field="uploaderPanel"/>
+ </div>
  <div class="{res.grid.col} {res.grid.col_3_4}">
  <label class="{page.style.addedit__label}">Prénom et Nom</label>
  <input ui:field="name" class="{page.style.addedit__input}" type="text" required="required"/>

diff --git a/src/main/java/com/arcbees/bourseje/client/admin/add/ImagePlaceHolder.ui.xml b/src/main/java/com/arcbees/bourseje/client/admin/add/ImagePlaceHolder.ui.xml
@@ -4,7 +4,7 @@
  <ui:with field="res" type="com.arcbees.bourseje.client.resources.Resources"/>
  <ui:with field="page" type="com.arcbees.bourseje.client.resources.PageAddEditResources"/>
 
- <g:Anchor href="#" ui:field="anchor" styleName="{res.grid.col} {res.grid.col_1_4} {page.style.addedit__photo}">
+ <g:Anchor href="#" ui:field="anchor" styleName="{page.style.addedit__photo}">
  <div class="{page.style.addedit__photo__placeholder}">
  <img ui:field="image" src=""/>
  </div>

diff --git a/src/main/java/com/arcbees/bourseje/client/admin/edit/EditView.ui.xml b/src/main/java/com/arcbees/bourseje/client/admin/edit/EditView.ui.xml
@@ -12,7 +12,9 @@
  <section class="{res.styles.main_content_desktop}">
  <div class="{page.style.addedit} {res.styles.wrapper_desktop}">
  <form class="{res.grid.row} {res.styles.clearfix}">
- <arcbees:ReplacePanel ui:field="uploaderPanel"/>
+ <div class="{res.grid.col} {res.grid.col_m_1_4}">
+ <arcbees:ReplacePanel ui:field="uploaderPanel"/>
+ </div>
  <div class="{res.grid.col} {res.grid.col_3_4}">
  <label class="{page.style.addedit__label}">Prénom et Nom</label>
  <input ui:field="name" class="{page.style.addedit__input}" type="text" required="required"/>

diff --git a/src/main/resources/com/arcbees/bourseje/client/resources/css/pages/addedit.gss b/src/main/resources/com/arcbees/bourseje/client/resources/css/pages/addedit.gss
@@ -1,3 +1,5 @@
+@external GWTUpld, 'upld-*';
+
 .addedit {
  background-color: #fff;
  font-size: 1.8rem;
@@ -33,7 +35,7 @@
  background-color: C_PRIMARY;
  color: #f2f2f2;
  line-height: .9;
- font-size: 5rem;
+ font-size: 4rem;
  font-weight: bold;
 
  display: block;
@@ -47,6 +49,11 @@
  margin: -20px 0 0 -20px;
 }
 
+.addedit__photo__placeholder img {
+ width: 180px;
+ height: 180px;
+}
+
 .addedit__label {
  display: block;
  margin-bottom: 4px;
@@ -70,3 +77,11 @@
 .addedit__button {
  margin-left: 10px;
 }
+
+/* -- UPLD overwrite -- */
+
+.upld-drop-zone {
+ text-align: center;
+
+ border: 0 !important;
+}