Skip to content

Commit

Permalink
upgraded to mirador 2.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
datazuul committed Oct 28, 2016
1 parent 5f5762e commit 6c6afcc
Show file tree
Hide file tree
Showing 14 changed files with 176 additions and 353 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2125,7 +2125,7 @@ a {
top: 0;
display: none;
overflow: hidden;
z-index: 101;
z-index: 18000; /* Must be higher than Qtip elements. */
background-color: #fff;
box-shadow: 0 0 6px #333;
}
Expand Down Expand Up @@ -2998,18 +2998,61 @@ li.highlight {
top:50%;
margin-top:-35px;
width: 40px;
-webkit-transform : translateY(0px);
-moz-transform : translateY(0px);
-ms-transform : translateY(0px);
-o-transform : translateY(0px);
transform : translateY(0px);
transition: all 0.2s ease-out;
}
.mirador-osd-previous.bottom-panel-open {
-webkit-transform : translateY(-65px);
-moz-transform : translateY(-65px);
-ms-transform : translateY(-65px);
-o-transform : translateY(-65px);
transform : translateY(-65px);
transition: all 0.2s ease-out;
}
.mirador-osd-next {
position:absolute;
right:1%;
top:50%;
margin-top:-35px;
-webkit-transform : translateY(0px);
-moz-transform : translateY(0px);
-ms-transform : translateY(0px);
-o-transform : translateY(0px);
transform : translateY(0px);
transition: all 0.2s ease-out;
}
.mirador-osd-next.bottom-panel-open {
-webkit-transform : translateY(-65px);
-moz-transform : translateY(-65px);
-ms-transform : translateY(-65px);
-o-transform : translateY(-65px);
transform : translateY(-65px);
transition: all 0.2s ease-out;
}
.mirador-osd-toggle-bottom-panel {
position: absolute;
bottom:0;
right:50%;
margin-right: -25px;
-webkit-transform : translateY(0px);
-moz-transform : translateY(0px);
-ms-transform : translateY(0px);
-o-transform : translateY(0px);
transform : translateY(0px);
transition: all 0.2s ease-out;
}

.mirador-osd-toggle-bottom-panel.bottom-panel-open {
-webkit-transform : translateY(-130px);
-moz-transform : translateY(-130px);
-ms-transform : translateY(-130px);
-o-transform : translateY(-130px);
transform : translateY(-130px);
transition: all 0.2s ease-out;
}
.mirador-pan-zoom-controls {
position: absolute;
Expand All @@ -3019,6 +3062,14 @@ li.highlight {
right:0;
margin:1%;
}
.mirador-pan-zoom-controls.bottom-panel-open {
-webkit-transform : translateY(-130px);
-moz-transform : translateY(-130px);
-ms-transform : translateY(-130px);
-o-transform : translateY(-130px);
transform : translateY(-130px);
transition: all 0.2s ease-out;
}
.mirador-osd-up {
position:absolute;
right:20px;
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"addSlotLeft": "Ajouter une fenêtre à gauche",
"addSlotRight": "Ajouter une fenêtre à droite",
"addTagsHere": "Ajouter des mots-clés",
"annotationTooltip": "Annoter / Voir les annotations",
"bookmark": "Sauvegarder / Partager",
"bookmarkTitle": "Sauvegarder ou partager cet espace de travail",
"bookmarkTooltip": "Obtenir le lien vers cet espace de travail",
Expand Down Expand Up @@ -40,6 +41,7 @@
"fullScreenTooltip": "Ouvrir en plein écran",
"fullScreenWindowTooltip": "Ouvrir cette fenêtre en plein écran",
"grayscaleTooltip": "Niveaux de gris",
"imageManipulationTooltip": "Modifier les réglages de l'image",
"imageView": "Simple page",
"invertTooltip": "Couleurs inversées",
"item": "objet",
Expand All @@ -53,6 +55,7 @@
"no": "Non",
"objectMetadata": "Métadonnées",
"pinTooltip": "Marqueur",
"pointerTooltip": "Pointeur",
"polygonTooltip": "Polygone",
"rectangleTooltip": "Rectangle",
"resetTooltip": "Réinitialiser",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"addSlotLeft": "左にスロット追加",
"addSlotRight": "右にスロット追加",
"addTagsHere": "ここでタグを追加",
"annotationTooltip": "アノテーション",
"bookmark": "ブックマーク",
"bookmarkTitle": "現在の表示内容をブックマーク",
"bookmarkTooltip": "このインスタンスをブックマーク",
Expand Down Expand Up @@ -39,7 +40,8 @@
"fullScreen": "全画面表示",
"fullScreenTooltip": "フルスクリーン表示",
"fullScreenWindowTooltip": "このウインドウをフルスクリーン表示",
"grayscaleTooltip": "グレースケールに切替え",
"grayscaleTooltip": "グレースケール",
"imageManipulationTooltip": "画像操作",
"imageView": "画像表示モード",
"invertTooltip": "色反転",
"item": "アイテム",
Expand All @@ -53,6 +55,7 @@
"no": "いいえ",
"objectMetadata": "オブジェクトのメタデータ",
"pinTooltip": "ピンポイントで注釈",
"pointerTooltip": "ポインター",
"polygonTooltip": "多角形で注釈",
"rectangleTooltip": "矩形で注釈",
"resetTooltip": "設定をリセット",
Expand All @@ -69,6 +72,6 @@
"thumbnailsView": "ギャラリー表示モード",
"unspecified": "未特定の",
"url": "URL",
"viewTypeTooltip": "表示モードを切替え",
"viewTypeTooltip": "表示モード切替え",
"yes": "はい"
}
200 changes: 115 additions & 85 deletions src/main/resources/static/js/vendor/mirador/mirador.js

Large diffs are not rendered by default.

33 changes: 0 additions & 33 deletions src/main/resources/static/mirador/locales/de-DE/translation.json

This file was deleted.

33 changes: 0 additions & 33 deletions src/main/resources/static/mirador/locales/de/translation.json

This file was deleted.

33 changes: 0 additions & 33 deletions src/main/resources/static/mirador/locales/en/translation.json

This file was deleted.

29 changes: 0 additions & 29 deletions src/main/resources/static/mirador/locales/es/translation.json

This file was deleted.

33 changes: 0 additions & 33 deletions src/main/resources/static/mirador/locales/fr/translation.json

This file was deleted.

34 changes: 0 additions & 34 deletions src/main/resources/static/mirador/locales/zh-CN/translation.json

This file was deleted.

34 changes: 0 additions & 34 deletions src/main/resources/static/mirador/locales/zh-TW/translation.json

This file was deleted.

Loading

0 comments on commit 6c6afcc

Please sign in to comment.