Merge master

Freegle · Feb 13, 2019 · f72cf78 · f72cf78
2 parents 0da0d58 + 079ba6b
commit f72cf78
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/dev/webpack.appfd.config.js b/dev/webpack.appfd.config.js
@@ -73,7 +73,7 @@ module.exports = new Config().extend({
     }),
     // CC new FaviconsPlugin('images/user_logo.png'),
     new webpack.DefinePlugin({
-      APP_VERSION: JSON.stringify('1.4.10, 12 February 2018'),
+      APP_VERSION: JSON.stringify('1.4.10, 13 February 2018'),
       // CC SET ABOVE: API: JSON.stringify(BASE_URL+'/api/'),
       FACEBOOK_APPID: JSON.stringify('134980666550322'),
       FACEBOOK_GRAFFITI_APPID: JSON.stringify('115376591981611'),

diff --git a/http/css/user.css b/http/css/user.css
@@ -460,6 +460,15 @@ h1,h2,h3,h4 {
     background: #f5f5f5;
 }
 
+.js-draftphotos li.completefull {
+    width: initial !important;
+    padding-right: 5px !important;
+}
+
+.js-draftphotos .photobadge, .js-draftphotos .photobadgexs {
+    display: none !important;
+}
+
 .groupdescription {
     max-height: 500px;
     overflow-y: auto;
@@ -585,4 +594,3 @@ table.table-fixedheader>tbody>tr>td {
 .glyphicons:before { /* Make rotate smooth CC */
   padding: 6px 6px;
 }
-
diff --git a/http/js/iznik/views/pages/user/newsfeed.js b/http/js/iznik/views/pages/user/newsfeed.js
@@ -2033,7 +2033,7 @@ define([
             identify: false
           },
           browseIcon: '<span class="glyphicon glyphicon-plus" />&nbsp;',
-          browseLabel: 'Add photos',
+          browseLabel: 'Add photo',
           browseClass: 'btn btn-primary nowrap',
           errorContainer: '#js-uploaderror'
         })

diff --git a/http/js/iznik/views/pages/user/post.js b/http/js/iznik/views/pages/user/post.js
@@ -369,7 +369,7 @@ define([
             identify: true
           },
           browseIcon: '<span class="glyphicon glyphicon-plus" />&nbsp;',
-          browseLabel: 'Add photos',
+          browseLabel: 'Add photo',
           browseClass: 'btn btn-success btn-lg nowrap pull-right',  // CC
           errorContainer: '#js-uploaderror'
         })