-
-
+
Choose an identifier type
-
+
ARK
@@ -48,8 +47,7 @@ Home Layout With Login Modal
DOI
-
-
+
diff --git a/dev/legacy-scss/variables.scss b/dev/legacy-scss/variables.scss
index a6e747187..3462cb0c7 100644
--- a/dev/legacy-scss/variables.scss
+++ b/dev/legacy-scss/variables.scss
@@ -19,8 +19,8 @@ $text-link-color: rgb(176, 189, 202); // muted blue #B0BDCA
$text-link-over-beige: rgb(0, 86, 149); // #005695 blue link over beige backgrounds
$design-primary-color: rgb(0, 119, 138); // Teal Blue #00778b
-$design-primary-gradient-top: rgb(22, 139, 153); // Lighter Teal Blue #168b99 was #17A2AC
-$design-primary-gradient-bottom: rgb(5, 106, 123); // Slightly darker Teal Blue #056a7b
+$design-primary-gradient-top: rgb(6, 80, 89); // Lighter Teal Blue #168b99 was #17A2AC
+$design-primary-gradient-bottom: rgb(1, 64, 71); // Slightly darker Teal Blue #056a7b
// Brown colors
$design-secondary-gradient-top: rgb(198, 176, 130); // #C6B082 Used for subnav
diff --git a/dev/scss/_fieldsets.scss b/dev/scss/_fieldsets.scss
index 11356a0ec..1e922d5f1 100755
--- a/dev/scss/_fieldsets.scss
+++ b/dev/scss/_fieldsets.scss
@@ -26,6 +26,9 @@ $subfieldset-label-spacing: 0.3em;
.fieldset-inline {
+ border: none;
+ padding: 0;
+
@include bp(screen1) {
display: flex;
flex-flow: row wrap;
diff --git a/gulpfile.js b/gulpfile.js
index 82c4e3821..02729a7c4 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -31,7 +31,7 @@ var ghPages = require('gulp-gh-pages');
exports.default = parallel(scss, start, watcher);
// exports.build = series(clean, fonts, scsslint_legacy, scsslint, jslint, scss_legacy, scss, assemble, minifyCss, copyimages, fonts);
-exports.build = series(clean, fonts, jslint, scss_legacy, scss, assemble, minifyCss, copyimages, fonts);
+exports.build = series(clean, fonts, jslint, scss_legacy, scss, assemble, minifyCss, copyimages, fonts, copyCSS);
exports.upload = githubpages;
@@ -124,6 +124,13 @@ function copyimages(cb) {
cb();
}
+// Copy the minified css to the place it actually needs to go in order to function
+function copyCSS(cb) {
+ return src('ui_library/css/main2.min.css')
+ .pipe(dest('static_src/stylesheets'));
+ cb();
+}
+
// Copy font files from dev/fonts/ into dev/ui_library/fonts/:
function fonts(cb) {
diff --git a/impl/form_objects.py b/impl/form_objects.py
index bf39ba120..9763b7e58 100644
--- a/impl/form_objects.py
+++ b/impl/form_objects.py
@@ -76,7 +76,7 @@
\(:unkn\)|\(:none\)|\(:null\)|\(:tba\)|\(:etal\)|\(:at\))$'
REGEX_GEOPOINT = r'-?(\d+(\.\d*)?|\.\d+)$'
# http://stackoverflow.com/questions/3962543/how-can-i-validate-a-culture-code-with-a-regular-expression
-REGEX_LANGUAGE = '^[a-z]{2,3}(?:-[A-Z]{2,3}(?:-[a-zA-Z]{4})?)?$'
+REGEX_LANGUAGE = '^[a-z]{2,3}(?:-[a-zA-Z]{2,3}(?:-[a-zA-Z]{4})?)?$'
ERR_4DIGITYEAR = _("Four digits required")
ERR_DATE = _("Please use format YYYY-MM-DD.")
ERR_CREATOR = _("Please fill in a value for creator.")
diff --git a/static_src/stylesheets/main2.min.css b/static_src/stylesheets/main2.min.css
index f3274b753..11c7a4c53 100644
--- a/static_src/stylesheets/main2.min.css
+++ b/static_src/stylesheets/main2.min.css
@@ -3,9 +3,9 @@
* Copyright©2021, Regents of the University of California
* http://creativecommons.org/licenses/BSD
*/
-/*!
- * Copyright©2021, Regents of the University of California
- * http://creativecommons.org/licenses/BSD
+/*!
+ * Copyright©2021, Regents of the University of California
+ * http://creativecommons.org/licenses/BSD
*/
/*
@@ -61,8 +61,8 @@ Selector pattern using above mixin:
border-radius: 3px; }
.button__primary, .button__multline, .account__button-proxy-select, .customize-table__button-all, .customize-table__button-customize, .login-modal__submit, .dashboard__button-go, .home__button-primary, .manage__simple-search-button, .search__simple-button, .search__simple-button2, .search-results__simple-button {
- background: -webkit-gradient(linear, left top, left bottom, from(#168b99), to(#056a7b));
- background: linear-gradient(to bottom, #168b99, #056a7b); }
+ background: -webkit-gradient(linear, left top, left bottom, from(#065059), to(#014047));
+ background: linear-gradient(to bottom, #065059, #014047); }
.button__multline {
height: 46px; }
@@ -133,18 +133,21 @@ Selector pattern using above mixin:
.fieldset-controls {
margin: 0 0 1em; }
-@media (min-width: 480px) {
- .fieldset-inline {
- display: -webkit-box;
- display: -ms-flexbox;
- display: flex;
- -webkit-box-orient: horizontal;
- -webkit-box-direction: normal;
- -ms-flex-flow: row wrap;
- flex-flow: row wrap;
- -webkit-box-align: center;
- -ms-flex-align: center;
- align-items: center; } }
+.fieldset-inline {
+ border: none;
+ padding: 0; }
+ @media (min-width: 480px) {
+ .fieldset-inline {
+ display: -webkit-box;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-box-orient: horizontal;
+ -webkit-box-direction: normal;
+ -ms-flex-flow: row wrap;
+ flex-flow: row wrap;
+ -webkit-box-align: center;
+ -ms-flex-align: center;
+ align-items: center; } }
.fieldset-stacked__embedded-select-append-text,
.fieldset-controls__legend, .fieldset-stacked__legend, .fieldset-inline__legend, .fieldset-stacked__legend-number-1,
@@ -739,8 +742,8 @@ Selector pattern using above mixin:
.heading__primary-container {
margin: 0 -10px;
padding: 0 10px;
- background: -webkit-gradient(linear, left top, left bottom, from(#168b99), to(#056a7b));
- background: linear-gradient(to bottom, #168b99, #056a7b); }
+ background: -webkit-gradient(linear, left top, left bottom, from(#065059), to(#014047));
+ background: linear-gradient(to bottom, #065059, #014047); }
.heading__primary-text {
max-width: 1000px;
@@ -883,7 +886,8 @@ Selector pattern using above mixin:
.literal-block, .pre-block {
margin: 1em 0;
padding: 0.5em;
- border: 1px dotted;
+ border: 1px dotted #beb6af;
+ background-color: #edeae5;
font-size: 0.85em; }
.literal-block {
diff --git a/templates/includes/simple_id_type.html b/templates/includes/simple_id_type.html
index 1da3ebb65..d7cc2876d 100644
--- a/templates/includes/simple_id_type.html
+++ b/templates/includes/simple_id_type.html
@@ -8,7 +8,7 @@
{% else %}
{% help_icon "choose_id" _("on choosing the type of identifier") %}
{% endif %}
-
+
{% if prefixes|duplicate_id_types %}
{% comment %}
class 'ays-ignore' is used by 'are-you-sure.js' which prevents users from accidentally leaving
diff --git a/templates/index.html b/templates/index.html
index 550e7a646..df3f11e6e 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -24,8 +24,8 @@