chore(draw-ui): fix typos. Improve styling. grunt build works

See issue #3.
mozilla · Sep 22, 2014 · 3072dd5 · 3072dd5
1 parent 055b8df
commit 3072dd5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 17 deletions.
diff --git a/app/index.html b/app/index.html
@@ -8,13 +8,13 @@
     <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
     <!-- build:css(.) styles/vendor.css -->
     <!-- bower:css -->
+    <link rel="stylesheet" href="bower_components/jsplumb/dist/css/jsplumb.css" />
+    <link rel="stylesheet" href="bower_components/jsplumb/css/demo-all.css" />
     <!-- endbower -->
     <!-- endbuild -->
     <!-- build:css(.tmp) styles/main.css -->
     <link rel="stylesheet" href="styles/main.css">
     <!-- endbuild -->
-    <link rel="stylesheet" href="bower_components/jsplumb/dist/css/jsplumb.css">
-    <link rel="stylesheet" href="bower_components/jsplumb/dist/css/demo-all.css">
   </head>
   <body ng-app="seaspongeApp">
     <!--[if lt IE 7]>

diff --git a/app/scripts/controllers/draw.coffee b/app/scripts/controllers/draw.coffee
@@ -12,13 +12,10 @@ angular.module('seaspongeApp')
 
     jsPlumb.ready ->
       instance = jsPlumb.getInstance(
-
         # default drag options
         DragOptions:
           cursor: "pointer"
           zIndex: 2000
-
-
         # the overlays to decorate each connection with.  note that the label overlay uses a function to generate the label text; in this
         # case it returns the 'labelText' member that we set on each connection in the 'init' method below.
         ConnectionOverlays: [
@@ -49,7 +46,6 @@ angular.module('seaspongeApp')
         outlineWidth: 2
 
       connectorHoverStyle =
-
         # .. and this is the hover style.
         lineWidth: 4
         strokeStyle: "#216477"
@@ -61,15 +57,13 @@ angular.module('seaspongeApp')
         strokeStyle: "#216477"
 
       sourceEndpoint =
-
         # the definition of source endpoints (the small blue ones)
         endpoint: "Dot"
         paintStyle:
           strokeStyle: "#7AB02C"
           fillStyle: "transparent"
           radius: 7
           lineWidth: 3
-
         isSource: true
         connector: [
           "Flowchart"
@@ -100,19 +94,16 @@ angular.module('seaspongeApp')
         ]]
 
       targetEndpoint =
-
         # the definition of target endpoints (will appear when the user drags a connection)
         endpoint: "Dot"
         paintStyle:
           fillStyle: "#7AB02C"
           radius: 11
-
         hoverPaintStyle: endpointHoverStyle
         maxConnections: -1
         dropOptions:
           hoverClass: "hover"
           activeClass: "active"
-
         isTarget: true
         overlays: [[
           "Label"
@@ -140,15 +131,13 @@ angular.module('seaspongeApp')
           instance.addEndpoint "flowchart" + toId, sourceEndpoint,
             anchor: sourceAnchors[i]
             uuid: sourceUUID
-
           i++
         j = 0
         while j < targetAnchors.length
           targetUUID = toId + targetAnchors[j]
           instance.addEndpoint "flowchart" + toId, targetEndpoint,
             anchor: targetAnchors[j]
             uuid: targetUUID
-
           j++
         return
 

diff --git a/app/views/draw.html b/app/views/draw.html
@@ -17,7 +17,7 @@
     </div>
 
     <ul class="nav nav-pills">
-      <li class="" <li class=""><a href="#"><i class="glyphicon glyphicon-floppy-save"></i></a>
+      <li class=""><a href="#"><i class="glyphicon glyphicon-floppy-save"></i></a>
       </li>
       <li><a href="#">Profile</a>
       </li>
@@ -65,7 +65,6 @@ <h3 class="panel-title">Stencils</h3>
         </div>
         <div class="panel-body">
 
-          Nav tabs
           <ul class="nav nav-tabs" role="tablist">
             <li class="active"><a href="#home" role="tab" data-toggle="tab">OS Process</a>
             </li>
@@ -77,7 +76,6 @@ <h3 class="panel-title">Stencils</h3>
             </li>
           </ul>
 
-          Tab panes
           <div class="tab-content">
             <div class="tab-pane active" id="home">
 

diff --git a/bower.json b/bower.json
@@ -22,7 +22,11 @@
   },
   "overrides": {
     "jsplumb": {
-      "main": "dist/js/jquery.jsPlumb-1.6.4.js"
+      "main": [
+        "dist/css/jsplumb.css",
+        "css/demo-all.css",
+        "dist/js/jquery.jsPlumb-1.6.4.js"
+      ]
     }
   }
 }