From 35a2dfc1779235daef3ee93f6d90653bf4a52fa0 Mon Sep 17 00:00:00 2001 From: Stefanie Fluin Date: Mon, 17 Apr 2017 14:10:59 -0700 Subject: [PATCH] fix(aio): resource nav --- .../resource/resource-list.component.html | 14 +++--- aio/src/styles/2-modules/_resources.scss | 43 ++++++------------- 2 files changed, 19 insertions(+), 38 deletions(-) diff --git a/aio/src/app/embedded/resource/resource-list.component.html b/aio/src/app/embedded/resource/resource-list.component.html index 0c9faa405c..7fbca8425c 100644 --- a/aio/src/app/embedded/resource/resource-list.component.html +++ b/aio/src/app/embedded/resource/resource-list.component.html @@ -1,16 +1,16 @@ -
-
+
+
-

{{category.title}}

+

{{category.title}}

-

{{subCategory.title}}

+

{{subCategory.title}}

@@ -26,9 +26,9 @@
-
+ -
+
{{category.title}} @@ -37,6 +37,6 @@
-
+
diff --git a/aio/src/styles/2-modules/_resources.scss b/aio/src/styles/2-modules/_resources.scss index 2ea2e2bd6e..ce29365236 100644 --- a/aio/src/styles/2-modules/_resources.scss +++ b/aio/src/styles/2-modules/_resources.scss @@ -1,20 +1,13 @@ -.text-headline { - margin: 0px 0px ($unit * 2) 0px; - font-size: 24px; - font-weight: 400; - line-height: 32px; +.showcase { + width: 80%; } -.grid-fixed { - margin: 0 auto; - *zoom: 1; - width: 960px; +.c-resource-nav { + width: 20%; } -.grid-fixed .c3, .grid-fixed .c8, { - display: inline; - margin-left: 10px; - margin-right: 10px; +.resources-container { + position: relative; } .grid-fixed:after, .grid-fixed:before { @@ -28,12 +21,6 @@ width: 0; height: 0; } -.grid-fixed .c3 { - width: 220px; -} -.grid-fixed .c8 { - width: 620px; -} @media handheld and (max-width: 480px), screen and (max-width: 480px), screen and (max-width: 900px) { .grid-fixed { @@ -99,7 +86,7 @@ } } -.resources { +aio-resource-list { .shadow-1 { transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1); @@ -107,18 +94,10 @@ } .showcase { - margin-bottom: $unit * 6; + margin-bottom: 8px * 6; border-radius: 4px; } - .h-affix { - position: fixed; - } - - .affix-top { - top: 150px; - } - .c-resource { h4 { margin: 0; @@ -131,8 +110,10 @@ } .c-resource-nav { - margin-top: 48px; - width: $unit * 20; + position: fixed; + top: 142px; + right: 32px; + width: 8px * 20; z-index: 1; background-color: #fff; border-radius: 2px;