diff --git a/ietf/static/css/ietf.scss b/ietf/static/css/ietf.scss index 21d13993042..f17453fa2a4 100644 --- a/ietf/static/css/ietf.scss +++ b/ietf/static/css/ietf.scss @@ -56,11 +56,6 @@ $popover-max-width: 100%; // Utilities @import "bootstrap/scss/utilities/api"; -// Make the bootstrap icons available. -$bootstrap-icons-font-src: url("npm:bootstrap-icons/font/fonts/bootstrap-icons.woff2?a97b3594ad416896e15824f6787370e0") format("woff2"), -url("npm:bootstrap-icons/font/fonts/bootstrap-icons.woff?a97b3594ad416896e15824f6787370e0") format("woff") !default; -@import "bootstrap-icons/font/bootstrap-icons"; - // Leave room for fixed-top navbar... body { padding-top: 60px; @@ -82,9 +77,18 @@ pre { margin-bottom: 0; } -// Make the font size choice cascade down into group menu dropdowns. -.leftmenu li>ul { - font-size: inherit; +// Size the navbar brand image. +.navbar-brand img { + height: auto; + width: 60px; +} + +.leftmenu { + width: 13em; + + li>ul { + font-size: inherit; // Make the font size choice cascade down into group menu dropdowns. + } } // Use fixed lengths for the first three columns of "meta" tables. @@ -100,7 +104,7 @@ table tbody.meta { width: 7em; } - // See https://getbootstrap.com/docs/5.0/layout/breakpoints/#media-queries + // See https://getbootstrap.com/docs/5.1/layout/breakpoints/#media-queries @include media-breakpoint-up(md) { th:first-child, @@ -251,7 +255,7 @@ table tbody.meta { border: 2 * $table-border-width solid #000; } -// See https://getbootstrap.com/docs/5.0/customize/color/#all-colors +// See https://getbootstrap.com/docs/5.1/customize/color/#all-colors $color-discuss: $red-500; $color-yes: $green-500; $color-noobj: $green-100; diff --git a/ietf/static/images/apple-touch-icon.png b/ietf/static/images/apple-touch-icon.png deleted file mode 100644 index 1664715bc48..00000000000 Binary files a/ietf/static/images/apple-touch-icon.png and /dev/null differ diff --git a/ietf/static/images/ietf-icon-blue3.png b/ietf/static/images/ietf-icon-blue3.png deleted file mode 100644 index c35e0d10e92..00000000000 Binary files a/ietf/static/images/ietf-icon-blue3.png and /dev/null differ diff --git a/ietf/static/images/ietf-icon-red3.png b/ietf/static/images/ietf-icon-red3.png deleted file mode 100644 index 91a42aafe7b..00000000000 Binary files a/ietf/static/images/ietf-icon-red3.png and /dev/null differ diff --git a/ietf/static/images/ietf-logo-nor-16-dev.png b/ietf/static/images/ietf-logo-nor-16-dev.png new file mode 100644 index 00000000000..e3aa4642e87 Binary files /dev/null and b/ietf/static/images/ietf-logo-nor-16-dev.png differ diff --git a/ietf/static/images/ietf-logo-nor-16.png b/ietf/static/images/ietf-logo-nor-16.png new file mode 100644 index 00000000000..4b9c01f738d Binary files /dev/null and b/ietf/static/images/ietf-logo-nor-16.png differ diff --git a/ietf/static/images/ietf-logo-nor-180-dev.png b/ietf/static/images/ietf-logo-nor-180-dev.png new file mode 100644 index 00000000000..c2eadf3d6bb Binary files /dev/null and b/ietf/static/images/ietf-logo-nor-180-dev.png differ diff --git a/ietf/static/images/ietf-logo-nor-180.png b/ietf/static/images/ietf-logo-nor-180.png new file mode 100644 index 00000000000..62a858cf8c5 Binary files /dev/null and b/ietf/static/images/ietf-logo-nor-180.png differ diff --git a/ietf/static/images/ietf-logo-nor-192-dev.png b/ietf/static/images/ietf-logo-nor-192-dev.png new file mode 100644 index 00000000000..3cc37cf8838 Binary files /dev/null and b/ietf/static/images/ietf-logo-nor-192-dev.png differ diff --git a/ietf/static/images/ietf-logo-nor-192.png b/ietf/static/images/ietf-logo-nor-192.png new file mode 100644 index 00000000000..c6eb74a4ce8 Binary files /dev/null and b/ietf/static/images/ietf-logo-nor-192.png differ diff --git a/ietf/static/images/ietf-logo-nor-32-dev.png b/ietf/static/images/ietf-logo-nor-32-dev.png new file mode 100644 index 00000000000..bf936fdd46b Binary files /dev/null and b/ietf/static/images/ietf-logo-nor-32-dev.png differ diff --git a/ietf/static/images/ietf-logo-nor-32.png b/ietf/static/images/ietf-logo-nor-32.png new file mode 100644 index 00000000000..9327b64d480 Binary files /dev/null and b/ietf/static/images/ietf-logo-nor-32.png differ diff --git a/ietf/static/images/ietf-logo-nor-512-dev.png b/ietf/static/images/ietf-logo-nor-512-dev.png new file mode 100644 index 00000000000..945b4ec0c04 Binary files /dev/null and b/ietf/static/images/ietf-logo-nor-512-dev.png differ diff --git a/ietf/static/images/ietf-logo-nor-512.png b/ietf/static/images/ietf-logo-nor-512.png new file mode 100644 index 00000000000..de4f37ce7fd Binary files /dev/null and b/ietf/static/images/ietf-logo-nor-512.png differ diff --git a/ietf/static/images/ietf-logo-nor-mask.svg b/ietf/static/images/ietf-logo-nor-mask.svg new file mode 100644 index 00000000000..efe2cbd8602 --- /dev/null +++ b/ietf/static/images/ietf-logo-nor-mask.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ietf/static/images/ietf-logo-nor.png b/ietf/static/images/ietf-logo-nor.png new file mode 100644 index 00000000000..de8cba192ce Binary files /dev/null and b/ietf/static/images/ietf-logo-nor.png differ diff --git a/ietf/static/images/ietf-logo-nor.svg b/ietf/static/images/ietf-logo-nor.svg new file mode 100644 index 00000000000..97f005760ee --- /dev/null +++ b/ietf/static/images/ietf-logo-nor.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ietf/static/images/ietf-logo.svg b/ietf/static/images/ietf-logo.svg new file mode 100644 index 00000000000..1d0faac795d --- /dev/null +++ b/ietf/static/images/ietf-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ietf/static/images/ietflogo-small-transparent.png b/ietf/static/images/ietflogo-small-transparent.png deleted file mode 100644 index 5796835359f..00000000000 Binary files a/ietf/static/images/ietflogo-small-transparent.png and /dev/null differ diff --git a/ietf/static/images/ietflogo.png b/ietf/static/images/ietflogo.png deleted file mode 100644 index 6e30d4e65b8..00000000000 Binary files a/ietf/static/images/ietflogo.png and /dev/null differ diff --git a/ietf/static/images/sprite.png b/ietf/static/images/sprite.png deleted file mode 100644 index 73634d6a22c..00000000000 Binary files a/ietf/static/images/sprite.png and /dev/null differ diff --git a/ietf/static/js/ietf.js b/ietf/static/js/ietf.js index 115d2e0aef3..0b16749a9a4 100644 --- a/ietf/static/js/ietf.js +++ b/ietf/static/js/ietf.js @@ -16,6 +16,9 @@ import "bootstrap/js/dist/tooltip"; import jquery from "jquery"; +// Make the bootstrap icons available. Yes, we require CSS in JS, parcel wants this. +require("bootstrap-icons/font/bootstrap-icons.css"); + window.$ = window.jQuery = jquery; if (!process.env.BUILD_DEPLOY) { // get warnings for using deprecated jquery features diff --git a/ietf/templates/401.html b/ietf/templates/401.html index 54ea26654ae..10fab15b60a 100644 --- a/ietf/templates/401.html +++ b/ietf/templates/401.html @@ -4,7 +4,7 @@ {% block title %}401 Unauthorized{% endblock %} {% block content %} IETF

