Merge 839465d into 840f8dd

ProjectMirador · Aug 21, 2017 · c02f506 · c02f506
2 parents 840f8dd + 839465d
commit c02f506
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/css/less/window.less b/css/less/window.less
@@ -1,10 +1,11 @@
 .mirador-container {
   .window {
-    position:relative;
+    position:absolute;
     width:100%;
     height:100%;
     overflow: hidden;
     background-color: @black-33;
+    top: 0%;
   }
 
   .manifest-info {

diff --git a/css/less/workspace.less b/css/less/workspace.less
@@ -43,6 +43,7 @@
       color: @gray;
       text-align: center;
       font-weight: normal;
+      margin: 0px;
     }
 
     &:hover h1 {
@@ -53,13 +54,13 @@
   .plus {
     font-size: 170px;
     font-weight: bold;
-    margin-bottom: 20px;
+    margin-bottom: 2%;
   }
 
   .slotIconContainer {
-    position: absolute;
+    position: relative;
     top: 50%;
-    margin-top: -260px;
+    transform: translateY(-50%);
     width: 100%;
     overflow: hidden;
     pointer-events: none;

diff --git a/js/src/workspaces/slot.js b/js/src/workspaces/slot.js
@@ -171,13 +171,13 @@
 
           _this.eventEmitter.publish('ADD_WINDOW', windowConfig);
 
-        } 
-        
+        }
+
         else if (typeof imageInfoUrl !== 'undefined') {
           if (!_this.state.getStateProperty('manifests')[imageInfoUrl]) {
             _this.eventEmitter.publish('ADD_MANIFEST_FROM_URL', [imageInfoUrl, "(Added from URL)"]);
           }
-        } 
+        }
         else if (typeof collectionUrl !== 'undefined'){
           jQuery.getJSON(collectionUrl).done(function (data, status, jqXHR) {
             if (data.hasOwnProperty('manifests')){
@@ -195,11 +195,11 @@
             }
           });
 
-          //TODO: 
+          //TODO:
           //this works;
           //but you might want to check if some "publish" action would be better
           _this.addItem();
-          
+
         }
         else {
           if (!_this.state.getStateProperty('manifests')[imageInfoUrl]) {
@@ -274,6 +274,7 @@
     // template should be based on workspace type
     template: $.Handlebars.compile([
                                  '<div id="{{slotID}}" class="{{workspaceSlotCls}}">',
+                                 '<a class="remove-slot-option"><i class="fa fa-times fa-lg fa-fw"></i> {{t "close"}}</a>',
                                  '<div class="slotIconContainer">',
                                  // '<a href="javascript:;" class="mirador-btn mirador-icon-window-menu" title="Replace object"><i class="fa fa-table fa-lg fa-fw"></i>',
                                  // '<ul class="dropdown slot-controls">',
@@ -298,7 +299,6 @@
                                  '<h1 class="dropMeMessage">{{t "dropToLoad"}}</h1>',
                                  '</div>',
                                  '<a class="addItemLink" role="button" aria-label="Add item"></a>',
-                                 '<a class="remove-slot-option"><i class="fa fa-times fa-lg fa-fw"></i> {{t "close"}}</a>',
       '<a class="dropMask"></a>',
                                  '</div>'
     ].join(''))