diff --git a/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/favicon.ico b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/favicon.ico index b30dce56c9..dad490b8d5 100644 Binary files a/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/favicon.ico and b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/favicon.ico differ diff --git a/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-Bold.ttf b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-Bold.ttf new file mode 100755 index 0000000000..fd79d43bea Binary files /dev/null and b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-Bold.ttf differ diff --git a/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-BoldItalic.ttf b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-BoldItalic.ttf new file mode 100755 index 0000000000..9bc800958a Binary files /dev/null and b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-BoldItalic.ttf differ diff --git a/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-ExtraBold.ttf b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-ExtraBold.ttf new file mode 100755 index 0000000000..21f6f84a07 Binary files /dev/null and b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-ExtraBold.ttf differ diff --git a/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-ExtraBoldItalic.ttf b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-ExtraBoldItalic.ttf new file mode 100755 index 0000000000..31cb688340 Binary files /dev/null and b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-ExtraBoldItalic.ttf differ diff --git a/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-Italic.ttf b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-Italic.ttf new file mode 100755 index 0000000000..c90da48ff3 Binary files /dev/null and b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-Italic.ttf differ diff --git a/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-Light.ttf b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-Light.ttf new file mode 100755 index 0000000000..0d381897da Binary files /dev/null and b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-Light.ttf differ diff --git a/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-LightItalic.ttf b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-LightItalic.ttf new file mode 100755 index 0000000000..68299c4bc6 Binary files /dev/null and b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-LightItalic.ttf differ diff --git a/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-Regular.ttf b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-Regular.ttf new file mode 100755 index 0000000000..db433349b7 Binary files /dev/null and b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-Regular.ttf differ diff --git a/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-Semibold.ttf b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-Semibold.ttf new file mode 100755 index 0000000000..1a7679e394 Binary files /dev/null and b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-Semibold.ttf differ diff --git a/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-SemiboldItalic.ttf b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-SemiboldItalic.ttf new file mode 100755 index 0000000000..59b6d16b06 Binary files /dev/null and b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/fonts/OpenSans-SemiboldItalic.ttf differ diff --git a/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/index.html b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/index.html index dd0b909bae..a901baa98d 100755 --- a/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/index.html +++ b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/index.html @@ -23,28 +23,52 @@ - Welcome to Keycloak - - + + Red Hat JBoss IAM + + + + + -
-
- -

Welcome to Keycloak

-

Your Keycloak is running.

- -

Documentation | Administration Console

- -

Keycloak Project | - Mailing List | - Report an issue

-

JBoss and JBoss Community

+
+ + +
+
 
+
+ Red Hat JBoss IAM (Logo) +
+
 
+
+ + + +
+ +
+ +

Welcome to Red Hat JBoss IAM

+ +

Your Red Hat JBoss Identity and Access Management is running.

+ +

+ Administration Console | + Documentation +

+ +
+ +
+ + + +
- + + diff --git a/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/jboss_community.png b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/jboss_community.png deleted file mode 100644 index 946e8f93c7..0000000000 Binary files a/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/jboss_community.png and /dev/null differ diff --git a/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/keycloak.css b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/keycloak.css index 5152862314..ec428b2656 100644 --- a/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/keycloak.css +++ b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/keycloak.css @@ -20,46 +20,153 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ + +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 300; + src: local('Open Sans Light'), local('OpenSans-Light'), url(fonts/OpenSans-Light.ttf) format('truetype'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans'), local('OpenSans'), url(fonts/OpenSans-Regular.ttf) format('truetype'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 600; + src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(fonts/OpenSans-Semibold.ttf) format('truetype'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: local('Open Sans Bold'), local('OpenSans-Bold'), url(fonts/OpenSans-Bold.ttf) format('truetype'); +} + body { - /*background: url(bkg.gif) repeat-x;*/ - color: #5B5B5B; - font-family: "Lucida Sans Unicode", "Lucida Grande", Geneva, Verdana, Arial, sans-serif; - margin-top: 100px; - text-align: center; -} -.wrapper { - margin-left: auto; - margin-right: auto; - width: 50em; - text-align: left; -} -a { - text-decoration: none; - color: #5e8a9a; -} -h1 { - padding-top: 20px; - color: #7b1e1e; -} -a:hover { - text-decoration: underline; - color: #8ec6d9; -} -.content { + background-color: #ECECEC; + color: #4E5255; + font: 12px/1.4 "Open Sans","Lucida Sans Unicode","Lucida Grande",sans-serif; margin: 0; - padding: 0; } -.dualbrand { - padding-top: 20px; + +#container { + background: none repeat scroll 0 0 #FFFFFF; + border-left: 1px solid #CECECE; + border-right: 1px solid #CECECE; + box-shadow: 6px 6px 6px #E3E3E3, -6px 6px 6px #E3E3E3, 6px -6px 6px #E3E3E3, -6px -6px 6px #E3E3E3; + margin: 0 auto; + max-width: 1003px; } -.wildfly { - float:left; - margin-left: 10px; + +#content { + background-color: #ffffff; + margin-top: 4px; + height: 100%; } -.logo{ - margin-bottom: 10px; +#content sub{ + font-size: 12px; } -.note { - font-size: 8pt; - color: #aaaaaa; + + +#footer { + background-color: #F1F1F1; + border-top: 1px solid #CFCFCF; + height: 42px; + min-height: 42px; + width: 100%; + position: absolute; + bottom: 0; +} + +.section { + margin-left: 170px; + margin-right: 170px; + padding-top: 20px; +} + +a { + color: #009ADA; + outline: none; +} + +a:hover { + text-decoration: underline; +} + +a:active { + outline: none; +} + +a:link { + outline: none; +} + +H1 { + color: #656565; + font-size: 20px; + font-weight: 300 !important; + padding-bottom: 8px; +} + +H2 { + color: #656565; + font-size: 14px; + font-weight: 300 !important; +} + +sub { + color: #a3a7aa; +} + +.prod-title { + vertical-align:middle; + padding-bottom:5px; +} + +.prod-version { + padding-left: 8px; + padding-bottom: 12px; + font-size: 10pt !important; + font-weight: bold; + color: #ffffff !important; +} + +.WarnBlock { + color: #000000; + padding: 15px; + background-color: #FFD272; + -moz-border-radius: 4px; + border-radius: 4px; +} + +.header-top { + background-color: #383F45; + border-bottom: 1px solid #53565B; + height:32px; + max-height:32px; + padding-left:15px; +} + +.header-bottom { + background-color: #46494E; + border-bottom: 1px solid #272A2F; + height:43px; + max-height:43px; +} + +.header-line { + background-color: #C82E2E; + border-bottom: 1px solid #272A2F; + max-height:3px; + height:3px; +} + +.header-panel { + height: 80px; + min-height: 80px; + width: 100%; } diff --git a/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/keycloak_logo.png b/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/keycloak_logo.png deleted file mode 100644 index 1f62687515..0000000000 Binary files a/forms/common-themes/src/main/resources/theme/keycloak/welcome/resources/keycloak_logo.png and /dev/null differ diff --git a/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java b/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java index 7aa6b017bf..a4d5191b80 100755 --- a/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java +++ b/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java @@ -84,4 +84,17 @@ public class WelcomeResource { } } + /** + * Fonts for welcome page + * + * @param path + * @return + */ + @GET + @Path("/welcome-content/fonts/{path}") + @Produces("text/html") + public Response getFonts(@PathParam("path") String path) { + return getResource("fonts/"+path); + } + }