[#2011] Merge branch '#1966-results-frontend' into #2011-results-improve

akvo · Mar 31, 2016 · af45b2b · af45b2b
2 parents 3d33e23 + 0ee4ec4
commit af45b2b
Show file tree

Hide file tree

Showing 5 changed files with 498 additions and 138 deletions.
diff --git a/akvo/rsr/static/scripts-src/my-results.js b/akvo/rsr/static/scripts-src/my-results.js
@@ -580,7 +580,7 @@ function initReact() {
             if (this.props.update.photo_url === "") {
                 // If no photo has been uploaded, do not show the photo.
                 photoPart = React.DOM.span(null );
-                descriptionClass = "update-description";
+                descriptionClass = "col-xs-12 update-description";
             } else {
                 // Also display a photo.
                 if (this.editing()) {
@@ -602,7 +602,7 @@ function initReact() {
                         )
                     );
                 }
-                descriptionClass = "col-xs-7 update-description";
+                descriptionClass = "col-xs-12 update-description";
             }
 
             if (this.editing()) {
@@ -627,7 +627,7 @@ function initReact() {
             }
 
             return (
-                React.DOM.div( {className:""}, 
+                React.DOM.div( {className:"row"}, 
                     photoPart,
                     descriptionPart
                 )

diff --git a/akvo/rsr/static/scripts-src/my-results.jsx b/akvo/rsr/static/scripts-src/my-results.jsx
@@ -580,7 +580,7 @@ function initReact() {
             if (this.props.update.photo_url === "") {
                 // If no photo has been uploaded, do not show the photo.
                 photoPart = <span />;
-                descriptionClass = "update-description";
+                descriptionClass = "col-xs-12 update-description";
             } else {
                 // Also display a photo.
                 if (this.editing()) {
@@ -602,7 +602,7 @@ function initReact() {
                         </a>
                     </div>;
                 }
-                descriptionClass = "col-xs-7 update-description";
+                descriptionClass = "col-xs-12 update-description";
             }
 
             if (this.editing()) {
@@ -627,7 +627,7 @@ function initReact() {
             }
 
             return (
-                <div className="">
+                <div className="row">
                     {photoPart}
                     {descriptionPart}
                 </div>

diff --git a/akvo/rsr/static/styles-src/library.css b/akvo/rsr/static/styles-src/library.css
@@ -28,4 +28,4 @@
 /* Media Queries
   ========================================================================== */
 /* Placeholder
-  ========================================================================== */
+  ========================================================================== */