diff --git a/app/sitemap/sitemap.jade b/app/sitemap/sitemap.jade index 4be8aace8..c54c219ce 100644 --- a/app/sitemap/sitemap.jade +++ b/app/sitemap/sitemap.jade @@ -4,6 +4,7 @@ .sitemap-wrapper section.sitemap-nav h2.sitemap-header Compete + ul li a(href="/challenges/design/active") Design Challenges @@ -17,6 +18,7 @@ section.sitemap-nav.hide-small h2.sitemap-header Learn + ul li a(href="/community/design") Design @@ -29,6 +31,7 @@ section.sitemap-nav h2.sitemap-header Community + ul li a(href="/community") Home @@ -47,12 +50,13 @@ section.sitemap-nav.hide-small h2.sitemap-header My Account + ul li - a(href="/my-dashboard") Dashboard + a(ui-sref="dashboard") Dashboard li a(href="/members/") My Profile li - a(href="/settings/profile") Settings + a(ui-sref="settings.profile") Settings diff --git a/app/sitemap/sitemap.routes.js b/app/sitemap/sitemap.routes.js index a2c913f66..03c7b3320 100644 --- a/app/sitemap/sitemap.routes.js +++ b/app/sitemap/sitemap.routes.js @@ -9,6 +9,7 @@ function routes($stateProvider, $locationProvider) { $locationProvider.html5Mode(true); + var states = { 'sitemap': { parent: 'root', diff --git a/assets/css/sitemap/sitemap.scss b/assets/css/sitemap/sitemap.scss index ebfeef34e..dcc6f461e 100644 --- a/assets/css/sitemap/sitemap.scss +++ b/assets/css/sitemap/sitemap.scss @@ -1,20 +1,20 @@ - // Sitemap styles +@import 'tc-includes'; + .sitemap-container { margin: 10px; - background: #fff; + background: $white; padding: 34px 26px; font-family: 'Sofia Pro'; - @media only screen and (min-width: 768px) { margin: 0; padding: 0; - background: #F6F6F6; - + background: $gray-lighter; + .sitemap-wrapper { margin: 58px 69px; - background: #fff; + background: $white; padding: 41px 58px; - + &:after { display: block; content: ''; @@ -22,76 +22,71 @@ } } } - + .page-header { font-size: 22px; font-weight: bold; text-align: center; - @media only screen and (min-width: 768px) { text-align: left; font-size: 32px; padding: 47px 38px 33px 129px; - background: #fff; + background: $white; border-bottom: 2px solid #EBEBEB; } } - + .sitemap-header { font-weight: bold; font-size: 14px; - @media only screen and (min-width: 768px) { font-size: 15px; } } - + .sitemap-nav { margin-top: 32px; font-size: 18px; text-transform: uppercase; - @media only screen and (min-width: 768px) { width: 25%; float: left; margin: 0; box-sizing: border-box; padding: 31px 5px 31px 5px; - - + &:nth-child(4n+1) { clear: both; } } - + a { display: block; margin-top: 16px; color: #A3A3B4; font-size: 15px; } - + + .sitemap-nav { margin-top: 42px; - @media only screen and (min-width: 768px) { margin: 0; } } } - + .sitemap-subnav { margin-left: 16px; - + a { font-size: 13px; text-transform: none; } } - + @media only screen and (max-width: 767px) { - .hide-small { + .hide-small { display: none; } - } -} \ No newline at end of file + } +}