diff --git a/misc/logo/bg_gray.png b/misc/logo/bg_gray.png new file mode 100644 index 0000000000..6fdaa1265d Binary files /dev/null and b/misc/logo/bg_gray.png differ diff --git a/misc/logo/bg_gray.svg b/misc/logo/bg_gray.svg new file mode 100644 index 0000000000..01642a6220 --- /dev/null +++ b/misc/logo/bg_gray.svg @@ -0,0 +1,2872 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/misc/logo/favicon.ico b/misc/logo/favicon.ico new file mode 100644 index 0000000000..48188dedaa Binary files /dev/null and b/misc/logo/favicon.ico differ diff --git a/misc/logo/keycloak-logo.png b/misc/logo/keycloak-logo.png deleted file mode 100644 index 35d2fc6c15..0000000000 Binary files a/misc/logo/keycloak-logo.png and /dev/null differ diff --git a/misc/logo/keycloak_google_plus_cover_1080x608.png b/misc/logo/keycloak_google_plus_cover_1080x608.png new file mode 100644 index 0000000000..6c868b2e0e Binary files /dev/null and b/misc/logo/keycloak_google_plus_cover_1080x608.png differ diff --git a/misc/logo/keycloak_google_plus_profile_250x250.png b/misc/logo/keycloak_google_plus_profile_250x250.png new file mode 100644 index 0000000000..3e7d1ae9ee Binary files /dev/null and b/misc/logo/keycloak_google_plus_profile_250x250.png differ diff --git a/misc/logo/keycloak_icon_128px.png b/misc/logo/keycloak_icon_128px.png new file mode 100644 index 0000000000..7971a0ed05 Binary files /dev/null and b/misc/logo/keycloak_icon_128px.png differ diff --git a/misc/logo/keycloak_icon_128px.svg b/misc/logo/keycloak_icon_128px.svg new file mode 100644 index 0000000000..d8baf12419 --- /dev/null +++ b/misc/logo/keycloak_icon_128px.svg @@ -0,0 +1 @@ +keycloak_deliverables \ No newline at end of file diff --git a/misc/logo/keycloak_icon_16px.png b/misc/logo/keycloak_icon_16px.png new file mode 100644 index 0000000000..0be1720ae5 Binary files /dev/null and b/misc/logo/keycloak_icon_16px.png differ diff --git a/misc/logo/keycloak_icon_16px.svg b/misc/logo/keycloak_icon_16px.svg new file mode 100644 index 0000000000..d50057151f --- /dev/null +++ b/misc/logo/keycloak_icon_16px.svg @@ -0,0 +1 @@ +keycloak_deliverables \ No newline at end of file diff --git a/misc/logo/keycloak_icon_256px.png b/misc/logo/keycloak_icon_256px.png new file mode 100644 index 0000000000..48e18430cb Binary files /dev/null and b/misc/logo/keycloak_icon_256px.png differ diff --git a/misc/logo/keycloak_icon_256px.svg b/misc/logo/keycloak_icon_256px.svg new file mode 100644 index 0000000000..570bcc1c30 --- /dev/null +++ b/misc/logo/keycloak_icon_256px.svg @@ -0,0 +1 @@ +keycloak_deliverables \ No newline at end of file diff --git a/misc/logo/keycloak_icon_32px.png b/misc/logo/keycloak_icon_32px.png new file mode 100644 index 0000000000..4a1ccd9a1a Binary files /dev/null and b/misc/logo/keycloak_icon_32px.png differ diff --git a/misc/logo/keycloak_icon_32px.svg b/misc/logo/keycloak_icon_32px.svg new file mode 100644 index 0000000000..9371cb51d3 --- /dev/null +++ b/misc/logo/keycloak_icon_32px.svg @@ -0,0 +1 @@ +keycloak_deliverables \ No newline at end of file diff --git a/misc/logo/keycloak_icon_48px.png b/misc/logo/keycloak_icon_48px.png new file mode 100644 index 0000000000..c7c10cfd4d Binary files /dev/null and b/misc/logo/keycloak_icon_48px.png differ diff --git a/misc/logo/keycloak_icon_48px.svg b/misc/logo/keycloak_icon_48px.svg new file mode 100644 index 0000000000..b1d3c03efb --- /dev/null +++ b/misc/logo/keycloak_icon_48px.svg @@ -0,0 +1 @@ +keycloak_deliverables \ No newline at end of file diff --git a/misc/logo/keycloak_icon_512px.png b/misc/logo/keycloak_icon_512px.png new file mode 100644 index 0000000000..4cdf7fa2e5 Binary files /dev/null and b/misc/logo/keycloak_icon_512px.png differ diff --git a/misc/logo/keycloak_icon_512px.svg b/misc/logo/keycloak_icon_512px.svg new file mode 100644 index 0000000000..cb8d57061e --- /dev/null +++ b/misc/logo/keycloak_icon_512px.svg @@ -0,0 +1 @@ +keycloak_deliverables \ No newline at end of file diff --git a/misc/logo/keycloak_icon_64px.png b/misc/logo/keycloak_icon_64px.png new file mode 100644 index 0000000000..599d07de71 Binary files /dev/null and b/misc/logo/keycloak_icon_64px.png differ diff --git a/misc/logo/keycloak_icon_64px.svg b/misc/logo/keycloak_icon_64px.svg new file mode 100644 index 0000000000..34320393d5 --- /dev/null +++ b/misc/logo/keycloak_icon_64px.svg @@ -0,0 +1 @@ +keycloak_deliverables \ No newline at end of file diff --git a/misc/logo/keycloak_iphone_4.png b/misc/logo/keycloak_iphone_4.png new file mode 100644 index 0000000000..45e39319f6 Binary files /dev/null and b/misc/logo/keycloak_iphone_4.png differ diff --git a/misc/logo/keycloak_iphone_5.png b/misc/logo/keycloak_iphone_5.png new file mode 100644 index 0000000000..5d00b5376a Binary files /dev/null and b/misc/logo/keycloak_iphone_5.png differ diff --git a/misc/logo/keycloak_iphone_6.png b/misc/logo/keycloak_iphone_6.png new file mode 100644 index 0000000000..1e570aeb1e Binary files /dev/null and b/misc/logo/keycloak_iphone_6.png differ diff --git a/misc/logo/keycloak_iphone_6plus.png b/misc/logo/keycloak_iphone_6plus.png new file mode 100644 index 0000000000..b5b5e99282 Binary files /dev/null and b/misc/logo/keycloak_iphone_6plus.png differ diff --git a/misc/logo/keycloak_logo_100px.png b/misc/logo/keycloak_logo_100px.png new file mode 100644 index 0000000000..18f3bcf3f0 Binary files /dev/null and b/misc/logo/keycloak_logo_100px.png differ diff --git a/misc/logo/keycloak_logo_100px.svg b/misc/logo/keycloak_logo_100px.svg new file mode 100644 index 0000000000..e1130b6dfd --- /dev/null +++ b/misc/logo/keycloak_logo_100px.svg @@ -0,0 +1 @@ +keycloak_deliverables \ No newline at end of file diff --git a/misc/logo/keycloak_logo_200px.png b/misc/logo/keycloak_logo_200px.png new file mode 100644 index 0000000000..5fcb08f608 Binary files /dev/null and b/misc/logo/keycloak_logo_200px.png differ diff --git a/misc/logo/keycloak_logo_200px.svg b/misc/logo/keycloak_logo_200px.svg new file mode 100644 index 0000000000..9eeb7291db --- /dev/null +++ b/misc/logo/keycloak_logo_200px.svg @@ -0,0 +1 @@ +keycloak_deliverables \ No newline at end of file diff --git a/misc/logo/keycloak_logo_450px.png b/misc/logo/keycloak_logo_450px.png new file mode 100644 index 0000000000..7732f26485 Binary files /dev/null and b/misc/logo/keycloak_logo_450px.png differ diff --git a/misc/logo/keycloak_logo_450px.svg b/misc/logo/keycloak_logo_450px.svg new file mode 100644 index 0000000000..29be2bc8bb --- /dev/null +++ b/misc/logo/keycloak_logo_450px.svg @@ -0,0 +1 @@ +keycloak_deliverables \ No newline at end of file diff --git a/misc/logo/keycloak_logo_600px.png b/misc/logo/keycloak_logo_600px.png new file mode 100644 index 0000000000..b36e4df364 Binary files /dev/null and b/misc/logo/keycloak_logo_600px.png differ diff --git a/misc/logo/keycloak_logo_600px.svg b/misc/logo/keycloak_logo_600px.svg new file mode 100644 index 0000000000..87c8de0a8f --- /dev/null +++ b/misc/logo/keycloak_logo_600px.svg @@ -0,0 +1 @@ +keycloak_deliverables \ No newline at end of file diff --git a/misc/logo/keycloak_logofinal_1color.svg b/misc/logo/keycloak_logofinal_1color.svg new file mode 100644 index 0000000000..8632036805 --- /dev/null +++ b/misc/logo/keycloak_logofinal_1color.svg @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/misc/logo/keycloak_logofinal_2color.svg b/misc/logo/keycloak_logofinal_2color.svg new file mode 100644 index 0000000000..1cd67b6783 --- /dev/null +++ b/misc/logo/keycloak_logofinal_2color.svg @@ -0,0 +1,99 @@ + + + + + + + + + + + + + diff --git a/misc/logo/keycloak_swag_square.png b/misc/logo/keycloak_swag_square.png new file mode 100644 index 0000000000..21e0ee58a9 Binary files /dev/null and b/misc/logo/keycloak_swag_square.png differ diff --git a/misc/logo/keycloak_swag_tall.png b/misc/logo/keycloak_swag_tall.png new file mode 100644 index 0000000000..d8e7970a4e Binary files /dev/null and b/misc/logo/keycloak_swag_tall.png differ diff --git a/misc/logo/keycloak_swag_tile.png b/misc/logo/keycloak_swag_tile.png new file mode 100644 index 0000000000..7fac5d9ff5 Binary files /dev/null and b/misc/logo/keycloak_swag_tile.png differ diff --git a/misc/logo/keycloak_swag_wide.png b/misc/logo/keycloak_swag_wide.png new file mode 100644 index 0000000000..8fa5d26477 Binary files /dev/null and b/misc/logo/keycloak_swag_wide.png differ diff --git a/misc/logo/keycloak_twitter_header_1500x500.png b/misc/logo/keycloak_twitter_header_1500x500.png new file mode 100644 index 0000000000..87de81ea7e Binary files /dev/null and b/misc/logo/keycloak_twitter_header_1500x500.png differ diff --git a/misc/logo/keycloak_twitter_profile_400x400.png b/misc/logo/keycloak_twitter_profile_400x400.png new file mode 100644 index 0000000000..d6223018b9 Binary files /dev/null and b/misc/logo/keycloak_twitter_profile_400x400.png differ diff --git a/misc/logo/keycloak_upsteam_tile_200x150.png b/misc/logo/keycloak_upsteam_tile_200x150.png new file mode 100644 index 0000000000..c8294ec54b Binary files /dev/null and b/misc/logo/keycloak_upsteam_tile_200x150.png differ diff --git a/misc/logo/keycloak_upstream_spotlight_500x400.png b/misc/logo/keycloak_upstream_spotlight_500x400.png new file mode 100644 index 0000000000..674bcc95ff Binary files /dev/null and b/misc/logo/keycloak_upstream_spotlight_500x400.png differ diff --git a/misc/logo/keycloak_wallpaper_1024x768.png b/misc/logo/keycloak_wallpaper_1024x768.png new file mode 100644 index 0000000000..0ad84136a6 Binary files /dev/null and b/misc/logo/keycloak_wallpaper_1024x768.png differ diff --git a/misc/logo/keycloak_wallpaper_1024x800.png b/misc/logo/keycloak_wallpaper_1024x800.png new file mode 100644 index 0000000000..2bda89d9c0 Binary files /dev/null and b/misc/logo/keycloak_wallpaper_1024x800.png differ diff --git a/misc/logo/keycloak_wallpaper_1280x800.png b/misc/logo/keycloak_wallpaper_1280x800.png new file mode 100644 index 0000000000..7dee9127fb Binary files /dev/null and b/misc/logo/keycloak_wallpaper_1280x800.png differ diff --git a/misc/logo/keycloak_wallpaper_1440x900.png b/misc/logo/keycloak_wallpaper_1440x900.png new file mode 100644 index 0000000000..2392321c23 Binary files /dev/null and b/misc/logo/keycloak_wallpaper_1440x900.png differ diff --git a/misc/logo/keycloak_wallpaper_1600x1200.png b/misc/logo/keycloak_wallpaper_1600x1200.png new file mode 100644 index 0000000000..f27d550e52 Binary files /dev/null and b/misc/logo/keycloak_wallpaper_1600x1200.png differ diff --git a/misc/logo/keycloak_wallpaper_1680x1050.png b/misc/logo/keycloak_wallpaper_1680x1050.png new file mode 100644 index 0000000000..6313f638df Binary files /dev/null and b/misc/logo/keycloak_wallpaper_1680x1050.png differ diff --git a/misc/logo/keycloak_wallpaper_1920x1200.png b/misc/logo/keycloak_wallpaper_1920x1200.png new file mode 100644 index 0000000000..2c9b2cdde5 Binary files /dev/null and b/misc/logo/keycloak_wallpaper_1920x1200.png differ diff --git a/misc/logo/keycloak_wallpaper_2560x1440.png b/misc/logo/keycloak_wallpaper_2560x1440.png new file mode 100644 index 0000000000..443a42054a Binary files /dev/null and b/misc/logo/keycloak_wallpaper_2560x1440.png differ diff --git a/misc/logo/keycloak_wallpaper_2560x1600.png b/misc/logo/keycloak_wallpaper_2560x1600.png new file mode 100644 index 0000000000..0978094ec1 Binary files /dev/null and b/misc/logo/keycloak_wallpaper_2560x1600.png differ diff --git a/misc/logo/keycloak_wallpaper_480x800.png b/misc/logo/keycloak_wallpaper_480x800.png new file mode 100644 index 0000000000..67c8e0591e Binary files /dev/null and b/misc/logo/keycloak_wallpaper_480x800.png differ diff --git a/misc/logo/keycloak_wallpaper_640x480.png b/misc/logo/keycloak_wallpaper_640x480.png new file mode 100644 index 0000000000..3f858bc9ec Binary files /dev/null and b/misc/logo/keycloak_wallpaper_640x480.png differ diff --git a/misc/logo/keycloak_wallpaper_800x480.png b/misc/logo/keycloak_wallpaper_800x480.png new file mode 100644 index 0000000000..5af5e78a19 Binary files /dev/null and b/misc/logo/keycloak_wallpaper_800x480.png differ diff --git a/misc/logo/keycloak_wallpaper_800x600.png b/misc/logo/keycloak_wallpaper_800x600.png new file mode 100644 index 0000000000..b24e6d4de4 Binary files /dev/null and b/misc/logo/keycloak_wallpaper_800x600.png differ diff --git a/misc/logo/keycloak_wallpaper_thumbnail.png b/misc/logo/keycloak_wallpaper_thumbnail.png new file mode 100644 index 0000000000..2370891216 Binary files /dev/null and b/misc/logo/keycloak_wallpaper_thumbnail.png differ diff --git a/misc/logo/login-bg.svg b/misc/logo/login-bg.svg deleted file mode 100644 index ad5d206330..0000000000 --- a/misc/logo/login-bg.svg +++ /dev/null @@ -1,771 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/misc/logo/login-bkgrnd.svg b/misc/logo/login-bkgrnd.svg deleted file mode 100644 index a15f96f479..0000000000 --- a/misc/logo/login-bkgrnd.svg +++ /dev/null @@ -1,362 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/misc/logo/logo-big-background.svg b/misc/logo/logo-big-background.svg deleted file mode 100644 index ab5c367b26..0000000000 --- a/misc/logo/logo-big-background.svg +++ /dev/null @@ -1,241 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/misc/logo/logo-big-blue.svg b/misc/logo/logo-big-blue.svg deleted file mode 100644 index 10f8a3758f..0000000000 --- a/misc/logo/logo-big-blue.svg +++ /dev/null @@ -1,205 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/misc/logo/logo-big-white.svg b/misc/logo/logo-big-white.svg deleted file mode 100644 index da8cd0e533..0000000000 --- a/misc/logo/logo-big-white.svg +++ /dev/null @@ -1,230 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/misc/logo/logo-small-blue.svg b/misc/logo/logo-small-blue.svg deleted file mode 100644 index 53b97d5bc5..0000000000 --- a/misc/logo/logo-small-blue.svg +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/misc/logo/logo-small-white.svg b/misc/logo/logo-small-white.svg deleted file mode 100644 index 34832e380e..0000000000 --- a/misc/logo/logo-small-white.svg +++ /dev/null @@ -1,185 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/misc/logo/logo.png b/misc/logo/logo.png index 9cbaf03962..2d07df8ae6 100644 Binary files a/misc/logo/logo.png and b/misc/logo/logo.png differ diff --git a/misc/logo/logo.svg b/misc/logo/logo.svg new file mode 100644 index 0000000000..b95c0dacf5 --- /dev/null +++ b/misc/logo/logo.svg @@ -0,0 +1,2661 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6212ca8366..91ba3c8d36 100755 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ Keycloak - \u003Cstrong\u003EKeycloak\u003C\u002Fstrong\u003E + \u003Cdiv class="kc-logo-text"\u003E\u003Cspan\u003EKeycloak\u003C\u002Fspan\u003E\u003C\u002Fdiv\u003E ${project.version} ${timestamp} diff --git a/server-spi/src/main/java/org/keycloak/migration/MigrationModel.java b/server-spi/src/main/java/org/keycloak/migration/MigrationModel.java index 1375bc3f2b..ec8137ea80 100755 --- a/server-spi/src/main/java/org/keycloak/migration/MigrationModel.java +++ b/server-spi/src/main/java/org/keycloak/migration/MigrationModel.java @@ -26,7 +26,7 @@ public interface MigrationModel { /** * Must have the form of major.minor.micro as the version is parsed and numbers are compared */ - String LATEST_VERSION = "1.8.0"; + String LATEST_VERSION = "1.9.0"; String getStoredVersion(); void setStoredVersion(String version); diff --git a/server-spi/src/main/java/org/keycloak/migration/MigrationModelManager.java b/server-spi/src/main/java/org/keycloak/migration/MigrationModelManager.java index ad337b5f06..9b1442c557 100755 --- a/server-spi/src/main/java/org/keycloak/migration/MigrationModelManager.java +++ b/server-spi/src/main/java/org/keycloak/migration/MigrationModelManager.java @@ -24,6 +24,7 @@ import org.keycloak.migration.migrators.MigrateTo1_5_0; import org.keycloak.migration.migrators.MigrateTo1_6_0; import org.keycloak.migration.migrators.MigrateTo1_7_0; import org.keycloak.migration.migrators.MigrateTo1_8_0; +import org.keycloak.migration.migrators.MigrateTo1_9_0; import org.keycloak.migration.migrators.MigrationTo1_2_0_CR1; import org.keycloak.models.KeycloakSession; @@ -85,6 +86,12 @@ public class MigrationModelManager { } new MigrateTo1_8_0().migrate(session); } + if (stored == null || stored.lessThan(MigrateTo1_9_0.VERSION)) { + if (stored != null) { + logger.debug("Migrating older model to 1.9.0 updates"); + } + new MigrateTo1_9_0().migrate(session); + } model.setStoredVersion(MigrationModel.LATEST_VERSION); } diff --git a/server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_0.java b/server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_0.java new file mode 100644 index 0000000000..81414c1bea --- /dev/null +++ b/server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_0.java @@ -0,0 +1,47 @@ +/* + * Copyright 2016 Red Hat, Inc. and/or its affiliates + * and other contributors as indicated by the @author tags. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.keycloak.migration.migrators; + +import org.keycloak.Config; +import org.keycloak.migration.ModelVersion; +import org.keycloak.models.Constants; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.LDAPConstants; +import org.keycloak.models.RealmModel; +import org.keycloak.models.UserFederationMapperModel; +import org.keycloak.models.UserFederationProviderModel; +import org.keycloak.models.utils.KeycloakModelUtils; + +import java.util.List; +import java.util.Map; + +/** + * @author Marek Posolda + */ +public class MigrateTo1_9_0 { + + public static final ModelVersion VERSION = new ModelVersion("1.9.0"); + + public void migrate(KeycloakSession session) { + RealmModel realm = session.realms().getRealmByName(Config.getAdminRealm()); + if (realm != null && realm.getDisplayNameHtml().equals("Keycloak")) { + realm.setDisplayNameHtml("
Keycloak
"); + } + } + +} diff --git a/themes/src/main/resources/theme/keycloak/account/resources/css/account.css b/themes/src/main/resources/theme/keycloak/account/resources/css/account.css index a18d0f2675..c1353d7972 100644 --- a/themes/src/main/resources/theme/keycloak/account/resources/css/account.css +++ b/themes/src/main/resources/theme/keycloak/account/resources/css/account.css @@ -22,7 +22,7 @@ header .navbar { background-image: url('../img/logo.png'); height: 25px; background-repeat: no-repeat; - width: 103px; + width: 123px; margin: 3px 10px 5px; text-indent: -99999px; } diff --git a/themes/src/main/resources/theme/keycloak/account/resources/img/favicon.ico b/themes/src/main/resources/theme/keycloak/account/resources/img/favicon.ico index b30dce56c9..48188dedaa 100644 Binary files a/themes/src/main/resources/theme/keycloak/account/resources/img/favicon.ico and b/themes/src/main/resources/theme/keycloak/account/resources/img/favicon.ico differ diff --git a/themes/src/main/resources/theme/keycloak/account/resources/img/logo.png b/themes/src/main/resources/theme/keycloak/account/resources/img/logo.png index 9cbaf03962..a698c548ce 100644 Binary files a/themes/src/main/resources/theme/keycloak/account/resources/img/logo.png and b/themes/src/main/resources/theme/keycloak/account/resources/img/logo.png differ diff --git a/themes/src/main/resources/theme/keycloak/admin/resources/css/styles.css b/themes/src/main/resources/theme/keycloak/admin/resources/css/styles.css index a6d40214fb..11ed88e3eb 100644 --- a/themes/src/main/resources/theme/keycloak/admin/resources/css/styles.css +++ b/themes/src/main/resources/theme/keycloak/admin/resources/css/styles.css @@ -309,8 +309,8 @@ th.w-40 { height: 56px; line-height: 56px; background-position: center center; - background-image: url('../img/keyclok-logo.svg'); - background-size: 148px 36px; + background-image: url('../img/keyclok-logo.png'); + background-size: 148px 30px; background-repeat: no-repeat; width: 148px; } diff --git a/themes/src/main/resources/theme/keycloak/admin/resources/img/brand.svg b/themes/src/main/resources/theme/keycloak/admin/resources/img/brand.svg deleted file mode 100644 index ca5b820c02..0000000000 --- a/themes/src/main/resources/theme/keycloak/admin/resources/img/brand.svg +++ /dev/null @@ -1,498 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/themes/src/main/resources/theme/keycloak/admin/resources/img/favicon.ico b/themes/src/main/resources/theme/keycloak/admin/resources/img/favicon.ico index b30dce56c9..48188dedaa 100644 Binary files a/themes/src/main/resources/theme/keycloak/admin/resources/img/favicon.ico and b/themes/src/main/resources/theme/keycloak/admin/resources/img/favicon.ico differ diff --git a/themes/src/main/resources/theme/keycloak/admin/resources/img/keyclok-logo.png b/themes/src/main/resources/theme/keycloak/admin/resources/img/keyclok-logo.png new file mode 100644 index 0000000000..ca53f0a04b Binary files /dev/null and b/themes/src/main/resources/theme/keycloak/admin/resources/img/keyclok-logo.png differ diff --git a/themes/src/main/resources/theme/keycloak/login/resources/css/login.css b/themes/src/main/resources/theme/keycloak/login/resources/css/login.css index 9c28f3afdb..8d702d9549 100644 --- a/themes/src/main/resources/theme/keycloak/login/resources/css/login.css +++ b/themes/src/main/resources/theme/keycloak/login/resources/css/login.css @@ -1,6 +1,6 @@ .login-pf body { background: #0f0f0f url("../img/keycloak-bg.png") top left no-repeat; - background-size: 100% auto; + background-size: cover; } .alert-error { @@ -79,8 +79,19 @@ a#kc-current-locale-link::after { background-image: url("../img/keycloak-logo.png"); background-repeat: no-repeat; - height: 37px; - width: 154px; + height: 57px; + width: 125px; +} + +div.kc-logo-text { + background-image: url("../img/keycloak-logo-text.png"); + background-repeat: no-repeat; + width: 250px; + height: 38px; +} + +div.kc-logo-text span { + display: none; } #kc-header { diff --git a/themes/src/main/resources/theme/keycloak/login/resources/img/favicon.ico b/themes/src/main/resources/theme/keycloak/login/resources/img/favicon.ico index b30dce56c9..48188dedaa 100644 Binary files a/themes/src/main/resources/theme/keycloak/login/resources/img/favicon.ico and b/themes/src/main/resources/theme/keycloak/login/resources/img/favicon.ico differ diff --git a/themes/src/main/resources/theme/keycloak/login/resources/img/keycloak-bg.png b/themes/src/main/resources/theme/keycloak/login/resources/img/keycloak-bg.png index 3e579b7f4b..4004db4420 100644 Binary files a/themes/src/main/resources/theme/keycloak/login/resources/img/keycloak-bg.png and b/themes/src/main/resources/theme/keycloak/login/resources/img/keycloak-bg.png differ diff --git a/themes/src/main/resources/theme/keycloak/login/resources/img/keycloak-logo-text.png b/themes/src/main/resources/theme/keycloak/login/resources/img/keycloak-logo-text.png new file mode 100644 index 0000000000..11292dd74b Binary files /dev/null and b/themes/src/main/resources/theme/keycloak/login/resources/img/keycloak-logo-text.png differ diff --git a/themes/src/main/resources/theme/keycloak/login/resources/img/keycloak-logo.png b/themes/src/main/resources/theme/keycloak/login/resources/img/keycloak-logo.png index 955574855d..ffa5b0bf9e 100644 Binary files a/themes/src/main/resources/theme/keycloak/login/resources/img/keycloak-logo.png and b/themes/src/main/resources/theme/keycloak/login/resources/img/keycloak-logo.png differ diff --git a/themes/src/main/resources/theme/keycloak/welcome/resources/favicon.ico b/themes/src/main/resources/theme/keycloak/welcome/resources/favicon.ico index b30dce56c9..48188dedaa 100644 Binary files a/themes/src/main/resources/theme/keycloak/welcome/resources/favicon.ico and b/themes/src/main/resources/theme/keycloak/welcome/resources/favicon.ico differ diff --git a/themes/src/main/resources/theme/keycloak/welcome/resources/keycloak.css b/themes/src/main/resources/theme/keycloak/welcome/resources/keycloak.css index 5152862314..0438decfc7 100644 --- a/themes/src/main/resources/theme/keycloak/welcome/resources/keycloak.css +++ b/themes/src/main/resources/theme/keycloak/welcome/resources/keycloak.css @@ -35,15 +35,15 @@ body { } a { text-decoration: none; - color: #5e8a9a; + color: #008aaa; } h1 { padding-top: 20px; - color: #7b1e1e; + color: #008aaa; } a:hover { text-decoration: underline; - color: #8ec6d9; + color: #33c6e9; } .content { margin: 0; @@ -63,3 +63,7 @@ a:hover { font-size: 8pt; color: #aaaaaa; } + +p.logos { + padding-top: 20px; +} diff --git a/themes/src/main/resources/theme/keycloak/welcome/resources/keycloak_logo.png b/themes/src/main/resources/theme/keycloak/welcome/resources/keycloak_logo.png index 1f62687515..134440b16e 100644 Binary files a/themes/src/main/resources/theme/keycloak/welcome/resources/keycloak_logo.png and b/themes/src/main/resources/theme/keycloak/welcome/resources/keycloak_logo.png differ