Merge pull request #1474 from ProjectMirador/develop

Release 2.6.0
ProjectMirador · Sep 15, 2017 · 61bd302 · 61bd302
2 parents ea1d34f + 804d978
commit 61bd302
Show file tree

Hide file tree

Showing 48 changed files with 813 additions and 333 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -49,6 +49,7 @@ module.exports = function(grunt) {
     'js/lib/sanitize-html.min.js',
     'node_modules/iiif-evented-canvas/dist/iiif-evented-canvas.umd.min.js',
     'node_modules/iiif-layout-functions/dist/iiif-layout-functions.umd.min.js',
+    'node_modules/select2/dist/js/select2.full.min.js'
   ],
 
   // source files
@@ -96,6 +97,7 @@ module.exports = function(grunt) {
           'css/jquery-ui.min.css',
           'css/jquery.qtip.min.css',
           'node_modules/spectrum-colorpicker/spectrum.css',
+          'node_modules/select2/dist/css/select2.min.css',
           'css/mirador.css',
           'css/material-icons.css',
           'bower_components/simplePagination.js/simplePagination.css'

diff --git a/css/less/global.less b/css/less/global.less
@@ -157,4 +157,27 @@
     /*color: @gray-91;*/
     box-sizing: border-box;
   }
+
+  input[type="submit"],
+  input[type="text"] {
+    height:25px;
+    border:1px solid @light-gray;
+    transition: border-color 0.3s ease-out;
+  }
+
+  input:focus {
+    outline: none;
+    border-color: @deep-sky-blue;
+  }
+
+  input[type="submit"] {
+    color: gray;
+    background: @white;
+  }
+
+  input[type="submit"]:hover {
+    outline: none;
+    border-color: @deep-sky-blue;
+    color: @black-33;
+  }
 }
diff --git a/css/less/main.less b/css/less/main.less
@@ -24,3 +24,4 @@
 @import 'panels/metadata-view';
 @import 'panels/bottom-panel';
 @import 'panels/layers-tab';
+@import 'panels/search-tab';
diff --git a/css/less/overrides/qtip.less b/css/less/overrides/qtip.less
@@ -68,7 +68,7 @@
     /* background-color: black; */
   }
 
