Merge branch 'ui' into develop

ecds · Nov 16, 2023 · 286a254 · 286a254
2 parents 93bef5e + 9f6f670
commit 286a254
Show file tree

Hide file tree

Showing 30 changed files with 4,645 additions and 858 deletions.
diff --git a/.gitignore b/.gitignore
@@ -156,3 +156,6 @@ dev_*.json
 presentation-validator/
 nohup.out
 webpack-stats.json
+*.key
+*.crt
+*.pem
diff --git a/apps/readux/forms.py b/apps/readux/forms.py
@@ -4,7 +4,6 @@
 from django import forms
 from django.template.defaultfilters import truncatechars
 
-
 class MinMaxDateInput(forms.DateInput):
     """Widget extending DateInput to include an initial date in its attrs"""
     date_initial = ""
@@ -46,7 +45,7 @@ def valid_value(self, value):
 class ManifestSearchForm(forms.Form):
     """Django form for searching Manifests via Elasticsearch"""
     q = forms.CharField(
-        label="Search volumes by keyword",
+        label="Search for individual whole keywords. Multiple words will be searched as 'or' (e.g. Rome London = Rome or London).",
         required=False,
         widget=forms.TextInput(
             attrs={
@@ -78,7 +77,7 @@ class ManifestSearchForm(forms.Form):
         widget=forms.SelectMultiple(
             attrs={
                 "aria-label": "Filter volumes by language",
-                "class": "uk-input",
+                # "class": "uk-input",
             },
         ),
     )
@@ -88,7 +87,7 @@ class ManifestSearchForm(forms.Form):
         widget=forms.SelectMultiple(
             attrs={
                 "aria-label": "Filter volumes by author",
-                "class": "uk-input",
+                # "class": "uk-input",
             },
         ),
     )
@@ -98,7 +97,7 @@ class ManifestSearchForm(forms.Form):
         widget=forms.SelectMultiple(
             attrs={
                 "aria-label": "Filter volumes by collection",
-                "class": "uk-input",
+                # "class": "uk-input",
             },
         ),
     )

diff --git a/apps/static/css/project.css b/apps/static/css/project.css
@@ -1,4 +1,9 @@
 @import url(./ecds-annotator.min.css);
+
+.selectize-control.plugin-clear_button .clear {
+  top: -3px !important;
+}
+
 :root {
   --link-color: $rx-color-accent-1;
   --contrast: 200%; }
@@ -9,7 +14,7 @@
 
 .uk-link, a {
   color: var(--link-color);
-  text-decoration: underline dotted; }
+}
 
 a.nav-link {
   text-decoration: none; }
