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 @@ - + diff --git a/_includes/header.html b/_includes/header.html index 954c37d..6381fa2 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,7 +1,7 @@ {%- assign page_paths = site.header_pages | default: default_paths -%}
-
+
@@ -18,7 +18,7 @@ {%- endif -%} {%- endfor -%}
  • - Free Consultation + Free Consultation
    • -
    -
    - 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..1c459d2 100644 --- a/_layouts/services.html +++ b/_layouts/services.html @@ -4,27 +4,24 @@ {%- include head.html -%} + {%- include header.html -%} +
    - - {%- include header.html -%} -

    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 +
    -
    -
    @@ -43,8 +40,6 @@
    -
    -
    @@ -64,8 +59,6 @@
    -
    -
    @@ -84,8 +77,6 @@
    -
    -
    @@ -101,4 +92,4 @@
    - \ No newline at end of file + diff --git a/_layouts/tools.html b/_layouts/tools.html index 428d1ae..bda91b7 100644 --- a/_layouts/tools.html +++ b/_layouts/tools.html @@ -5,10 +5,9 @@ {%- include head.html -%} + {%- include header.html -%} +
    - - {%- include header.html -%} -
    @@ -23,8 +22,6 @@
    -
    -
    @@ -44,8 +41,6 @@
    -
    -
    @@ -64,8 +59,6 @@
    -
    -
    @@ -84,8 +77,6 @@
    -
    -
    @@ -104,8 +95,6 @@
    -
    -
    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..4af5c92 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,9 @@ footer { } header { - margin-top: 24px; + padding: 24px; margin-bottom: 24px; + border-bottom: 1px solid rgba(255, 255, 255, 0.13); } header p { @@ -142,7 +144,7 @@ hr { * Navbar */ .menu-logo { - height: 60px; + height: 48px; } #home-link:hover { @@ -163,6 +165,16 @@ hr { .header-page-links a:hover { background-color: transparent; color: lightgrey; + text-decoration: underline; +} + +.left-menu { + display: flex; + align-items: center; +} + +.left-menu img { + display: flex; } .right-menu { @@ -225,7 +237,7 @@ hr { .menu-content { position: absolute; display: none; - background: #282828; + background: var(--background-color); text-align: right; margin-top: 100px; width: 100%; @@ -283,22 +295,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,17 +369,13 @@ 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 { - margin-top: 12px; - margin-bottom: 12px; padding-left: 0px; list-style-type: none; text-align: right; @@ -499,12 +520,7 @@ textarea { section { margin-top: 48px; - margin-bottom: 48px; -} - -.extra-spacing { - margin-top: 70px; - margin-bottom: 70px; + margin-bottom: 96px; } .companies { @@ -537,7 +553,7 @@ section { } .text-well { - max-width: 600px; + max-width: 100%; padding-right: 35px; } @@ -898,7 +914,7 @@ pre { .carousel-item { display: flex; justify-content: center; - align-items: center; + align-items: start; max-width: 400px; height: 80px; width: 100%;