upgrade Bootstrap to 4 (#636)

* upgrade Bootstrap4 * testing with test changes * fix test * fix test * fix center text * remove screenshort command * fix conflict * fix test * fix test * fix conflict * many changes * removed .DS_Store * code css work Co-authored-by: keshav234156 <[email protected]> Co-authored-by: Jeffrey Warren <[email protected]>
publiclab · Oct 13, 2020 · cf1fc4a · cf1fc4a
1 parent 59e5bf6
commit cf1fc4a
Show file tree

Hide file tree

Showing 26 changed files with 293 additions and 173 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1 +1,2 @@
-dist/*.js
+dist/*.js
+Gruntfile.js
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,81 +1,84 @@
 module.exports = function(grunt) {
-  grunt.loadNpmTasks('grunt-browserify');
 
-  require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
+    grunt.loadNpmTasks('grunt-browserify');
 
-  grunt.initConfig({
-    pkg: grunt.file.readJSON('package.json'),
+    require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
 
-    watch: {
-      options: {
-        livereload: true
-      },
-      source: {
-        files: [
-          'src/*.js',
-          'src/*/*.js',
-          'Gruntfile.js'
-        ],
-        tasks: ['build:js']
-      }
-    },
+    grunt.initConfig({
+        pkg: grunt.file.readJSON('package.json'),
 
-    browserify: {
-      dist: {
-        src: [
-          'src/PublicLab.Editor.js'
-        ],
-        dest: 'dist/PublicLab.Editor.js'
-      },
-      debug: {
-        options: {
-          browserifyOptions: {
-            debug: true
-          }
+        watch: {
+            options : {
+                livereload: true
+            },
+            source: {
+                files: [
+                    'src/*.js',
+                    'src/*/*.js',
+                    'Gruntfile.js'
+                ],
+                tasks: [ 'build:js' ]
+            }
+        },
+
+        browserify: {
+            dist: {
+                src: [
+                    'src/PublicLab.Editor.js'
+                ],
+                dest: 'dist/PublicLab.Editor.js'
+            },
+            debug: {
+                options : {
+                    browserifyOptions: {
+                        debug: true
+                    }  
+                }, 
+                src: [
+                    'src/PublicLab.Editor.js'
+                ],
+                dest: 'dist/PublicLab.Editor.js'
+            }
         },
-        src: [
-          'src/PublicLab.Editor.js'
-        ],
-        dest: 'dist/PublicLab.Editor.js'
-      }
-    },
 
-    jasmine: {
-      publiclabeditor: {
-        src: 'dist/*.js',
-        options: {
-          specs: 'spec/javascripts/*spec.js',
-          vendor: [
-            'node_modules/jquery/dist/jquery.min.js',
-            'node_modules/bootstrap/dist/js/bootstrap.min.js',
-            'node_modules/blueimp-file-upload/js/vendor/jquery.ui.widget.js',
-            'node_modules/blueimp-file-upload/js/jquery.iframe-transport.js',
-            'node_modules/blueimp-file-upload/js/jquery.fileupload.js',
-            'node_modules/typeahead.js/dist/typeahead.jquery.js',
-            'node_modules/typeahead.js/dist/bloodhound.js',
-            'node_modules/bootstrap-tokenfield/dist/bootstrap-tokenfield.js',
-            'node_modules/jasmine-jquery/lib/jasmine-jquery.js',
-            'node_modules/jasmine-ajax/lib/mock-ajax.js',
-            'https://maps.googleapis.com/maps/api/js?libraries=places&language=en&key=AIzaSyDWgc7p4WWFsO3y0MTe50vF4l4NUPcPuwE',
-            'node_modules/leaflet-blurred-location/dist/Leaflet.BlurredLocation.js',
-            'node_modules/leaflet/dist/leaflet.js'
-          ]
+        jasmine: {
+          publiclabeditor: {
+            src: 'dist/*.js',
+            options: {
+              specs: 'spec/javascripts/*spec.js',
+              vendor: [
+                'node_modules/jquery/dist/jquery.min.js',
+                'node_modules/popper.js/dist/umd/popper.min.js',
+                'node_modules/bootstrap/dist/js/bootstrap.js',
+                'node_modules/blueimp-file-upload/js/vendor/jquery.ui.widget.js',
+                'node_modules/blueimp-file-upload/js/jquery.iframe-transport.js',
+                'node_modules/blueimp-file-upload/js/jquery.fileupload.js',
+                'node_modules/typeahead.js/dist/typeahead.jquery.js',
+                'node_modules/typeahead.js/dist/bloodhound.js',
+                'node_modules/bootstrap-tokenfield/dist/bootstrap-tokenfield.js',
+                'node_modules/jasmine-jquery/lib/jasmine-jquery.js',
+                'node_modules/jasmine-ajax/lib/mock-ajax.js',
+                'https://maps.googleapis.com/maps/api/js?libraries=places&language=en&key=AIzaSyDWgc7p4WWFsO3y0MTe50vF4l4NUPcPuwE',
+                'node_modules/leaflet-blurred-location/dist/Leaflet.BlurredLocation.js',
+                'node_modules/leaflet/dist/leaflet.js'
+              ] 
+            }
+          }
         }
-      }
-    }
 
-  });
+    });
+
+    /* Default (development): Watch files and build on change. */
+    grunt.registerTask('default', ['watch' , 'jasmine']);
 
-  /* Default (development): Watch files and build on change. */
-  grunt.registerTask('default', ['watch', 'jasmine']);
+    grunt.registerTask('build', [
+        'browserify:dist'
+    ]);
 
-  grunt.registerTask('build', [
-    'browserify:dist'
-  ]);
+    grunt.registerTask('debug', [
+        'browserify:debug'
+    ]);
 
-  grunt.registerTask('debug', [
-    'browserify:debug'
-  ]);
+    grunt.loadNpmTasks('grunt-contrib-jasmine');
 
-  grunt.loadNpmTasks('grunt-contrib-jasmine');
 };
diff --git a/dist/PublicLab.Editor.css b/dist/PublicLab.Editor.css
@@ -1,3 +1,21 @@
+pre {
+  display: block;
+  font-size: 13px;
+  line-height: 1.42857;
+  color: rgb(51, 51, 51);
+  word-break: break-all;
+  overflow-wrap: break-word;
+  background-color: rgb(245, 245, 245);
+  padding: 9.5px;
+  margin: 0px 0px 10px;
+  border-width: 1px;
+  border-style: solid;
+  border-color: rgb(204, 204, 204);
+  border-image: initial;
+  border-radius: 4px;
+}
+
+
 .bug-btn {
   color: #f1f1f1;
   font-size: 1em;