Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge staging to prod - Remove google fonts (#128) #129

Merged
merged 2 commits into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions finish/client/src/main/webapp/css/styles.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018 IBM Corporation and others.
* Copyright (c) 2018, 2024 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
Expand All @@ -8,8 +8,6 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@import url("https://fonts.googleapis.com/css?family=Asap:300,400,500");

@font-face {
font-family: BunueloLight;
src: url("/fonts/BunueloCleanPro-Light.otf");
Expand All @@ -21,7 +19,7 @@
}

body{
font-family:Asap;
font-family: BunueloSemiBold;
font-size: 16px;
color:#24243b;
background-color: white;
Expand Down Expand Up @@ -61,7 +59,7 @@ p {
margin-top: 0px;
}
h1 {
font-family:BunueloSemiBold;
font-family: BunueloSemiBold;
font-size: 40px;
font-weight: 400;
letter-spacing:0;
Expand All @@ -79,7 +77,7 @@ a {
}

#appIntro {
background-image:linear-gradient(#141427 0%, #2c2e50 100%);
background-image: linear-gradient(#141427 0%, #2c2e50 100%);
background-size: 100% calc(100% - 70px);
background-repeat: no-repeat;
}
Expand All @@ -90,7 +88,7 @@ a {
}

#appTitle {
font-family:BunueloLight;
font-family: BunueloLight;
font-size:55px;
}

Expand Down Expand Up @@ -226,7 +224,7 @@ button {
height:44px;
color:#24253a;
text-align:center;
font-family: Asap;
font-family: BunueloSemiBold;
margin-top: 25px;
margin-bottom: 70px;
cursor: pointer;
Expand Down Expand Up @@ -297,7 +295,7 @@ section#openLibertyAndMp {

#serviceStatus {
font-size: 50px;
font-family:BunueloLight;
font-family: BunueloLight;
margin-top: 30px;
}

Expand Down Expand Up @@ -392,7 +390,7 @@ td {
}

.bodyFooterLink {
font-family: Asap;
font-family: BunueloSemiBold;
font-weight: 300;
font-size: 14px;
letter-spacing: 0;
Expand Down
3 changes: 1 addition & 2 deletions finish/client/src/main/webapp/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- tag::copyright[] -->
<!--
Copyright (c) 2022, 2023 IBM Corp.
Copyright (c) 2022, 2024 IBM Corp.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -20,7 +20,6 @@
<head>
<meta charset="UTF-8">
<title>Open Liberty System Load</title>
<link href="https://fonts.googleapis.com/css?family=Asap" rel="stylesheet">
<link rel="stylesheet" href="css/styles.css">
<link href="favicon.ico" rel="icon" />
<link href="favicon.ico" rel="shortcut icon" />
Expand Down
18 changes: 8 additions & 10 deletions start/client/src/main/webapp/css/styles.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018 IBM Corporation and others.
* Copyright (c) 2018, 2024 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
Expand All @@ -8,8 +8,6 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@import url("https://fonts.googleapis.com/css?family=Asap:300,400,500");

@font-face {
font-family: BunueloLight;
src: url("/fonts/BunueloCleanPro-Light.otf");
Expand All @@ -21,7 +19,7 @@
}

body{
font-family:Asap;
font-family: BunueloSemiBold;
font-size: 16px;
color:#24243b;
background-color: white;
Expand Down Expand Up @@ -61,7 +59,7 @@ p {
margin-top: 0px;
}
h1 {
font-family:BunueloSemiBold;
font-family: BunueloSemiBold;
font-size: 40px;
font-weight: 400;
letter-spacing:0;
Expand All @@ -79,7 +77,7 @@ a {
}

#appIntro {
background-image:linear-gradient(#141427 0%, #2c2e50 100%);
background-image: linear-gradient(#141427 0%, #2c2e50 100%);
background-size: 100% calc(100% - 70px);
background-repeat: no-repeat;
}
Expand All @@ -90,7 +88,7 @@ a {
}

#appTitle {
font-family:BunueloLight;
font-family: BunueloLight;
font-size:55px;
}

Expand Down Expand Up @@ -226,7 +224,7 @@ button {
height:44px;
color:#24253a;
text-align:center;
font-family: Asap;
font-family: BunueloSemiBold;
margin-top: 25px;
margin-bottom: 70px;
cursor: pointer;
Expand Down Expand Up @@ -297,7 +295,7 @@ section#openLibertyAndMp {

#serviceStatus {
font-size: 50px;
font-family:BunueloLight;
font-family: BunueloLight;
margin-top: 30px;
}

Expand Down Expand Up @@ -392,7 +390,7 @@ td {
}

.bodyFooterLink {
font-family: Asap;
font-family: BunueloSemiBold;
font-weight: 300;
font-size: 14px;
letter-spacing: 0;
Expand Down
Loading