From 0b93d39bbc55036feb80fbb4dc2daf1faa286a02 Mon Sep 17 00:00:00 2001 From: Neal Gamradt Date: Thu, 25 Aug 2022 23:07:14 -0400 Subject: [PATCH] chore: Further clean-up of HTML and CSS (NGTSK-147) --- .../hosted/feature-flag.yaml | 12 ++-- .../hosted/freeform-yaml.yaml | 2 +- v1/package.json | 2 +- v1/src/html/body/footer-old.html | 4 +- v1/src/html/body/header-old.html | 4 +- v1/src/html/body/main.html | 5 +- v1/src/html/css/style-new.html | 22 +++++-- v1/src/html/css/style-old.html | 57 +++++++++++++------ 8 files changed, 74 insertions(+), 34 deletions(-) diff --git a/v1/iac/cfn/appconfig/configuration-version/hosted/feature-flag.yaml b/v1/iac/cfn/appconfig/configuration-version/hosted/feature-flag.yaml index 0dc16aa..408ee20 100644 --- a/v1/iac/cfn/appconfig/configuration-version/hosted/feature-flag.yaml +++ b/v1/iac/cfn/appconfig/configuration-version/hosted/feature-flag.yaml @@ -153,7 +153,7 @@ Resources: "status": "planned" }, "attributes": { - "version": { + "featureVersion": { "constraints": { "maximum": 9999, "minimum": 1, @@ -170,13 +170,13 @@ Resources: "header": { "enabled": ${FlagHeader}, "backgroundColor": "#015cfe", - "borderColor": "#04006c", - "textColor": "#5128f2", + "borderColor": "#5128f2", + "textColor": "#04006c", "enableLogin": true }, "footer": { "backgroundColor": "#015cfe", - "borderColor": "#04006c", + "borderColor": "#5128f2", "copyright": [ "© 2022", "Some Company Name.", @@ -192,11 +192,11 @@ Resources: 98, 123 ], - "textColor": "#5128f2" + "textColor": "#04006c" }, "short-term-feature": { "enabled": ${FlagShortTermFeature}, - "version": 1 + "featureVersion": 1 } }, "version": "1" diff --git a/v1/iac/cfn/appconfig/configuration-version/hosted/freeform-yaml.yaml b/v1/iac/cfn/appconfig/configuration-version/hosted/freeform-yaml.yaml index 6a2c4aa..7cd4318 100644 --- a/v1/iac/cfn/appconfig/configuration-version/hosted/freeform-yaml.yaml +++ b/v1/iac/cfn/appconfig/configuration-version/hosted/freeform-yaml.yaml @@ -27,7 +27,7 @@ Parameters: ImageUrl: Type: "String" Description: "This is a sample image URL parameter for adding values to the profile configuration." - Default: "https://placekitten.com/g/300/300" # placeholder.com and placekitten.com are free services for placeholder images. + Default: "https://placekitten.com/300/300" # placeholder.com and placekitten.com are free services for placeholder images. Title: Type: "String" Description: "Title for the site." diff --git a/v1/package.json b/v1/package.json index f3ba524..5308a3b 100644 --- a/v1/package.json +++ b/v1/package.json @@ -1,6 +1,6 @@ { "name": "boilerplate-fargate-appconfig", - "version": "1.4.2", + "version": "1.4.3", "description": "This is a Fargate/AppConfig application boilerplate.", "main": "src/app.js", "type": "module", diff --git a/v1/src/html/body/footer-old.html b/v1/src/html/body/footer-old.html index 4043799..fe3618e 100644 --- a/v1/src/html/body/footer-old.html +++ b/v1/src/html/body/footer-old.html @@ -1,3 +1,5 @@ diff --git a/v1/src/html/body/header-old.html b/v1/src/html/body/header-old.html index dad91de..70690c4 100644 --- a/v1/src/html/body/header-old.html +++ b/v1/src/html/body/header-old.html @@ -1,3 +1,5 @@
-

Old Header

+ +

${config.body.title}

+
diff --git a/v1/src/html/body/main.html b/v1/src/html/body/main.html index ada0c7a..1ec29c4 100644 --- a/v1/src/html/body/main.html +++ b/v1/src/html/body/main.html @@ -9,7 +9,10 @@

${config.body.subtitle}

  • Feature Flag
    • - +
    + +
    Random Picture of a Kitten
    +

    The Freeform configuration is used to set things like the page title, header values, and content images. This kind of configuration could serve many purposes, such as setting API URLs, CDN base paths, etc.

    diff --git a/v1/src/html/css/style-new.html b/v1/src/html/css/style-new.html index 704b6ce..4f45851 100644 --- a/v1/src/html/css/style-new.html +++ b/v1/src/html/css/style-new.html @@ -6,6 +6,7 @@ body { background-color: white; + color: black; padding: 0px; margin: 0px; } @@ -24,9 +25,20 @@ padding: 0px 20px 0px 20px; } - img { + figure { float: right; - padding: 10px; + margin: 0px 20px 0px 20px; + } + + figcaption { + text-align: center; + } + + img { + border-radius: 5px; + border: 2px solid ${flags.header.borderColor}; + margin: 2px 0px 2px 0px; + padding: 5px; } .container { @@ -63,12 +75,12 @@ header { border: 2px solid ${flags.header.borderColor}; - background-color: ${flags.footer.backgroundColor}; + background-color: ${flags.header.backgroundColor}; border-top-left-radius:0px; border-top-right-radius:0px; border-top: 0px; margin-top: 0px; - text-color: ${flags.header.textColor}; + color: ${flags.header.textColor}; } footer { @@ -78,7 +90,7 @@ border-bottom-right-radius:0px; border-bottom: 0px; margin-bottom: 0px; - text-color: ${flags.footer.textColor}; + color: ${flags.footer.textColor}; } \ No newline at end of file diff --git a/v1/src/html/css/style-old.html b/v1/src/html/css/style-old.html index 2358910..3b7d169 100644 --- a/v1/src/html/css/style-old.html +++ b/v1/src/html/css/style-old.html @@ -1,15 +1,22 @@ \ No newline at end of file