Ver código fonte

Fixed images not showing correctly, by updating packages, removing handlebars,
and changing image attachment view big image popup from swipebox to lightbox.

Thanks to xet7 !

Fixes #4507

Lauri Ojansivu 3 anos atrás
pai
commit
990477e9c6

+ 1 - 1
.meteor/packages

@@ -61,7 +61,6 @@ meteor-autosize
 rajit:bootstrap3-datepicker
 shell-server@0.5.0
 email@2.2.1
-horka:swipebox
 dynamic-import@0.7.2
 
 cfs:gridfs
@@ -146,3 +145,4 @@ wekan-oidc
 wekan-accounts-oidc
 wekan-ldap
 wekan-accounts-cas
+czbaker:lightbox2

+ 1 - 1
.meteor/versions

@@ -43,6 +43,7 @@ coffeescript@2.4.1
 coffeescript-compiler@2.4.1
 communitypackages:picker@1.1.0
 cottz:publish-relations@2.0.8
+czbaker:lightbox2@2.7.1_1
 dburles:collection-helpers@1.1.0
 ddp@1.4.0
 ddp-client@2.5.0
@@ -64,7 +65,6 @@ fastclick@1.0.13
 fetch@0.1.1
 fortawesome:fontawesome@4.7.0
 geojson-utils@1.0.10
-horka:swipebox@1.0.2
 hot-code-push@1.0.4
 html-tools@1.1.3
 htmljs@1.1.1

+ 1 - 1
client/components/cards/attachments.jade

@@ -19,7 +19,7 @@ template(name="attachmentsGalery")
   .attachments-galery
     each attachments
       .attachment-item
-        a.attachment-thumbnail.swipebox(href="{{link}}" title="{{name}}")
+        a.attachment-thumbnail(href="{{link}}" title="{{name}}" data-lightbox="{{name}}")
           if link
             if isImage
               img.attachment-thumbnail-img(src="{{link}}")

+ 46 - 4
client/components/main/layouts.css

@@ -1,9 +1,6 @@
-* {
-  -webkit-box-sizing: unset;
-  box-sizing: unset;
-}
 /* Fixed missing 'import nib' stylesheet reset and extra li bullet points
  * https://github.com/wekan/wekan/issues/4512#issuecomment-1129347536
+ * https://github.com/stylus/nib/blob/master/lib/nib/reset.styl
  */
 a, abbr, acronym, address, applet, big, blockquote, body, caption, cite,
 code, dd, del, dfn, div, dl, dt, em, fieldset, form, h1, h2, h3, h4, h5,
@@ -19,6 +16,51 @@ table, tbody, td, tfoot, th, thread, tr, tt, ul, var {
   font-size: 100%;
   vertical-align: baseline;
 }
+ol, ul {
+  list-style: none;
+}
+a img {
+  border: none;
+}
+/* reset body */
+body {
+  line-height: 1;
+  color: black;
+  background: white;
+}
+/* reset table cell */
+table {
+  border-collapse: separate;
+  border-spacing: 0;
+  vertical-align: middle;
+}
+caption, td, th {
+  text-align: left;
+  font-weight: normal;
+  vertical-align: middle;
+}
+/* reset html5 */
+article, aside, canvas, details, figcaption,
+  figure, footer, header, hgroup, menu, nav,
+  section, summary, main {
+  display: block;
+}
+audio, canvas, video {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+}
+audio:not([controls]),[hidden] {
+  display: none;
+}
+
+/* End of reset css */
+
+
+* {
+  -webkit-box-sizing: unset;
+  box-sizing: unset;
+}
 .note-popover .popover-content .note-color-palette div .note-color-btn,
 .panel-heading.note-toolbar .note-color-palette div .note-color-btn {
   background: none;

Diferenças do arquivo suprimidas por serem muito extensas
+ 5476 - 170
package-lock.json


+ 2 - 1
package.json

@@ -39,7 +39,7 @@
     "fibers": "^5.0.0",
     "i18next": "^21.6.16",
     "i18next-sprintf-postprocessor": "^0.2.2",
-    "jquery": "^2.2.4",
+    "jQuery": "^1.7.4",
     "jquery-ui": "^1.13.0",
     "jquery-ui-touch-punch": "^0.2.3",
     "jszip": "^3.7.1",
@@ -57,6 +57,7 @@
     "qs": "^6.10.1",
     "simpl-schema": "^1.12.0",
     "source-map-support": "^0.5.20",
+    "summernote": "^0.8.20",
     "uuid": "^8.3.2"
   },
   "meteor": {

+ 0 - 59
public/css/reset.css

@@ -1,59 +0,0 @@
-/* Fixed missing 'import nib' stylesheet reset and extra li bullet points
- * https://github.com/wekan/wekan/issues/4512#issuecomment-1129347536
- * https://github.com/stylus/nib/blob/master/lib/nib/reset.styl
- */
-a, abbr, acronym, address, applet, big, blockquote, body, caption, cite,
-code, dd, del, dfn, div, dl, dt, em, fieldset, form, h1, h2, h3, h4, h5,
-h6, html, iframe, img, ins, kbd, label, legend, li, object, ol, p, pre,
-q, s, samp, small, span, strike, strong, sub, sup,
-table, tbody, td, tfoot, th, thread, tr, tt, ul, var {
-  margin: 0;
-  padding: 0;
-  outline: 0;
-  font-weight: inherit;
-  font-style: inherit;
-  font-family: inherit;
-  font-size: 100%;
-  vertical-align: baseline;
-}
-ol, ul {
-  list-style: none;
-}
-a img {
-  border: none;
-}
-/* reset body */
-body {
-  line-height: 1;
-  color: black;
-  background: white;
-}
-/* reset table cell */
-table {
-  border-collapse: separate;
-  border-spacing: 0;
-  vertical-align: middle;
-}
-caption, td, th {
-  text-align: left;
-  font-weight: normal;
-  vertical-align: middle;
-}
-/* reset html5 */
-article, aside, canvas, details, figcaption,
-  figure, footer, header, hgroup, menu, nav,
-  section, summary, main {
-  display: block;
-}
-audio, canvas, video {
-  display inline-block;
-  *display inline;
-  *zoom 1;
-}
-audio:not([controls]),[hidden] {
-  display: none;
-}
-
-
-
-

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff