Merge pull request #277 from cmv/develop

Merge Develop into Master for 1.3.1 release

Gruntfile.js

@@ -54,21 +54,21 @@ module.exports = function(grunt) {
       build: {
         expand: true,
         cwd: 'dist/viewer',
-        src: ['**/*.css', '!**/dbootstrap/**'],
+        src: ['**/*.css'],
         dest: 'dist/viewer'
       }
     },
     cssmin: {
       build: {
         expand: true,
         cwd: 'dist/viewer',
-        src: ['**/*.css', '!**/dbootstrap/**'],
+        src: ['**/*.css'],
         dest: 'dist/viewer'
       }
     },
     jshint: {
       build: {
-        src: ['viewer/**/*.js', '!**/dbootstrap/**', '!**/TOC.js'],
+        src: ['viewer/**/*.js'],
         options: {
           jshintrc: '.jshintrc',
           reporter: require('jshint-stylish')
@@ -138,7 +138,7 @@ module.exports = function(grunt) {
         files: [{
           expand: true,
           cwd: 'dist/viewer',
-          src: ['**']
+          src: ['**', '!**/dijit.css']
         }]
       }
     }

README.md

@@ -65,7 +65,7 @@ There are many ways to contribute to CMV:
 
 2. __Submit an Issue__ - If you find a possible bug, please submit an issue in the [issues log](https://github.com/cmv/cmv-app/issues?state=open).
 
-3. __User contributed widgets__ - Users can submit widgets to the [cmv-contrib-widgets](https://github.com/cmv/cmv-contrib-widgets) repo. These widgets are created and submitted by users. Head on over and read the details.
+3. __User contributed widgets__ - For general information on how to build a CMV widget read [Builiding Custom Widgets] (https://github.com/cmv/cmv-app/wiki/building-custom-widgets). Users can submit widgets to the [cmv-contrib-widgets](https://github.com/cmv/cmv-contrib-widgets) repo. These widgets are created and submitted by users. Head on over and read the details.
 
 4. __Create documentation__ Please make constructive in [the wiki](https://github.com/cmv/cmv-app/wiki).
 
@@ -88,13 +88,13 @@ This project uses grunt to automate tasks like minifying css and js as well as j
 
 - Clone your fork and in cloned directory:
 
-- Install the local dev dependencies for the project in the repo from the command line: `npm install`, this only needs to be done once per dev machine.
+  - Install the local dev dependencies for the project in the repo from the command line: `npm install`, this only needs to be done once per dev machine.
 
-- Run grunt from the repo with: `grunt` this will launch a mini dev server and lint your js as you code.
+  - Run grunt from the repo with: `grunt` this will launch a mini dev server and lint your js as you code.
 
-- Run grunt from the repo with: `grunt build` this will create a `dist` folder with minified code ready for deployment.
+  - Run grunt from the repo with: `grunt build` this will create a `dist` folder with minified code ready for deployment.
 
-- There are other grunt tasks, use: `grunt -h` to see a list.
+  - There are other grunt tasks, use: `grunt -h` to see a list.
 
 # License
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ConfigurableMapViewerCMV",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "author": "cmv.io - https://github.com/cmv/",
   "license": "MIT",
   "year": "2014",

viewer/css/main.css

@@ -57,6 +57,8 @@ body, html {
     bottom: 0;
     left: 0;
     right: 0;
+    border: none;
+    padding: 0;
     background-color: #FFFFFF
 }
 #sidebarLeft {
@@ -124,17 +126,26 @@ body, html {
     cursor: pointer;
     color: #666666;
     font-size: 1.3em;
+    font-family: FontAwesome;
 }
 .sidebarCollapseButtonHorz {
     width: 16px;
     height: 25px;
+    top: 48%;
+    top: -webkit-calc(50% - 12px);
+    top: -moz-calc(50% - 12px);
+    top: -o-calc(50% - 12px);
     top: calc(50% - 12px);
     border-bottom: 1px solid #B5BCC7;
     border-top: 1px solid #B5BCC7;
 }
 .sidebarCollapseButtonVert {
     width: 25px;
     height: 18px;
+    left: 48%;
+    left: -webkit-calc(50% - 12px);
+    left: -moz-calc(50% - 12px);
+    left: -o-calc(50% - 12px);
     left: calc(50% - 12px);
     border-left: 1px solid #B5BCC7;
     border-right: 1px solid #B5BCC7;