-  .text-editor, .tags-editor {
+  .text-editor, .tags-editor, .select2-container {
     padding: 5px;
     display: block;
     margin: 6px 0px 6px 0px;
@@ -77,6 +77,13 @@
     box-shadow: inset 0 0 7px @gray;
     resize: vertical;
     border: 1px solid @gray;
+    width: 200px;
+
+    .select2-selection--multiple {
+      border: none;
+      background-color: inherit;
+      font-size: 16px;
+    }
   }
 
   .annotation-display.annotation-tooltip .button-container {

diff --git a/css/less/panels/layers-tab.less b/css/less/panels/layers-tab.less
@@ -19,8 +19,7 @@
   }
   .layers-list-item {
     .clearfix();
-    border-top: 1px solid gray;
-    border-bottom: 1px solid gray;
+    border-top: 1px solid @gray-b1;
     padding: 10px 10px 10px 0;
     margin-right: 20px;
     &>h4 {

diff --git a/css/less/panels/manifest-select-menu.less b/css/less/panels/manifest-select-menu.less
@@ -247,15 +247,6 @@
       display: table;
       clear: both;
     }
-
-    input {
-      height:25px;
-      border:1px solid @light-gray;
-      color: gray;
-      background:none;
-      border-radius: 2px;
-      transition: border-color 0.3s ease-out;
-    }
   }
 
   #manifest-search-form {

diff --git a/css/less/panels/metadata-view.less b/css/less/panels/metadata-view.less
@@ -1,10 +1,12 @@
 .mirador-container {
   .mirador-viewer .sub-title {
-    border-bottom: 2px solid @gray-cc;
-    color: @gray-66;
+    border-bottom: 1px solid @gray-b1;
+    color: @black-33;
     font-weight: bold;
     margin: 10px 20px 5px 20px;
     padding: 0 5px 5px 0;
+    font-size: 120%;
+    text-transform: uppercase;
   }
 
   .mirador-viewer .metadata-listing {
@@ -15,16 +17,17 @@
   }
 
   .mirador-viewer .metadata-item {
-    padding: 5px 0;
+    padding: 10px 0 5px 0;
   }
 
   .mirador-viewer .metadata-label, .mirador-viewer .metadata-value {
     line-height: 1.5;
   }
 
   .mirador-viewer .metadata-label {
-    color: @gray-55;
+    color: @gray-66;
     font-style: italic;
+    text-transform: uppercase;
   }
 
   .mirador-viewer .metadata-value {

diff --git a/css/less/panels/search-tab.less b/css/less/panels/search-tab.less
@@ -0,0 +1,44 @@
+.mirador-container {
+
+	.search-results {
+		padding:0 5px 0 0;
+    margin:0;
+    position:absolute;
+    height: 100%;
+
+    select {
+      margin: 5px 0 10px 0;
+    }
+	}
+
+	.search-results-list {
+		position: relative;
+		height: 100%;
+
+		.search-results-messages {
+			border-top: 1px solid @gray-b1;
+    	padding-top: 10px;
+    	margin-top: 10px;
+		}
+
+		.search-results-count {
+			font-size: .85em;
+		}
+
+    .search-results-container {
+      overflow-y: scroll;
+      position: absolute;
+      height: 70%;
+    }
+
+    .result-wrapper {
+			margin-bottom: 5px;
+
+			.result-paragraph {
+				.highlight {
+					background-color: rgb(255, 255, 0);
+				}
+    	}
+    } 
+	}
+}
diff --git a/css/less/panels/side-panel.less b/css/less/panels/side-panel.less
@@ -22,25 +22,30 @@
     }
 
     .tab {
-      padding: 4px 6px;
-      border-left:0;
-      border-bottom: 2px solid @black;
+      padding: 8px;
+      margin-right: 2px;
       display: inline-block;
       cursor: pointer;
-      border-radius: 3px 3px 0 0;
+      background: @gray-dd;
+      border-width: 1px 1px 0 1px;
+      border-color: @gray-b1;
+      border-style: solid;
+      color: @gray-66;
+      font-size: .9em;
     }
-
+  
     .tab:not(.selected):hover {
-      border: 2px solid @black-a30;
-      border-bottom: 2px solid @black;
-      padding:4px 4px;
+      background: @light-gray;
+      color: @black-33;
     }
 
     .tab.selected {
-      border: 2px solid @black;
-      border-bottom:0;
-      border-radius: 3px 3px 0 0;
-      margin: 0 -2px;
+      font-weight: bold;
+      color: @black-33;
+      background: @gray-ef;
+      border-top-width: 1px;
+      border-top-style: solid;
+      border-top-color: deepskyblue;
     }
 
     .annotationListItem {
@@ -78,6 +83,18 @@
       text-decoration: none;
     }
 
+    h2 {
+      font-size: 1em;
+    }
+
+    h3 {
+      font-size: .9em;
+    }
+
+    h4 {
+      font-size: .8em;
+    }
+
     h1, h2, h3, h4 {
       margin:0;
       padding:0;
@@ -86,21 +103,6 @@
 
     h1:hover, h2:hover, h3:hover, h4:hover {
     }
-
-    /*
-    h2 {
-      font-size: 1.5em;
-    }
-    h3 {
-      font-size: 1.25em;
-    }
-    h4 {
-      font-size: 1.0em;
-    }
-    h5 {
-      font-size: .75em;
-    }
-    */
   }
 
   .sidePanel.minimized {
@@ -120,30 +122,14 @@
     box-sizing: border-box;
     overflow: hidden;
     transition: all 0.3s ease;
+    margin-top: 8px;
   }
 
   .annotationsPanel ul {
     padding:0;
     margin:0;
   }
 
-  .search-results {
-    padding:0 5px 0 0;
-    margin:0;
-    position:absolute;
-    height: 100%;
-
-    .search-results-container {
-      overflow-y: scroll;
-      position: absolute;
-      height: 70%;
-    }
-
-    .search-results-list .result-wrapper .result-paragraph .highlight {
-      background-color: rgb(255, 255, 0);
-    }
-  }
-
   .toc {
     margin:0;
     overflow-y: scroll;
@@ -155,7 +141,7 @@
     top:0px;
     bottom:0;
     list-style-type:none;
-    font-size: 75%;
+    margin-bottom: 30px; /* fix overflow-y bug when .tabGroup is present */
 
     a.toc-link {
       color: black;
@@ -186,6 +172,7 @@
       position:relative;
       margin-left:8px;
       margin-bottom: 5px;
+      border-left: 4px solid @gray-ef;
 
       &.open {
       }
@@ -197,6 +184,10 @@
         transition: all 0.2s ease-out;
       }
     }
+
+    > li {
+      margin-left: 0;
+    }
   }
 
   .toc-link i {
@@ -273,9 +264,9 @@
     color:black;
   }
 
-  .toc li:hover>h2 a.toc-link, .toc li:hover>h3 a.toc-link, .toc li:hover>h4 a.toc-link, .toc li:hover>h5 a.toc-link, .toc li:hover>h6 a.toc-link {
-    font-weight: bold;
-  }
+  // .toc li:hover>h2 a.toc-link, .toc li:hover>h3 a.toc-link, .toc li:hover>h4 a.toc-link, .toc li:hover>h5 a.toc-link, .toc li:hover>h6 a.toc-link {
+  //   font-weight: bold;
+  // }
 
   /*
   .toc li:hover > h2 a {

diff --git a/css/less/views/gallery-view.less b/css/less/views/gallery-view.less
@@ -92,4 +92,9 @@
   .hud-control .ui-slider-range {
     background: @deep-sky-blue;
   }
+
+  .thumbnail-rtl{
+    float: right !important;
+  }
+
 }
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 {
@@ -56,6 +57,7 @@
     overflow-y: scroll;
     height: 80%;
     word-wrap: break-word;
+    font-size: 90%;
   }
 
   .thumbnail-view, .image-view, .book-view, .scroll-view {
@@ -96,4 +98,8 @@
     margin: 0px;
     height: 0px;
   }
+
+  .v-direction-rtl {
+    direction: rtl;
+  }
 }