From 09937edf1d2fd83cc31de93cb9f3e1bf4488d5b5 Mon Sep 17 00:00:00 2001 From: Matt P Date: Fri, 5 Apr 2024 11:10:58 +0100 Subject: [PATCH] feat: Update keycloak theme with new tudor crown logo --- .gitignore | 3 +- docker-compose.yml | 95 +++++++++--------- govuk-drt/login/template.ftl | 6 +- govuk-internal-dq/login/template.ftl | 4 +- govuk-internal/login/template.ftl | 4 +- govuk-social-providers/login/template.ftl | 6 +- .../resources/assets/crown-invert-logo.svg | 3 + .../resources/assets/crown-logo-mask.svg | 1 + govuk/login/resources/assets/crown-logo.svg | 3 + govuk/login/resources/assets/favicon.ico | Bin 0 -> 1242 bytes govuk/login/template.ftl | 6 +- hmpo-lev/login/template.ftl | 6 +- sass/govuk_elements.scss | 5 + 13 files changed, 78 insertions(+), 64 deletions(-) create mode 100644 govuk/login/resources/assets/crown-invert-logo.svg create mode 100644 govuk/login/resources/assets/crown-logo-mask.svg create mode 100644 govuk/login/resources/assets/crown-logo.svg create mode 100644 govuk/login/resources/assets/favicon.ico diff --git a/.gitignore b/.gitignore index 8c32760..2f496c9 100644 --- a/.gitignore +++ b/.gitignore @@ -37,7 +37,8 @@ jspm_packages .node_repl_history # Built files -govuk/login/resources/ +govuk/login/resources/css/ +govuk/login/resources/vendor/ govuk-cop/login/resources/css/ govuk-internal/login/resources/ dist/ diff --git a/docker-compose.yml b/docker-compose.yml index f020b82..82baf31 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,49 +1,50 @@ -mariadb: - container_name: mariadb - image: mariadb:10.4.8 - ports: - - "3306" - environment: - MYSQL_DATABASE: "keycloak" - MYSQL_PASSWORD: "password" - MYSQL_RANDOM_ROOT_PASSWORD: "yes" - MYSQL_USER: "keycloak" +services: + mariadb: + container_name: mariadb + image: mariadb:10.4.8 + ports: + - "3306" + environment: + MYSQL_DATABASE: "keycloak" + MYSQL_PASSWORD: "password" + MYSQL_RANDOM_ROOT_PASSWORD: "yes" + MYSQL_USER: "keycloak" -keycloak: - container_name: keycloak - image: quay.io/ukhomeofficedigital/keycloak:v15.0.2 - ports: - - "8080:8080" - links: - - mariadb - - maildev - volumes: - - ./.docker-compose/keycloak.env:/etc/secrets/keycloak.env - - ./govuk/:/opt/jboss/keycloak/themes/govuk/ - - ./govuk-internal/:/opt/jboss/keycloak/themes/govuk-internal/ - - ./govuk-internal-cba/:/opt/jboss/keycloak/themes/govuk-internal-cba/ - - ./govuk-internal-dq/:/opt/jboss/keycloak/themes/govuk-internal-dq/ - - ./govuk-cop/:/opt/jboss/keycloak/themes/govuk-cop/ - - ./hmpo-lev/:/opt/jboss/keycloak/themes/hmpo-lev/ - - ./govuk-social-providers/:/opt/jboss/keycloak/themes/govuk-social-providers/ - - ./govuk-drt/:/opt/jboss/keycloak/themes/govuk-drt/ - - ./govuk-rscas/:/opt/jboss/keycloak/themes/govuk-rscas/ - environment: - DB_VENDOR: "mariadb" - MARIADB_PORT: "3306" - KEYCLOAK_ENVIRONMENT: "/etc/secrets/keycloak.env" - KEYCLOAK_PASSWORD: "admin" - KEYCLOAK_USER: "admin" - MYSQL_PORT_3306_TCP_ADDR: "mariadb" - MYSQL_PORT_3306_TCP_PORT: "3306" - WAIT_ON_ADDR: "mariadb" - WAIT_ON_PORT: "3306" - command: - - -b 0.0.0.0 --server-config=standalone.xml + keycloak: + container_name: keycloak + image: quay.io/ukhomeofficedigital/keycloak:v15.0.2 + ports: + - "8080:8080" + links: + - mariadb + - maildev + volumes: + - ./.docker-compose/keycloak.env:/etc/secrets/keycloak.env + - ./govuk/:/opt/jboss/keycloak/themes/govuk/ + - ./govuk-internal/:/opt/jboss/keycloak/themes/govuk-internal/ + - ./govuk-internal-cba/:/opt/jboss/keycloak/themes/govuk-internal-cba/ + - ./govuk-internal-dq/:/opt/jboss/keycloak/themes/govuk-internal-dq/ + - ./govuk-cop/:/opt/jboss/keycloak/themes/govuk-cop/ + - ./hmpo-lev/:/opt/jboss/keycloak/themes/hmpo-lev/ + - ./govuk-social-providers/:/opt/jboss/keycloak/themes/govuk-social-providers/ + - ./govuk-drt/:/opt/jboss/keycloak/themes/govuk-drt/ + - ./govuk-rscas/:/opt/jboss/keycloak/themes/govuk-rscas/ + environment: + DB_VENDOR: "mariadb" + MARIADB_PORT: "3306" + KEYCLOAK_ENVIRONMENT: "/etc/secrets/keycloak.env" + KEYCLOAK_PASSWORD: "admin" + KEYCLOAK_USER: "admin" + MYSQL_PORT_3306_TCP_ADDR: "mariadb" + MYSQL_PORT_3306_TCP_PORT: "3306" + WAIT_ON_ADDR: "mariadb" + WAIT_ON_PORT: "3306" + command: + - -b 0.0.0.0 --server-config=standalone.xml -maildev: - container_name: maildev - image: djfarrelly/maildev:1.1.0 - ports: - - "8081:80" - - "25" + maildev: + container_name: maildev + image: djfarrelly/maildev:1.1.0 + ports: + - "8081:80" + - "25" diff --git a/govuk-drt/login/template.ftl b/govuk-drt/login/template.ftl index dda4e61..4f9dce8 100644 --- a/govuk-drt/login/template.ftl +++ b/govuk-drt/login/template.ftl @@ -54,9 +54,9 @@ rel="stylesheet"/> - - @@ -122,7 +122,7 @@
diff --git a/govuk-internal-dq/login/template.ftl b/govuk-internal-dq/login/template.ftl index a3c94ab..7b48b6d 100644 --- a/govuk-internal-dq/login/template.ftl +++ b/govuk-internal-dq/login/template.ftl @@ -48,8 +48,8 @@ - - + + diff --git a/govuk-internal/login/template.ftl b/govuk-internal/login/template.ftl index a3c94ab..7b48b6d 100644 --- a/govuk-internal/login/template.ftl +++ b/govuk-internal/login/template.ftl @@ -48,8 +48,8 @@ - - + + diff --git a/govuk-social-providers/login/template.ftl b/govuk-social-providers/login/template.ftl index 1ca257f..817d2e0 100644 --- a/govuk-social-providers/login/template.ftl +++ b/govuk-social-providers/login/template.ftl @@ -48,8 +48,8 @@ - - + + @@ -109,7 +109,7 @@
diff --git a/govuk/login/resources/assets/crown-invert-logo.svg b/govuk/login/resources/assets/crown-invert-logo.svg new file mode 100644 index 0000000..846e19b --- /dev/null +++ b/govuk/login/resources/assets/crown-invert-logo.svg @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/govuk/login/resources/assets/crown-logo-mask.svg b/govuk/login/resources/assets/crown-logo-mask.svg new file mode 100644 index 0000000..0c483a1 --- /dev/null +++ b/govuk/login/resources/assets/crown-logo-mask.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/govuk/login/resources/assets/crown-logo.svg b/govuk/login/resources/assets/crown-logo.svg new file mode 100644 index 0000000..830578a --- /dev/null +++ b/govuk/login/resources/assets/crown-logo.svg @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/govuk/login/resources/assets/favicon.ico b/govuk/login/resources/assets/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..61c72d8ccdf0ff5ad1a1a147e78332d535a32a7c GIT binary patch literal 1242 zcmV<01SR{4P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NGL`g(JRA>e5nC(&HKn#XAH}@at zfDWJpr~s${IsiJL1E2z+0_Xs!06KsUfC_SYcJlgUdDk(VbAg#?##ve4(rRTpla$ib zt{)4(er)8kz*h+@dk25~4*Xt31^4&&)A8|f%k<^tWxBh&YthEKVG50UZEkK(BS0J5 z&&=Mq!7Iq8r>7acII5c?3j0p=n#6HNegZ8#Z-2rd-f8h&B;QIPHot~aHIecL#w9!fxCNhiUVeLfJKMk(Hj(+l^*JRRMIeyq*bZzX1|In&>SYiR`~4fOzO@0mFLAMXF#*xs*_=FZ%=5mmS_!ghD1A& zU%PKr&xCsKOO^9|jecwmN*vn=oe0>T=fA+O2aFRg9ZV_Xh*si?t$|Dpq^}iS*@?m9 zlQU7WFa6nCPQbs*5YPZaP4$NCKnSAIg>DbNRt<>7+N&kw^t%Z}16X@`d8rxb&`bKz zoYP($UlD5h#a9X2KJ(Rv60I%q_l}3w>+5T>_RGYFhlj*96iU8IG}-G^gT9aOl@VtS zI<|+DW}C1}$o)~}okE)Sd&Yne=Xe}7LK8ylWI2rq7_X%^{fE7mx> z(P8^*V^nSEZDYfO=MBNDuM$+zX202J16AsS=jZ2iaB$EOfd;P+O16oiwxihUB*2#P z`DX_=S;dmg-u30sl+TwSbfi34yPzt>ssen!M<} zXFx*VdF?#|-#Ku_wn{*iSk}7Qfn`-*epfr7N-S&r1BG65=ek-NWB>pF07*qoM6N<$ Ef(q<7G5`Po literal 0 HcmV?d00001 diff --git a/govuk/login/template.ftl b/govuk/login/template.ftl index f908987..022d366 100644 --- a/govuk/login/template.ftl +++ b/govuk/login/template.ftl @@ -48,8 +48,8 @@ - - + + @@ -109,7 +109,7 @@
diff --git a/hmpo-lev/login/template.ftl b/hmpo-lev/login/template.ftl index 8ac018d..7b3c912 100644 --- a/hmpo-lev/login/template.ftl +++ b/hmpo-lev/login/template.ftl @@ -48,8 +48,8 @@ - - + + @@ -109,7 +109,7 @@
diff --git a/sass/govuk_elements.scss b/sass/govuk_elements.scss index 4fc224f..1b095f7 100644 --- a/sass/govuk_elements.scss +++ b/sass/govuk_elements.scss @@ -27,3 +27,8 @@ $path: "../vendor/govuk_frontend_toolkit/images/";// Path to Frontend Toolkit im display: inline; } } + +/* Override the govuk_template_jinja css files with the new crown logo (Kings Tudor Crown) */ +header#global-header #logo { + background: url("../assets/crown-logo.svg") no-repeat; +} \ No newline at end of file