From 9d169cd29a5beb65f4e05802d5d5e77eadd51868 Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 24 Sep 2024 11:18:42 -0400 Subject: [PATCH 1/7] begin migration towards sexy looking homepage --- _includes/header.html | 2 +- _layouts/about.html | 2 +- _layouts/landing.html | 19 ++++++--------- _layouts/services.html | 4 ++-- _sass/_dark.scss | 7 ++++-- _sass/_light.scss | 3 ++- _sass/base.scss | 53 ++++++++++++++++++++++++------------------ 7 files changed, 48 insertions(+), 42 deletions(-) diff --git a/_includes/header.html b/_includes/header.html index 954c37d..9f421b4 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -18,7 +18,7 @@ {%- endif -%} {%- endfor -%}
  • - Free Consultation + Free Consultation
    • -
    -
    @@ -129,16 +126,14 @@
    -
    -

    Services

    Distrust offers a wide range of services which are tailored to your organization. Whether you need a complete security assessment, want to create or improve an open source security tool, or want to focus on assessing a specific aspect of your organization or system - we are here to help. Our experienced staff will collaborate closely with you to understand your unique needs and create a tailor made solution that works for you.

    - Learn more - Free Consultation + Learn more + Free Consultation
    @@ -184,11 +179,11 @@

    - Free Consultation + Free Consultation
    {%- include footer.html -%} - \ No newline at end of file + diff --git a/_layouts/services.html b/_layouts/services.html index 70bcc72..eea06c9 100644 --- a/_layouts/services.html +++ b/_layouts/services.html @@ -15,7 +15,7 @@

    How can we help you?

    Distrust offers a wide range of services which are tailored to your organization. Whether you need a complete security assessment, want to create or improve an open source security tool, or want to focus on assessing a specific aspect of your organization or system - we are here to help. Our experienced staff will collaborate closely with you to understand your unique needs and create a tailor made solution that works for you.


    - Free Consultation + Free Consultation
    @@ -101,4 +101,4 @@ - \ No newline at end of file + diff --git a/_sass/_dark.scss b/_sass/_dark.scss index d854972..d3edbf0 100644 --- a/_sass/_dark.scss +++ b/_sass/_dark.scss @@ -3,14 +3,17 @@ */ :root { - --base-color: #FFFFFF; + --base-color: rgba(255, 255, 255, 0.87); + --header-color: #ffffff; --border: solid 2px rgba(219, 219, 219, 0.9); --selection-background: rgba(219, 219, 219, 0.99); --selection-text: #000; - --background-color: #282828; + --background-color: #141414; --text-color: var(--base-color); --placeholder-color: rgba(0, 0, 0, 0.5); --link-color: var(--base-color); + /* yoinkt from Material Design 2014, Deep Purple A200 */ + --mega-color: #7c4dff; --code-color-1: #aaaaaa; --code-color-2: #ffffcc; --code-color-3: #F00000; diff --git a/_sass/_light.scss b/_sass/_light.scss index 3515c95..bf6c96c 100644 --- a/_sass/_light.scss +++ b/_sass/_light.scss @@ -3,7 +3,8 @@ */ :root { - --base-color: #000; + --base-color: rgba(0, 0, 0, 0.87); + --header-color: rgba(0, 0, 0, 0); --border: dashed 1px rgba(0, 0, 0, 1); --selection-background: rgba(0, 0, 0, 0.99); --selection-text: #FFF; diff --git a/_sass/base.scss b/_sass/base.scss index 1919dfc..f9b78fe 100644 --- a/_sass/base.scss +++ b/_sass/base.scss @@ -65,7 +65,7 @@ h6 { margin-top: 0px; margin-bottom: 12px; font-weight: bold; - color: var(--text-color); + color: var(--header-color); } p, @@ -78,6 +78,7 @@ ol { a { text-decoration: underline; color: var(--link-color); + transition: background-color 0.3s ease-in-out, color 0.3s ease-in-out; } a:hover { @@ -121,8 +122,7 @@ footer { } header { - margin-top: 24px; - margin-bottom: 24px; + margin: 24px; } header p { @@ -163,6 +163,7 @@ hr { .header-page-links a:hover { background-color: transparent; color: lightgrey; + text-decoration: underline; } .right-menu { @@ -283,22 +284,35 @@ hr { /** * Buttons */ -.action-button { +.button { display: inline-block; padding: 10px 20px 9px 20px; margin-top: 10px; - border-color: white; - border: solid 1px; - color: black; - background-color: white; + color: var(--base-color); + background-color: var(--background-color); + border: 2px solid white; text-decoration: none; + transition: background-color 0.3s ease-in-out, color 0.3s ease-in-out; } -.action-button:hover { - background-color: transparent; - border-color: white; - border: solid 1px; - color: white; +.button:hover { + /* invert */ + background-color: var(--base-color); + color: var(--background-color); + transition: background-color 0.3s ease-in-out, color 0.3s ease-in-out; +} + +/* important button */ +.mega.button { + background-color: var(--mega-color); + color: var(--base-color); + border: 2px solid var(--mega-color); +} + +.mega.button:hover { + /* invert */ + background-color: color-mix(in srgb, var(--mega-color), white 10%); + color: var(--base-color); } .button-container { @@ -344,12 +358,10 @@ hr { * Header/Navigation */ .menu { - border-bottom: var(--border); - margin-bottom: 20px; + /* border-bottom: var(--border); */ display: flex; justify-content: space-between; align-items: center; - padding-bottom: 25px; } .menu ul { @@ -499,12 +511,7 @@ textarea { section { margin-top: 48px; - margin-bottom: 48px; -} - -.extra-spacing { - margin-top: 70px; - margin-bottom: 70px; + margin-bottom: 120px; } .companies { @@ -537,7 +544,7 @@ section { } .text-well { - max-width: 600px; + max-width: 100%; padding-right: 35px; } -- 2.40.1 From 2c0df37f5644853e2a63f2c139f1493352ee2df1 Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 24 Sep 2024 12:06:14 -0400 Subject: [PATCH 2/7] fixup spacings --- _sass/base.scss | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/_sass/base.scss b/_sass/base.scss index f9b78fe..f019e3e 100644 --- a/_sass/base.scss +++ b/_sass/base.scss @@ -122,7 +122,8 @@ footer { } header { - margin: 24px; + padding: 24px; + border-bottom: 1px solid rgba(255, 255, 255, 0.13); } header p { @@ -142,7 +143,7 @@ hr { * Navbar */ .menu-logo { - height: 60px; + height: 48px; } #home-link:hover { @@ -365,8 +366,6 @@ hr { } .menu ul { - margin-top: 12px; - margin-bottom: 12px; padding-left: 0px; list-style-type: none; text-align: right; @@ -905,7 +904,7 @@ pre { .carousel-item { display: flex; justify-content: center; - align-items: center; + align-items: start; max-width: 400px; height: 80px; width: 100%; -- 2.40.1 From d60c8cd1b8bc185ff07dbc394b66e991ff694c70 Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 24 Sep 2024 12:17:04 -0400 Subject: [PATCH 3/7] make left side of nav flex --- _includes/header.html | 2 +- _sass/base.scss | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/_includes/header.html b/_includes/header.html index 9f421b4..6381fa2 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,7 +1,7 @@ {%- assign page_paths = site.header_pages | default: default_paths -%}
    -
    +
    diff --git a/_sass/base.scss b/_sass/base.scss index f019e3e..1bf6d1a 100644 --- a/_sass/base.scss +++ b/_sass/base.scss @@ -167,6 +167,15 @@ hr { text-decoration: underline; } +.left-menu { + display: flex; + align-items: center; +} + +.left-menu img { + display: flex; +} + .right-menu { width: 74%; display: flex; -- 2.40.1 From fbfb421243ab05e64ff3b3f78d92a0d35a0fad1f Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 24 Sep 2024 12:26:50 -0400 Subject: [PATCH 4/7] fix headers across site --- _layouts/about.html | 5 ++--- _layouts/contact.html | 4 ++-- _layouts/services.html | 5 ++--- _layouts/tools.html | 5 ++--- _sass/base.scss | 1 + 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/_layouts/about.html b/_layouts/about.html index a8dba2f..9ff899f 100644 --- a/_layouts/about.html +++ b/_layouts/about.html @@ -4,10 +4,9 @@ {%- include head.html -%} + {%- include header.html -%} +
    - - {%- include header.html -%} -

    About Distrust

    diff --git a/_layouts/contact.html b/_layouts/contact.html index 858a00b..44abff7 100644 --- a/_layouts/contact.html +++ b/_layouts/contact.html @@ -3,9 +3,9 @@ {%- include head.html -%} -
    + {%- include header.html -%} - {%- include header.html -%} +

    What are your biggest security challenges?

    diff --git a/_layouts/services.html b/_layouts/services.html index eea06c9..94c0d1b 100644 --- a/_layouts/services.html +++ b/_layouts/services.html @@ -4,10 +4,9 @@ {%- include head.html -%} + {%- include header.html -%} +
    - - {%- include header.html -%} -
    diff --git a/_layouts/tools.html b/_layouts/tools.html index 428d1ae..24b5323 100644 --- a/_layouts/tools.html +++ b/_layouts/tools.html @@ -5,10 +5,9 @@ {%- include head.html -%} + {%- include header.html -%} +
    - - {%- include header.html -%} -
    diff --git a/_sass/base.scss b/_sass/base.scss index 1bf6d1a..b66eb41 100644 --- a/_sass/base.scss +++ b/_sass/base.scss @@ -123,6 +123,7 @@ footer { header { padding: 24px; + margin-bottom: 24px; border-bottom: 1px solid rgba(255, 255, 255, 0.13); } -- 2.40.1 From 33005b251c0da829bebcf1c888cebc9e18b43f4c Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 24 Sep 2024 21:06:56 -0400 Subject: [PATCH 5/7] shorten layout between segments, fix spacing on buttons --- _layouts/about.html | 8 +++----- _layouts/landing.html | 6 +++--- _layouts/services.html | 14 +++----------- _layouts/tools.html | 10 ---------- _sass/base.scss | 2 +- 5 files changed, 10 insertions(+), 30 deletions(-) diff --git a/_layouts/about.html b/_layouts/about.html index 9ff899f..f1ee9e5 100644 --- a/_layouts/about.html +++ b/_layouts/about.html @@ -34,13 +34,11 @@
  • How do you know the offline laptop with the keys to the kingdom has not been tampered with?
  • Do you have a plan for when your production systems are compromised?
    • -
    -
    - Free Consultation +
    + Free Consultation +
    -
    -

    Values

    diff --git a/_layouts/landing.html b/_layouts/landing.html index 7ad1304..6beba7b 100644 --- a/_layouts/landing.html +++ b/_layouts/landing.html @@ -177,9 +177,9 @@
    -
    -
    - Free Consultation +
    + Free Consultation +
    {%- include footer.html -%} diff --git a/_layouts/services.html b/_layouts/services.html index 94c0d1b..1c459d2 100644 --- a/_layouts/services.html +++ b/_layouts/services.html @@ -13,17 +13,15 @@

    How can we help you?

    Distrust offers a wide range of services which are tailored to your organization. Whether you need a complete security assessment, want to create or improve an open source security tool, or want to focus on assessing a specific aspect of your organization or system - we are here to help. Our experienced staff will collaborate closely with you to understand your unique needs and create a tailor made solution that works for you.

    -
    - Free Consultation -
    +
    + Free Consultation +
    -
    -
    @@ -42,8 +40,6 @@
    -
    -
    @@ -63,8 +59,6 @@
    -
    -
    @@ -83,8 +77,6 @@
    -
    -
    diff --git a/_layouts/tools.html b/_layouts/tools.html index 24b5323..bda91b7 100644 --- a/_layouts/tools.html +++ b/_layouts/tools.html @@ -22,8 +22,6 @@
    -
    -
    @@ -43,8 +41,6 @@
    -
    -
    @@ -63,8 +59,6 @@
    -
    -
    @@ -83,8 +77,6 @@
    -
    -
    @@ -103,8 +95,6 @@
    -
    -
    diff --git a/_sass/base.scss b/_sass/base.scss index b66eb41..e3c6ae0 100644 --- a/_sass/base.scss +++ b/_sass/base.scss @@ -520,7 +520,7 @@ textarea { section { margin-top: 48px; - margin-bottom: 120px; + margin-bottom: 96px; } .companies { -- 2.40.1 From c2dad595b34613e5e08869c9ff4bd954358ac8ca Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 24 Sep 2024 21:39:28 -0400 Subject: [PATCH 6/7] fix background for menu on mobile --- _sass/base.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_sass/base.scss b/_sass/base.scss index e3c6ae0..4af5c92 100644 --- a/_sass/base.scss +++ b/_sass/base.scss @@ -237,7 +237,7 @@ hr { .menu-content { position: absolute; display: none; - background: #282828; + background: var(--background-color); text-align: right; margin-top: 100px; width: 100%; -- 2.40.1 From 1bc67ea96af5885b88ffad2d077ba69b8ebb4cff Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 24 Sep 2024 22:37:46 -0400 Subject: [PATCH 7/7] allow zooming in on mobile --- _includes/head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/head.html b/_includes/head.html index 8b4dc9f..be2ed35 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,7 +1,7 @@ - + -- 2.40.1