diff --git a/scss/_c-header-mobile.scss b/scss/_c-header-mobile.scss new file mode 100644 index 0000000..59e0c8e --- /dev/null +++ b/scss/_c-header-mobile.scss @@ -0,0 +1,16 @@ +/* ========================================================================== + c-header-mobile + ========================================================================== */ + +.c-header-mobile { + display: flex; + padding: 2.4rem; + justify-content: space-between; + @media (min-width: $g-bp-2) { + display: none; + } +} + +.c-header-mobile__logo img { + width: 16rem; +} \ No newline at end of file diff --git a/scss/_c-header.scss b/scss/_c-header.scss deleted file mode 100644 index d57fb58..0000000 --- a/scss/_c-header.scss +++ /dev/null @@ -1,14 +0,0 @@ -/* ========================================================================== - c-header - --- - The general header - ========================================================================== */ - -.c-header { - padding: 2.4rem 0; - > .c-container-horizontal { - align-items: center; - display: flex; - justify-content: space-between; - } -} diff --git a/scss/_c-hero.scss b/scss/_c-hero.scss index 8d3c4ad..4a928fe 100644 --- a/scss/_c-hero.scss +++ b/scss/_c-hero.scss @@ -12,7 +12,7 @@ flex-direction: column-reverse; @media (min-width: $g-bp-2) { - padding: 9.6rem 0; + padding: 0 0 9.6rem; flex-direction: row; justify-content: space-between; align-items: center; diff --git a/scss/_c-logo.scss b/scss/_c-logo.scss index b210188..19a5c36 100644 --- a/scss/_c-logo.scss +++ b/scss/_c-logo.scss @@ -4,13 +4,11 @@ .c-logo { display: flex; - width: 12rem; + width: 15rem; + margin: 0 0 4rem; img { width: 100%; } - @media (min-width: $g-bp-2) { - width: 17.2rem; - } } diff --git a/scss/_c-main-layout.scss b/scss/_c-main-layout.scss new file mode 100644 index 0000000..bdd5c14 --- /dev/null +++ b/scss/_c-main-layout.scss @@ -0,0 +1,39 @@ +/* ========================================================================== + c-main-layout + ========================================================================== */ + +#routify-app { + height: 100%; +} + +.c-main-layout { + display: flex; + height: 100%; + overflow: hidden; +} + +.c-main-layout__sidebar { + display: none; + @media (min-width: $g-bp-2) { + display: block; + } +} + +.c-main-layout__sidebar { + height: 100%; + min-width: 32rem; + max-width: 32rem; + padding: 4.8rem 2.4rem; + overflow: scroll; + flex: 0 0 32rem; + border-right: 0.1rem solid $g-gray-100; +} + +.c-main-layout__content { + flex: 1 1 auto; + padding: 2.4rem 4.8rem; + overflow: scroll; + .c-container-horizontal { + margin: 0 auto; + } +} \ No newline at end of file diff --git a/scss/_c-navigation-mobile.scss b/scss/_c-navigation-mobile.scss index 6f7aa56..1ea876e 100644 --- a/scss/_c-navigation-mobile.scss +++ b/scss/_c-navigation-mobile.scss @@ -43,6 +43,7 @@ color: #1D2C48; display: flex; padding: 1.6rem; + align-items: center; justify-content: space-between; svg { opacity: 0.5; diff --git a/scss/_c-navigation.scss b/scss/_c-navigation.scss index e2c7cfb..3439dbd 100644 --- a/scss/_c-navigation.scss +++ b/scss/_c-navigation.scss @@ -2,56 +2,6 @@ c-navigation ========================================================================== */ -.c-navigation ul { - display: flex; - align-items: center; -} - -.c-navigation ul li { - list-style: none; -} - -.c-navigation { - .o-svg-icon { - path, circle { - opacity: 0.5; - } - } - li { - margin-right: 0.8rem; - } - li:nth-last-child(4) { - margin-right: 2.4rem; - } - li:nth-last-child(2), - li:nth-last-child(3) { - margin-right: 0.2rem; - } - a { - display: block; - text-decoration: none; - color: #1D2C48; - padding: 1rem 1.2rem; - border-radius: .8rem; - &::first-letter { text-transform: capitalize } - &:hover, - &:focus { - color: $g-pink-700; - background: #FFF6FF; - .o-svg-icon { - path, circle { - opacity: 1; - } - } - } - } -} - -.c-navigation__item--selected a { - background-color: #FFE3FF; - color: $g-pink-700; -} - @media (max-width: $g-bp-2) { diff --git a/scss/_c-sidebar-nav.scss b/scss/_c-sidebar-nav.scss index 8e6e96e..0d8a0ec 100644 --- a/scss/_c-sidebar-nav.scss +++ b/scss/_c-sidebar-nav.scss @@ -2,12 +2,13 @@ c-sidebar-nav ========================================================================== */ +.c-sidebar-nav .c-sidebar-nav { + margin-left: 2rem; +} + .c-sidebar-nav li { list-style: none; - margin: 0 0 0.6rem; - &:last-child { - margin: 0; - } + } .c-sidebar-layout__side nav { @@ -18,11 +19,12 @@ } .c-sidebar-nav { - + border-left: 0.2rem solid transparent; a { text-decoration: none; display: block; - padding: 1rem 1.6rem; + padding: 0.6rem 1.2rem; + margin: 0 0 0.7rem; &:link, &:visited { color: #1D2C48; @@ -36,23 +38,27 @@ } .c-sidebar-nav__item a { - border-radius: .8rem; &:hover, &:focus { color: $g-pink-700; - background: #FFF6FF; } &::first-letter { text-transform: capitalize } } .c-sidebar-nav .c-sidebar-nav__item--selected > a { - background: #FFE3FF; + border-left: 0.2rem solid $g-pink-700; &:link, &:visited { color: $g-pink-700; } } +.c-sidebar-nav__item--icon a { + display: flex; + .o-svg-icon { + margin-right: 1.4rem; + } +} /* ========================================================================== c-sidebar-nav-child @@ -88,7 +94,6 @@ } .c-sidebar-nav-child__item a { - border-radius: .8rem; &:hover, &:focus { color: $g-pink-700; @@ -101,3 +106,22 @@ color: $g-pink-700; } + + +.c-sidebar-nav { + .o-svg-icon { + path, circle { + opacity: 0.5; + } + } + a { + &:hover, + &:focus { + .o-svg-icon { + path, circle { + opacity: 1; + } + } + } + } +} diff --git a/scss/_e-base.scss b/scss/_e-base.scss index 4ca14f7..e32bd0d 100644 --- a/scss/_e-base.scss +++ b/scss/_e-base.scss @@ -22,7 +22,6 @@ html { } body { - border-top: 0.4rem solid #E938C2; background: #FFF; color: $g-text-color; font-family: $g-text-font-family; diff --git a/scss/global.scss b/scss/global.scss index 0297bcc..a1bb173 100644 --- a/scss/global.scss +++ b/scss/global.scss @@ -16,33 +16,33 @@ @import "_o-svg-icon"; // Components -@import "_c-button"; -@import "_c-button-toolbar"; @import "_c-blogpost"; +@import "_c-blogpost-author"; @import "_c-blogpost-layout"; @import "_c-blogpost-list"; -@import "_c-blogpost-author"; +@import "_c-button"; +@import "_c-button-toolbar"; @import "_c-container-horizontal"; @import "_c-container-vertical"; @import "_c-content"; -@import "_c-contributors"; @import "_c-contributor"; -@import "_c-footer"; +@import "_c-contributors"; @import "_c-file-tree"; +@import "_c-footer"; @import "_c-function-doc"; -@import "_c-header"; -@import "_c-hero"; +@import "_c-header-mobile"; @import "_c-help-request"; +@import "_c-hero"; @import "_c-horizontal-list"; @import "_c-logo"; +@import "_c-main-layout"; @import "_c-navigation"; @import "_c-navigation-mobile"; @import "_c-navigation-mobile-holder"; @import "_c-navigation-toggle"; @import "_c-note"; -@import "_c-sidebar-layout"; -@import "_c-sidebar-nav"; @import "_c-pagination"; +@import "_c-sidebar-nav"; @import "_c-table"; @import "_c-tabs"; @import "_c-tabs-pages"; @@ -62,3 +62,5 @@ @import "c-styleguide-icon-list"; // might want to separate these styleguide components from the rest @import "c-styleguide-icon"; // might want to separate these styleguide components from the rest @import "c-styleguide-component"; // might want to separate these styleguide components from the rest + + diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte index d759b56..ebab52c 100644 --- a/src/components/Footer.svelte +++ b/src/components/Footer.svelte @@ -1,5 +1,3 @@ diff --git a/src/components/Header.svelte b/src/components/Header.svelte deleted file mode 100644 index 4630b80..0000000 --- a/src/components/Header.svelte +++ /dev/null @@ -1,51 +0,0 @@ - - -
-
- - - - - - - - - - - - -
-
- -
- -
diff --git a/src/components/Sidebar.svelte b/src/components/Sidebar.svelte new file mode 100644 index 0000000..479420b --- /dev/null +++ b/src/components/Sidebar.svelte @@ -0,0 +1,11 @@ + + + + + diff --git a/src/components/nav/LeftNavLayout.svelte b/src/components/nav/LeftNavLayout.svelte index 13fbb6b..8969727 100644 --- a/src/components/nav/LeftNavLayout.svelte +++ b/src/components/nav/LeftNavLayout.svelte @@ -1,70 +1,6 @@ - - -
-
- -
-
- - -
-
+ + diff --git a/src/components/nav/NavItems.svelte b/src/components/nav/NavItems.svelte index f5557bf..31c773c 100644 --- a/src/components/nav/NavItems.svelte +++ b/src/components/nav/NavItems.svelte @@ -1,19 +1,70 @@ -
    - {#each $layout.children as {path, title, meta}} -
  • - {#if meta.icon} - - - {title} - - {:else} - {title} - {/if} -
  • + + +
      + {#each node.children as node} +
    • + + {node.title} + + {#if node.children.length} + + {/if} +
    • {/each}
    + + + + + diff --git a/src/components/nav/NavItemsMobile.svelte b/src/components/nav/NavItemsMobile.svelte index 2625576..1648ade 100644 --- a/src/components/nav/NavItemsMobile.svelte +++ b/src/components/nav/NavItemsMobile.svelte @@ -13,7 +13,6 @@
    -
    diff --git a/src/pages/guide/introduction/getting-started.svelte b/src/pages/guide/introduction/getting-started.svelte index 62c8b99..fd3bdbb 100644 --- a/src/pages/guide/introduction/getting-started.svelte +++ b/src/pages/guide/introduction/getting-started.svelte @@ -8,9 +8,9 @@ -
    -
    -

    Getting started

    +
    +

    Getting started

    +

    The easiest way to try Routify is to visit our -

    +

    Installation