diff --git a/scss/atat.scss b/scss/atat.scss index 01d4e9b6..d62a89b9 100644 --- a/scss/atat.scss +++ b/scss/atat.scss @@ -19,5 +19,9 @@ @import 'components/site_action'; @import 'components/empty_state'; +@import 'sections/main'; +@import 'sections/topbar'; +@import 'sections/sidenav'; +@import 'sections/progress_menu'; @import 'sections/footer'; @import 'sections/login'; diff --git a/scss/elements/_typography.scss b/scss/elements/_typography.scss index 9096af9d..e720402c 100644 --- a/scss/elements/_typography.scss +++ b/scss/elements/_typography.scss @@ -28,14 +28,17 @@ h2 { margin-top: 0; } - a, a:hover { transition: - background $hover-transition-time, - border $hover-transition-time, - box-shadow $hover-transition-time, - color $hover-transition-time, + background 0.2s, + border 0.2s, + box-shadow 0.2s, + color 0.2s; +} + +a:visited { + color: $color-blue; } dt { diff --git a/scss/sections/_progress_menu.scss b/scss/sections/_progress_menu.scss new file mode 100644 index 00000000..3ca7bb72 --- /dev/null +++ b/scss/sections/_progress_menu.scss @@ -0,0 +1,103 @@ +.progress-menu { + display: block; + + ul { + list-style: none; + margin: 0; + padding: 0; + } + + &--three { + .progress-menu__item { + width: 32%; + } + } + + &--four { + .progress-menu__item { + width: 24%; + } + } + + &--five { + .progress-menu__item { + width: 19%; + } + } + + &__item { + display: inline-block; + font-weight: $font-bold; + position: relative; + vertical-align: top; + + a { + display: block; + position: relative; + padding: ($gap * 4) ($gap * 2); + margin: 0 ($gap * 2); + text-decoration: none; + text-align: center; + z-index: 2; + color: $color-black; + } + + a.active { + color: $color-blue; + } + + + + &:first-child:after { + display: none; + } + + &:after { + display: inline-block; + height: 1px; + content: " "; + color: $color-gray-lightest; + text-shadow: none; + background-color: $color-gray-light; + position: absolute; + top: 1.1rem; + width: 100%; + right: 50%; + border-right: 2.2rem solid transparent; + border-left: 2.2rem solid transparent; + background-clip: padding-box; + z-index: 1; + } + + &:before { + content: ""; + display: block; + text-align: center; + width: 2rem; + height: 2rem; + border: 1px solid $color-gray; + border-radius: 100%; + position: absolute; + left: 50%; + margin-left: -1rem; + z-index: 1; + } + + &--active:before { + border: 2px solid $color-blue; + } + + &--complete:before { + content: url('/static/icons/checkmark.svg'); + background-color: $color-blue; + border: 2px solid $color-blue; + font-size: $h6-font-size; + padding: 1px 2px; + } + + &--incomplete:before { + border: 2px solid $color-gray-light; + } + + } +} \ No newline at end of file diff --git a/static/icons/checkmark.svg b/static/icons/checkmark.svg new file mode 100644 index 00000000..798c9989 --- /dev/null +++ b/static/icons/checkmark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/templates/requests/menu.html.to b/templates/requests/menu.html.to new file mode 100644 index 00000000..f7378753 --- /dev/null +++ b/templates/requests/menu.html.to @@ -0,0 +1,13 @@ +
+ +
\ No newline at end of file diff --git a/templates/requests_new.html.to b/templates/requests_new.html.to index 25431889..39a54f39 100644 --- a/templates/requests_new.html.to +++ b/templates/requests_new.html.to @@ -1,14 +1,10 @@ {% extends "base.html.to" %} - -{% block sidenav %} -{% include 'requests/sidebar.html.to' %} -{% end %} - - {% block content %} -
+
+ + {% include 'requests/menu.html.to' %}
diff --git a/templates/styleguide.html.to b/templates/styleguide.html.to index 62231d8e..739c7151 100644 --- a/templates/styleguide.html.to +++ b/templates/styleguide.html.to @@ -26,6 +26,35 @@ {% block content %}
+ + + + + + + +
This is a panel content @@ -91,6 +120,7 @@ {% module Icon('alert') %} 'alert'    {% module Icon('link') %} 'link'    {% module Icon('ok') %} 'ok'    + {% module Icon('checkmark') %} 'checkmark'