@@ -63,9 +68,6 @@ em {
 .uk-radio {
   border: 1px solid #ccc !important; }
 
-.uk-navbar-right {
-  padding-top: 1rem; }
-
 .uk-container ul {
   list-style: none; }
 
@@ -85,8 +87,8 @@ em {
   background-color: #f2dede;
   border-color: #eed3d7; }
 
-.rdx-viewer-container {
-  height: calc(100vh - 120px); }
+/* .rdx-viewer-container {
+  height: calc(100vh - 120px); } */
 
 .manifest-info > a,
 .manifest-info > h3 {
@@ -454,10 +456,17 @@ p {
   filter: brightness(0.4%);
   text-transform: uppercase;
   font-weight: bold;
-  letter-spacing: 0.1em;
+  /* letter-spacing: 0.1em; */
   display: inline-flex;
   padding: 0;
-  margin: 0; }
+  margin: 0; 
+  user-select: auto;
+}
+
+.rx-action-btn {
+  letter-spacing: 0.1em;
+  font-size: small;
+}
 
 .rx-page-breadcrumb-item a {
   color: var(--link-color); }
@@ -518,13 +527,12 @@ p {
   word-break: break-word; }
 
 .rx-info-content {
-  padding: 0.5em 0;
+  padding: 0 0 1.25em;
   font-size: 0.9rem; }
 
 .rx-info-content-label {
   color: #595959 !important;
   font-weight: 600 !important;
-  line-height: 1em !important;
   font-size: 0.9rem !important; }
 
 .rx-info-content-value {
@@ -677,13 +685,12 @@ p {
 .rx-anchor {
   color: var(--link-color) !important;
   opacity: 0.75;
+  word-break: break-all;
   transition: all ease-in-out 100ms; }
-  .rx-anchor:hover {
-    color: var(--link-color);
-    opacity: 1; }
 
-::selection {
-  background-color: #595959; }
+.rx-anchor:hover {
+  color: var(--link-color);
+  opacity: 1; }
 
 .rx-label-copy {
   background: white;
@@ -950,10 +957,10 @@ fieldset {
   top: 0; }
 
 .rx-page-search-container {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
+  width: 100% !important;
+  /* display: flex; */
+  /* align-items: center; */
+  /* justify-content: space-between; */
   color: #595959 !important; }
 
 .rx-page-search-options,
@@ -1246,8 +1253,7 @@ a.nav-link {
 
 .uk-link, a {
   color: var(--link-color);
-  -webkit-text-decoration: underline dotted;
-  text-decoration: underline dotted; }
+ }
 
 a.nav-link {
   text-decoration: none; }
@@ -1272,8 +1278,6 @@ a.nav-link {
 .uk-radio {
   border: 1px solid #ccc !important; }
 
-.uk-navbar-right {
-  padding-top: 1rem; }
 
 .uk-container ul {
   list-style: none; }
@@ -1295,12 +1299,24 @@ a.nav-link {
   border-color: #eed3d7; }
 
 .rdx-viewer-container {
-  width: 100%;
-  height: calc(100% - 120px);
+  /* width: 100%;
+  height: calc(100% - 120px); */
   position: absolute;
   left: 0;
   bottom: 0px;
-  background: none !important; }
+  /* background: none !important; */
+
+  height: -webkit-calc(100% - 40px);
+  height:    -moz-calc(100% - 40px);
+  height:         calc(100% - 40px);
+  width: 100%;
+  /* Remove any browser-default margins. */
+  margin: 0;
+}
+
+#rdx-viewer > div > div > div.py-8.grid.grid-cols-2.gap-2 {
+  padding-bottom: 0;
+}
 
 .manifest-info > a,
 .manifest-info > h3 {
@@ -1746,20 +1762,20 @@ form#search-form input[type="search"][name="q"] {
 div#search-grid {
   margin-left: 0; }
 
-div#search-grid :first-child {
+/* div#search-grid :first-child {
   padding-left: 0; }
 
 div#search-grid :first-child button#reset-filters {
-  padding-left: 30px; }
+  padding-left: 30px; } */
 
 /* Date published filter toggle
  * Adapted from https://codepen.io/adamhutch/pen/JoKEPp
  */
-div#search-grid input[type="checkbox"]#toggle-date {
+/* div#search-grid input[type="checkbox"]#toggle-date {
   font-size: 14px;
-  display: none; }
+  display: none; } */
 
-div#search-grid input[type="checkbox"]#toggle-date + label {
+/* div#search-grid input[type="checkbox"]#toggle-date + label {
   -webkit-transition: 0.3s background;
   -moz-transition: 0.3s background;
   transition: 0.3s background;
@@ -1819,7 +1835,7 @@ div#search-grid input[type="checkbox"]#toggle-date + label span {
   position: absolute;
   top: 0;
   left: 55px;
-  width: 170px; }
+  width: 170px; } */
 
 #search-filters input[type="text"]#authors-filter {
   width: 100%; }
@@ -1831,9 +1847,36 @@ div#search-grid input[type="checkbox"]#toggle-date + label span {
   overflow-y: scroll;
   overflow-x: hidden; }
 
+  /* Selectize */
+
+.selectize-control.multi .selectize-input>div {
+  background: #950953 !important;
+  border: none !important;
+}
+.selectize-dropdown .active:not(.selected) {
+  background-color: #fff7fb !important;
+}
+.noUi-connect {
+  background: #950953 !important;
+}
+[disabled] .noUi-connect {
+  background: #950953 !important;
+  opacity: 0.2;
+}
+
 /* Date slider */
+.noUi-tooltip {
+  font-size: .875rem;
+  font-family: monospace;
+  font-weight: normal;
+  padding: 0.125rem 0.25rem !important;
+  background-color: none;
+  border: none !important;
+}
+
 #search-filters .noUi-target {
-  margin: 60px 20px 10px; }
+  margin: 45px 21px 10px; 
+}
 
 /* Individual search results */
 ol#search-results {
@@ -1885,4 +1928,22 @@ ol#search-results .result-page ul li {
   clip: rect(0, 0, 0, 0);
   border: 0; }
 
+.sui-item-heading {
+    letter-spacing: 1.5px;
+    text-transform: uppercase;
+    font-weight: 600;
+    font-family: "Helvetica Neue";
+    font-size: 13px;
+}
+
+.reader-modal {
+  /* display: block !important; */
+  width: 400px !important;
+  height: fit-content !important;
+  padding: 0 !important;
+  left: 75px !important;
+  top: 60px !important;
+}
 /*# sourceMappingURL=project.css.map */
+
+