Authentication Required

diff --git a/ietf/templates/403.html b/ietf/templates/403.html index 73632b9bdc9..ca4290e2250 100644 --- a/ietf/templates/403.html +++ b/ietf/templates/403.html @@ -4,7 +4,7 @@ {% block title %}404 Not Found{% endblock %} {% block content %} IETF

Restricted Access

diff --git a/ietf/templates/404.html b/ietf/templates/404.html index 19ca22bc054..016d4a42fc4 100644 --- a/ietf/templates/404.html +++ b/ietf/templates/404.html @@ -4,7 +4,7 @@ {% block title %}404 Not Found{% endblock %} {% block content %} IETF

The page you were looking for couldn't be found

diff --git a/ietf/templates/500.html b/ietf/templates/500.html index 6df877e0b76..b7ea01bddee 100644 --- a/ietf/templates/500.html +++ b/ietf/templates/500.html @@ -4,7 +4,7 @@ {% block title %}500 Internal Server Error{% endblock %} {% block content %} IETF

Internal Server Error

diff --git a/ietf/templates/base.html b/ietf/templates/base.html index 5858d60d0e5..16d5e573c97 100644 --- a/ietf/templates/base.html +++ b/ietf/templates/base.html @@ -21,18 +21,9 @@ {% block pagehead %}{% endblock %} - {% if server_mode and server_mode == "production" %} - - {% else %} - - {% endif %} - + {% include "base/icons.html" %} {% analytical_head_bottom %} @@ -43,8 +34,8 @@