diff --git a/css/custom1_4.3.css b/css/custom1_4.3.css
index f081f14..56634b3 100644
--- a/css/custom1_4.3.css
+++ b/css/custom1_4.3.css
@@ -18,7 +18,7 @@ html, body {
}
.tableMain {
- height: 95%;
+ height: 97%;
min-height: 600px;
}
@@ -93,18 +93,6 @@ html, body {
border-bottom-left-radius: 0 !important;
}
-
-.page-link {
- position: relative;
- display: block;
- padding: 0.5rem 0.75rem;
- margin-left: -1px;
- line-height: 1.25;
- color: #5f8ec2;
- background-color: #fff;
- border: 1px solid #dee2e6;
-}
-
.lista-risultati:hover, .citazioneFrase:hover {
cursor: pointer;
}
@@ -355,32 +343,43 @@ li::marker {
border-color: rgb(117, 159, 154) !important;
background-color: rgb(117, 159, 154) !important;
}
-.ui-selectable .ui-selecting {
+
+.ui-selectable .ui-selecting .suxess {
background: #759F9A;
}
-.ui-selectable .ui-selected {
+
+.ui-selectable .ui-selected .suxess {
background: #DEE2E6;
color: #759F9A !important;
}
-.form-control:focus, input[type=text]:focus {
+.ui-selectable .ui-selecting:not(.suxess) {
+ background: #bcab7c;
+}
+
+.ui-selectable .ui-selected:not(.suxess) {
+ background: #eef1f3;
+ color: #bcab7c !important;
+}
+
+.form-control:not(.border-secondary):not(.btn-outline-secondary):focus, input[type=text]:not(.border-secondary):not(.btn-outline-secondary):focus {
border-color: rgba(117, 159, 154) !important;
box-shadow: 0 0 0 0.2rem rgba(117, 159, 154,.5);
}
-/* ------- $warning #eace87 -------- */
+/* ------- mark #eace87 -------- */
.mark {
background-color: #eace87 !important;
}
-
-/* ------- #985949 -------- */
+/* ------- $danger #985949 -------- */
#displaycanto span:hover {
color: #985949;
}
+
.ttContent {
color: #985949;
}
@@ -392,7 +391,6 @@ li::marker {
color: #5b352c;
}
-
/* ------- #1E90FF -------- */
.Nik_dropdown-content {
@@ -400,9 +398,12 @@ li::marker {
color: #1E90FF;
}
+/* ricerca semplice */
+.bg-lida08 {
+ background-color: #c4c8cc !important;
+}
/* ricerca avanzata */
-
.bg-lida10 {
background-color: #c8d9d7 !important;
}
@@ -410,6 +411,7 @@ li::marker {
.bg-lida10-mix {
background-color: #f3f5f2 !important;
}
+
/* clausola */
.bg-lida11 {
background-color: #e3eceb !important;
@@ -425,7 +427,6 @@ li::marker {
background-color: #ece3e4 !important;
}
-
/* visualizza e minimap */
.bg-lida-vis, #displayminimap, .claCollBtn, .nav-tabs .nav-item.show .nav-link,.nav-tabs .nav-link.active {
background-color: #fefeff! important;
diff --git a/css/custom2_4.3.css b/css/custom2_4.3.css
index 0564c45..4914f4b 100644
--- a/css/custom2_4.3.css
+++ b/css/custom2_4.3.css
@@ -18,7 +18,7 @@ html, body {
}
.tableMain {
- height: 95%;
+ height: 97%;
min-height: 600px;
}
@@ -44,8 +44,8 @@ html, body {
#colMinimap {
padding-top: 63px;
min-height: 600px;
- min-width: 110px !important;
- width: 110px !important;
+ min-width: 111px !important;
+ width: 111px !important;
border-right-width: 2px !important;
border-bottom-width: 2px !important;
}
@@ -352,22 +352,30 @@ li::marker {
border-color: rgb(65, 93, 67) !important;
background-color: rgb(65, 93, 67) !important;
}
-.ui-selectable .ui-selecting {
+
+.ui-selectable .ui-selecting .suxess {
background: #054a29;
}
-.ui-selectable .ui-selected {
+
+.ui-selectable .ui-selected .suxess {
background: #DEE2E6;
color: #054a29 !important;
}
-.form-control:focus, input[type=text]:focus {
+.ui-selectable .ui-selecting:not(.suxess) {
+ background: #787675;
+}
+
+.ui-selectable .ui-selected:not(.suxess) {
+ background: #DEE2E6;
+ color: #787675 !important;
+}
+
+.form-control:not(.border-secondary):not(.btn-outline-secondary):focus, input[type=text]:not(.border-secondary):not(.btn-outline-secondary):focus {
border-color: rgba(65, 93, 67) !important;
box-shadow: 0 0 0 0.2rem rgba(65,93,67,.5);
}
-input2[type=text]:-internal-autofill-selected {
- background-color: #d4cbd0! important;
-}
/* ------- mark #a996a0 -------- */
.mark {
@@ -400,30 +408,51 @@ input2[type=text]:-internal-autofill-selected {
}
+/* ricerca semplice */
+
+.bg-lida08 {
+ background-color: #adaaa7 !important;
+}
+
/* ricerca avanzata */
-.bg-lida10 {
+.bg-lida10-old {
background-color: #8dac91 !important;
}
+.bg-lida10 {
+ background-color: #bbcdbd !important;
+}
.bg-lida10-mix {
+ background-color: #e4e5dd !important;
+}
+.bg-lida10-mix-old {
background-color: #e0e2d9 !important;
}
/* clausola */
-.bg-lida11 {
+.bg-lida11-old {
background-color: #c6d5c8 !important;
}
+.bg-lida11 {
+ background-color: #dde6de !important;
+}
/* AND */
-.bg-lida12 {
+.bg-lida12-old {
background-color: #c8c6d5 !important;
}
+.bg-lida12 {
+ background-color: #d9d7e2 !important;
+}
/* OR */
-.bg-lida13 {
+.bg-lida13-old {
background-color: #d5c8c6 !important;
}
+.bg-lida13 {
+ background-color: #e2d9d7 !important;
+}
/* visualizza e minimap */
@@ -464,4 +493,3 @@ input2[type=text]:-internal-autofill-selected {
border-color: rgba(0,0,0,.125)! important;
}
-
diff --git a/index_4.3.html b/index_4.3.html
index aaa88b4..8bf8b11 100644
--- a/index_4.3.html
+++ b/index_4.3.html
@@ -128,7 +128,7 @@
</div>
<input id="searchToggle" type="checkbox" data-toggle="toggle0"
data-on="Avanzata" data-off="Semplice" data-size="small"
- data-style="leftBorderRadiusZero" data-onstyle="success border-secondary"
+ data-style="leftBorderRadiusZero" data-onstyle="success"
data-offstyle="secondary">
</div>
</li>
@@ -508,31 +508,31 @@
<form>
<div id="rigaRicercaSemplice"
- class="row card bg-lida10 mx-0 p-2 d-flex justify-content-end">
+ class="row card bg-lida08 mx-0 p-2 d-flex justify-content-end">
<div class="col-12 d-flex justify-content-end px-0"
id="simpleSearchDiv" style="display: d-flex">
<div class="btn-group flex-nowrap p-0 pr-1" role="group"
aria-label="Bottoni Ricerca Semplice">
- <button class="btn btn-sm btn-outline-success bg-light"
+ <button class="btn btn-sm btn-outline-secondary bg-light"
style="height: 32px; width: 76px;"
type="button" id="showOptions" data-toggle="collapse"
data-target="#collapseOptions" aria-expanded="false"
aria-controls="collapseExample">
<span class="text-muted">Opzioni</span>
</button>
- <button class="btn btn-sm btn-outline-success bg-light ml-1"
+ <button class="btn btn-sm btn-outline-secondary bg-light ml-1"
type="button" id='cleanresult' aria-expanded="false"
aria-controls="collapseExample">
<span class="text-muted">Reset</span>
</button>
<div class="pr-0 align-self-end ml-1">
- <input class="form-control form-control-sm pr-0 borderRadiusZero border border-success monMe"
+ <input class="form-control form-control-sm pr-0 borderRadiusZero border border-secondary monMe"
type="text" id="queryText"
placeholder=' inserisci un termine'
style="height: 32px;">
</div>
- <button class="btn btn-sm btn-success" type="submit"
+ <button class="btn btn-sm btn-secondary" type="submit"
id='searchcomm'>
<ion-icon name="search"></ion-icon>
</button>
@@ -581,16 +581,16 @@
<div class="collapse" id="collapseOptions">
<div class="col-12 p-0">
- <div class="card card-body bg-lida10 p-2">
+ <div class="card card-body bg-lida08 p-2">
<div class="form-inline input-group px-1 py-2">
<select
- class="form-control custom-select custom-select-sm text-muted bg-light monMe btn-outline-success border"
+ class="form-control custom-select custom-select-sm text-muted bg-light monMe btn-outline-secondary border"
id="lemma_forma">
<option value="forma">La forma</option>
<option value="lemma">Il lemma</option>
<option value="testo">Il testo</option>
</select> <select
- class="form-control custom-select custom-select-sm text-muted bg-light ml-2 monMe btn-outline-success border"
+ class="form-control custom-select custom-select-sm text-muted bg-light ml-2 monMe btn-outline-secondary border"
id="opzioni_testo">
<option value="parola">come Parola</option>
<option value="sottostringa">come Sottostringa</option>
@@ -603,7 +603,7 @@
<div class="bg-light well m-0" id="contextDiv0">
<div id="contextTable-xX0"
- class="row no-gutters p-1 pt-0 bg-lida10">
+ class="row no-gutters p-1 pt-0 bg-lida08">
<div class="col-12 py-0 pl-1">
<span class="small text-muted align-bottom">Restringi
il contesto di ricerca:</span>
@@ -618,18 +618,18 @@
<div
class="col-auto flex-fill align-self-center text-muted">
<button
- class="btn btn-sm btn-outline-success bg-light btn-link border rounded py-0 my-1 ml-1"
+ class="btn btn-sm btn-outline-secondary bg-light btn-link border rounded py-0 my-1 ml-1"
id="cantica1-xX0" data-toggle="collapse"
data-target="#collapseCa1-xX0"
aria-expanded="true"
aria-controls="collapseCa1-xX0">
- <span class="h6 small font-weight-bold text-success">Inferno</span>
+ <span class="h6 small font-weight-bold text-secondary">Inferno</span>
</button>
</div>
<div
class="col-auto pr-1 align-self-center justify-content-end text-right">
<button id="plusBtn0-xX0"
- class="btn btn-sm btn-outline-success bg-light addClaCont border rounded text-success px-1 py-0">
+ class="btn btn-sm btn-outline-secondary bg-light addClaCont border rounded text-secondary px-1 py-0">
+></button>
</div>
</div>
@@ -722,18 +722,18 @@
<div
class="col-auto flex-fill align-self-center text-muted">
<button
- class="btn btn-sm btn-outline-success bg-light btn-link border rounded py-0 my-1 ml-1"
+ class="btn btn-sm btn-outline-secondary bg-light btn-link border rounded py-0 my-1 ml-1"
id="cantica2-xX0" data-toggle="collapse"
data-target="#collapseCa2-xX0"
aria-expanded="true"
aria-controls="collapseCa2-xX0">
- <span class="h6 small font-weight-bold text-success">Purgatorio</span>
+ <span class="h6 small font-weight-bold text-secondary">Purgatorio</span>
</button>
</div>
<div
class="col-auto pr-1 align-self-center justify-content-end text-right">
<button id="plusBtn1-xX0"
- class="btn btn-sm btn-outline-success bg-light addClaCont border text-success rounded px-1 py-0">
+ class="btn btn-sm btn-outline-secondary bg-light addClaCont border text-secondary rounded px-1 py-0">
+></button>
</div>
</div>
@@ -823,18 +823,18 @@
<div
class="col-auto flex-fill align-self-center text-muted">
<button
- class="btn btn-sm btn-outline-success bg-light btn-link border rounded py-0 my-1 ml-1"
+ class="btn btn-sm btn-outline-secondary bg-light btn-link border rounded py-0 my-1 ml-1"
id="cantica3-xX0" data-toggle="collapse"
data-target="#collapseCa3-xX0"
aria-expanded="true"
aria-controls="collapseCa3-xX0">
- <span class="h6 small font-weight-bold text-success">Paradiso</span>
+ <span class="h6 small font-weight-bold text-secondary">Paradiso</span>
</button>
</div>
<div
class="col-auto pr-1 align-self-center justify-content-end text-right">
<button id="plusBtn2-xX0"
- class="btn btn-sm btn-outline-success bg-light addClaCont border rounded text-success px-1 py-0">
+ class="btn btn-sm btn-outline-secondary bg-light addClaCont border rounded text-secondary px-1 py-0">
+></button>
</div>
</div>
@@ -926,7 +926,7 @@
class="col px-2 pt-1 align-self-start align-items-start justify-content-end text-right position-absolute"
style="z-index: 1000">
<button id="trashClaCont-xX0"
- class="btn btn-sm btn-outline-success bg-light trashClaCont border rounded text-success px-1 pb-0"
+ class="btn btn-sm btn-outline-secondary bg-light trashClaCont border rounded text-secondary px-1 pb-0"
style="z-index: 1000">
<ion-icon name="refresh-circle"></ion-icon>
</button>
diff --git a/js/script_4.3.js b/js/script_4.3.js
index c76dc73..f31abb5 100644
--- a/js/script_4.3.js
+++ b/js/script_4.3.js
@@ -107,6 +107,8 @@ $(document).ready(function() {
queryJson.QueryAvanzata = "1";
$("#collapseOptions").collapse('hide');
$("#simpleSearchDiv").fadeOut(300, function(){
+ $("#rigaRicercaSemplice").removeClass( "bg-lida08" )
+ $("#rigaRicercaSemplice").addClass( "bg-lida10" )
$("#simpleSearchDiv").removeClass( "d-flex" )
$("#advancedSearchDiv").addClass( "d-flex" )
$("#advancedSearchDiv").fadeIn(400, function(){
@@ -118,6 +120,8 @@ $(document).ready(function() {
queryJson.QueryAvanzata = "0";
$("#collapseAdvanced").collapse('hide');
$("#advancedSearchDiv").fadeOut(300, function(){
+ $("#rigaRicercaSemplice").removeClass( "bg-lida10" )
+ $("#rigaRicercaSemplice").addClass( "bg-lida08" )
$("#advancedSearchDiv").removeClass( "d-flex" )
$("#simpleSearchDiv").addClass( "d-flex" )
$("#simpleSearchDiv").fadeIn(400);
@@ -176,7 +180,7 @@ $(document).ready(function() {
alsoResize: "#displaycanto",
resize: function(event, ui) {
$("#displaycanto").width(" min-content");
- var infoHeightToSet = $("body")[0].clientHeight*cssTableMainHeight - $(visCantoClass)[0].clientHeight-2-63-2-46
+ var infoHeightToSet = $("body")[0].clientHeight*cssTableMainHeight - $(visCantoClass)[0].clientHeight-2-63-2
$("#displayinfo").css("maxHeight", infoHeightToSet+"px");
$("#displayinfo").css("height", infoHeightToSet+"px");
$("#displaynote").css("maxHeight", infoHeightToSet+"px");
@@ -789,7 +793,9 @@ $(document).ready(function() {
function addClaContext(tabID){
var contClone = document.getElementById("contextTable-xX0").cloneNode(true);
contClone.setAttribute("class","row no-gutters px-2 pt-0 pb-2 bg-lida11");
- contClone = contClone.outerHTML.replace(/xX0/g, "xX" + tabID)
+ contClone = contClone.outerHTML.replace(/xX0/g, "xX" + tabID);
+ contClone = contClone.replace(/-secondary/g, "-success");
+ contClone = contClone.replace(/sel-canto/g, "sel-canto suxess");
$("#contextDiv" + tabID).append($(contClone)[0]);
resetContext(tabID);
$("#selectable-xX" + tabID).selectable({
@@ -1290,7 +1296,7 @@ $(document).ready(function() {
$('#selectable-xX' + claIdNum + ' .sel-canti-intro').each(function() {
$(this).text("Seleziona i canti:")
});;
- $("#contextText-xX" + claIdNum).html("Tutta l'opera");
+ $("#contextText-xX" + claIdNum).html("Tutta l'opera.");
window["context" + claIdNum] = JSON.parse(JSON.stringify(contextEmpty));
$('#selectable-xX' + claIdNum + " .show").removeClass("show");
};
@@ -1356,7 +1362,7 @@ $(document).ready(function() {
}
};
if ((contextString.toString() != "") && (totCan < 100)) {
- $("#contextText-xX" + claIdNum).html(contextString.toString());
+ $("#contextText-xX" + claIdNum).html(contextString.toString()+".");
} else {
resetContext(claIdNum)
}