diff --git a/app/components/api-index-filter.js b/app/components/api-index-filter.js index 9ca9e1cb3..17ae15e4f 100644 --- a/app/components/api-index-filter.js +++ b/app/components/api-index-filter.js @@ -1,13 +1,10 @@ /* eslint-disable ember/no-computed-properties-in-native-classes */ -import { classNames } from '@ember-decorators/component'; import { computed } from '@ember/object'; import Component from '@ember/component'; import sortBy from 'lodash.sortby'; const filterDataComputedParams = 'filterData.{showInherited,showProtected,showPrivate,showDeprecated}'; - -@classNames('api-index-filter') export default class ApiIndexFilter extends Component { @computed('model.methods.[]', filterDataComputedParams) get filteredMethods() { diff --git a/app/components/import-example.hbs b/app/components/import-example.hbs index 333464411..a5e633ddd 100644 --- a/app/components/import-example.hbs +++ b/app/components/import-example.hbs @@ -1,4 +1,4 @@ -
+
{{#if (is-clipboard-supported)}}
diff --git a/app/components/table-of-contents.hbs b/app/components/table-of-contents.hbs index 4cb4fc362..739fff0ff 100644 --- a/app/components/table-of-contents.hbs +++ b/app/components/table-of-contents.hbs @@ -1,12 +1,12 @@ -
    -
  1. +
      +
    1. Packages -
        +
          {{#each @moduleIDs as |moduleID|}} {{#if (not-eq moduleID '@ember/object/computed')}} -
        1. - {{moduleID}} +
        2. + {{moduleID}}
          3. {{/if}} @@ -17,9 +17,9 @@ {{#if @isShowingNamespaces}}
        3. Namespaces -
            +
              {{#each @namespaceIDs as |namespaceID|}} -
            1. +
            2. {{namespaceID}}
              3. {{/each}} @@ -27,11 +27,11 @@ {{/if}} -
            3. +
            4. Classes -
                +
                  {{#each @classesIDs as |classID|}} -
                1. +
                2. {{classID}}
                  3. {{/each}} diff --git a/app/styles/.DS_Store b/app/styles/.DS_Store new file mode 100644 index 000000000..2da730375 Binary files /dev/null and b/app/styles/.DS_Store differ diff --git a/app/styles/_class.scss b/app/styles/_class.scss index fd7b89bb5..cc983f34b 100644 --- a/app/styles/_class.scss +++ b/app/styles/_class.scss @@ -1,6 +1,6 @@ article.chapter { h1.module-name { - display: inline; + margin-top: 0; } .heading__link__edit { @@ -10,7 +10,7 @@ article.chapter { display: block; position: relative; - @media (min-width: $mobile-portrait-screen + 1){ + @media (min-width: ($mobile-portrait-screen + 1)){ &::before, &::after { transition: 0.2s opacity, 0.2s transform; } @@ -85,14 +85,10 @@ article.chapter { } .attributes { - margin: 10px 0; .attribute-label { display: inline-block; width: 120px; - color: $black; - font-weight: bold; - text-transform: uppercase; @media (max-width: $mobile-portrait-screen){ display: block; diff --git a/app/styles/app.scss b/app/styles/app.scss index aada7c40b..e45fdfd85 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -1,47 +1,7 @@ @charset "utf-8"; - @import "normalize"; @import "bourbon"; @import "./base/base"; -@import "neat"; @import "./components/all"; @import "class"; - -body { - margin: 0; - width: 100%; -} - -@include media($large-screen-up) { - .header { - top: 0; - width: 100%; - } - - main.container { - width: 100%; - min-height: calc(100vh - 18rem); - } - - main.container .content { - position: relative; - margin-right: 0; - margin-bottom: 0; - overflow:auto; - padding: $base-spacing; - min-width: auto; - &::after { - clear: both; - display: table; - } - - } - - main.container .content .chapter { - width: 800px; - max-width: 100%; - } -} - - @import "ember-power-select"; diff --git a/app/styles/base/.DS_Store b/app/styles/base/.DS_Store new file mode 100644 index 000000000..5008ddfcf Binary files /dev/null and b/app/styles/base/.DS_Store differ diff --git a/app/styles/base/_base.scss b/app/styles/base/_base.scss index 96b2858e5..67ed88748 100644 --- a/app/styles/base/_base.scss +++ b/app/styles/base/_base.scss @@ -1,11 +1,5 @@ -// Bitters 1.0.0 -// http://bitters.bourbon.io -// Copyright 2013-2015 thoughtbot, inc. -// MIT License - @import "variables"; @import "grid-settings"; -@import "buttons"; @import "forms"; @import "lists"; @import "tables"; diff --git a/app/styles/base/_buttons.scss b/app/styles/base/_buttons.scss deleted file mode 100644 index 63d90b9d7..000000000 --- a/app/styles/base/_buttons.scss +++ /dev/null @@ -1,32 +0,0 @@ -#{$all-buttons}, -button { - appearance: none;; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - background-color: $action-color; - border-radius: $base-border-radius; - border: none; - color: #fff; - cursor: pointer; - display: inline-block; - font-family: $base-font-family; - font-size: $base-font-size; - font-weight: 600; - line-height: 1; - padding: 0.75em 1em; - text-decoration: none; - user-select: none; - vertical-align: middle; - white-space: nowrap; - - &:hover, - &:focus { - background-color: darken($action-color, 15%); - color: #fff; - } - - &:disabled { - cursor: not-allowed; - opacity: 0.5; - } -} diff --git a/app/styles/base/_forms.scss b/app/styles/base/_forms.scss index 544d2bea7..44e4fd6c1 100644 --- a/app/styles/base/_forms.scss +++ b/app/styles/base/_forms.scss @@ -11,8 +11,6 @@ input, label, select { display: block; - font-family: $base-font-family; - font-size: $base-font-size; } .ember-power-select-trigger { @@ -21,8 +19,6 @@ select { max-width: 100%; width: auto; display: block; - font-family: $base-font-family; - font-size: $base-font-size; background-color: $base-background-color; transition: border-color; appearance: none; @@ -48,8 +44,6 @@ textarea { border-radius: $base-border-radius; box-shadow: $form-box-shadow; box-sizing: border-box; - font-family: $base-font-family; - font-size: $base-font-size; margin-bottom: math.div($base-spacing, 2); padding: math.div($base-spacing, 3); transition: border-color; diff --git a/app/styles/base/_grid-settings.scss b/app/styles/base/_grid-settings.scss index c7cb208f1..cff6ff387 100644 --- a/app/styles/base/_grid-settings.scss +++ b/app/styles/base/_grid-settings.scss @@ -1,13 +1,6 @@ -@import "neat-helpers"; // or "../neat/neat-helpers" when not in Rails -// Neat Overrides -// $column: 90px; -// $gutter: 30px; -// $grid-columns: 12; -// $max-width: 1088px; -// Neat Breakpoints $mobile-portrait-screen: 30em; // 480px $medium-screen: 40em; // 640px $large-screen: 54em; // 864px $medium-screen-up: new-breakpoint(min-width $medium-screen 4); $medium-large-screen-up: new-breakpoint(min-width $medium-screen 8); -$large-screen-up: new-breakpoint(min-width $large-screen 8); \ No newline at end of file +$large-screen-up: new-breakpoint(min-width $large-screen 8); diff --git a/app/styles/base/_lists.scss b/app/styles/base/_lists.scss index 3154037cb..42b4925df 100644 --- a/app/styles/base/_lists.scss +++ b/app/styles/base/_lists.scss @@ -1,11 +1,9 @@ ul, ol { - list-style-type: none; margin: 0; padding: 0; &%default-ul { - list-style-type: disc; margin-bottom: $small-spacing; padding-left: $base-spacing; @@ -15,11 +13,9 @@ ol { } &%default-ol { - list-style-type: none; margin-bottom: $base-spacing; > li { - counter-increment: customlistcounter; clear: both; padding: $small-spacing 0 $small-spacing 2em; position: relative; @@ -28,33 +24,17 @@ ol { &::before { @include position(absolute, ($small-spacing + 0.5em) null null 0); @include size(2em); - content: counter(customlistcounter) " "; - border: 2px solid $base-border-color; + border: 2px solid #74B0CE; border-radius: 50%; - color: $light-brown; float: left; - font-size: $small-font-size; line-height: calc(2em - 4px); overflow: hidden; text-align: center; } } - - &:first-child { - counter-reset: customlistcounter; - } } } -dl { - margin-bottom: $small-spacing; - - dt { - font-weight: bold; - margin-top: $small-spacing; - } - - dd { - margin: 0; - } +dd { + margin: 0; } diff --git a/app/styles/base/_typography.scss b/app/styles/base/_typography.scss index c6cd3375d..9009ffe85 100644 --- a/app/styles/base/_typography.scss +++ b/app/styles/base/_typography.scss @@ -1,54 +1,18 @@ @import "mixins/hidpi"; @import "mixins/text-adjust"; -body { - font-feature-settings: "kern", "liga", "pnum"; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - color: $base-font-color; - font-family: $base-font-family; - font-size: $base-font-size; - line-height: $base-line-height; -} - h1, h2, h3, h4, h5, h6 { - font-family: $heading-font-family; - font-size: $base-font-size; - line-height: $heading-line-height; - margin: 0 0 $small-spacing; - font-weight: bold; - code { text-transform: none; } } -@each $i in 0, 1, 2, 3, 4 { - h#{$i + 1} { - font-size: modular-scale(-$i, 2em, 1.2); - } -} - -h1 { - color: $ember-orange; -} - -h2 { - color: $brown; -} - -p { - margin: 1.5em 0 $small-spacing; - line-height: 1.5em; -} - a { - color: $action-color; text-decoration: none; transition: color 0.1s linear; @@ -64,7 +28,7 @@ a { } hr { - border-bottom: $base-border; + border-bottom: 1px solid #e6e4e3; border-left: none; border-right: none; border-top: none; diff --git a/app/styles/base/_variables.scss b/app/styles/base/_variables.scss index dac471fc9..067819852 100644 --- a/app/styles/base/_variables.scss +++ b/app/styles/base/_variables.scss @@ -1,15 +1,7 @@ @use "sass:math"; // Typography -$base-font-family: 'Source Sans Pro', sans-serif; -$heading-font-family: $base-font-family; $monospace-font-family: Menlo, "DejaVu Sans Mono", "Bitstream Vera Sans Mono", Courier, monospace; -$footer-font-family: proxima-nova, sans-serif; - -// Font Sizes -$base-font-size: 1rem; -$small-font-size: 0.75rem; -$large-font-size: 1.5rem; // Line height $base-line-height: 1.5; @@ -24,8 +16,6 @@ $top-spacing: $base-spacing * 3.333; // 80px // Colors $ember-orange: #dd6a58; -$light-brown: #b67d47; -$brown: #865931; $medium-gray: #999; $dark-gray: #444545; $tan: #fffdf9; @@ -65,7 +55,6 @@ $highlight-colors: ( // Font Colors $base-font-color: $near-black; $dark-font-color: $dark-gray; -$light-font-color: $light-brown; $action-color: $ember-orange; // Border diff --git a/app/styles/colors.scss b/app/styles/colors.scss index b73e6810b..d3a5a887d 100644 --- a/app/styles/colors.scss +++ b/app/styles/colors.scss @@ -1,2 +1,2 @@ -$ember-orange: #dd6a58; +$ember-orange: #e04e39; diff --git a/app/styles/components/_all.scss b/app/styles/components/_all.scss index 03d9a74ab..96ca67150 100644 --- a/app/styles/components/_all.scss +++ b/app/styles/components/_all.scss @@ -1,4 +1,3 @@ -@import "header"; @import "layout"; @import "sidebar"; @import "article"; diff --git a/app/styles/components/_article.scss b/app/styles/components/_article.scss index 905093a54..9c710c092 100644 --- a/app/styles/components/_article.scss +++ b/app/styles/components/_article.scss @@ -2,15 +2,13 @@ article { padding: $large-spacing $small-spacing; @media (min-width: $medium-screen){ - padding: $small-spacing; + padding: 0 $large-spacing; } .edit-page { @include size(24px, 18px); - color: $brown; display: inline-block; float: right; - font-size: 1rem; margin: 0.5em 0 0 0; opacity: 0.4; overflow: hidden; @@ -43,47 +41,6 @@ article { @extend %default-ol; } - footer { - @include clearfix; - border-top: $base-border; - margin-top: 5em; - padding: $base-spacing 0; - - a { - &::before, - &::after { - display: inline-block; - font-weight: 700; - margin: 0 0.5em; - transition: transform $duration; - } - } - - .previous-guide { - float: left; - - &::before { - content: "\2039"; - } - - &:hover::before { - transform: translateX(-0.5em); - } - } - - .next-guide { - float: right; - - &::after { - content: "\203A"; - } - - &:hover::after { - transform: translateX(0.5em); - } - } - } - table { td,th { word-break: break-word; diff --git a/app/styles/components/_back-to-top.scss b/app/styles/components/_back-to-top.scss index b78de801c..1c167b0c9 100644 --- a/app/styles/components/_back-to-top.scss +++ b/app/styles/components/_back-to-top.scss @@ -5,12 +5,12 @@ margin-left: 1em; text-align: center; - @include media(max-width 89em) { + @media (max-width: 89em) { @include size(1.5em); overflow: hidden; } - @include media(max-width 78em) { + @media (max-width: 78em) { height: 0; } } diff --git a/app/styles/components/_class-field-desc.scss b/app/styles/components/_class-field-desc.scss index f48da7dae..f78b4f0b8 100644 --- a/app/styles/components/_class-field-desc.scss +++ b/app/styles/components/_class-field-desc.scss @@ -11,10 +11,8 @@ } .args { - color: $light-brown; font-style: italic; font-weight: normal; - font-size: $base-font-size; } .class-field-description--link .return-type, @@ -23,7 +21,6 @@ color: $medium-gray; font-style: italic; font-weight: normal; - font-size: $base-font-size; margin-right: 5px; } @@ -31,15 +28,10 @@ color: white; background-color: gray; padding: 2px 7px; - font-size: 1.6em; font-weight: 600; border-radius: 3px; } -h3 .access{ - font-size: smaller; -} - .parameters { dl { display: inline-block; @@ -66,12 +58,10 @@ h3 .access{ p.github-link { margin: -12px 0 0; - font-size: $small-font-size; } p.field-since { margin: 0; - font-size: $small-font-size; } .class-field-description--link { diff --git a/app/styles/components/_header.scss b/app/styles/components/_header.scss deleted file mode 100644 index 42551d161..000000000 --- a/app/styles/components/_header.scss +++ /dev/null @@ -1,215 +0,0 @@ -$white: white; - -.header-nav.container { - width: 980px; - padding: 0 1rem; - list-style-type: none; - margin: auto; -} - -.responsive .header-nav.container { - max-width: 980px; - width: auto; -} - -.not-responsive .header { - min-width: 980px; //do we need this -} - -.header a:hover { - border-bottom: none; -} - -// The styles bellow were ported from the compiled sass from -// https://guides.emberjs.com/v2.3.0/ - -// Ideally we will install bourbon / bittters / neat -// and reuse the same _base_ stylesheets as the guides. -// Since that will affect many default styles hence -// the overall visual aesthetics of the site, this is an intentional -// intermediate step to quickly port the responsive header. - -.header { - background-color: rgb(228, 112, 81); - background: #dd6a58 url("/assets/images/header.svg") top center no-repeat; - background-size: cover; - color: #fff; - padding: 1rem 0; - font-family: 'Source Sans Pro'; -} - -.es-header { - font-family: "Roboto", "Helvetica Neue", "Helvetica", sans-serif; - font-size: 18px; - font-weight: 400; -} - -.header .container { - display: flex; - display: -webkit-flex; -} - -@media screen and (max-width: $large-screen) { - .responsive.header .container { - display: block; - } -} - -.header .header-nav { - align-items: center; - display: flex; - justify-content: space-between; - height: 2.8rem; -} -@media screen and (max-width: $large-screen) { - .responsive.header .header-nav { - height: auto; - } -} - -.header a { - color: #fff; - display: inline; - font-size: 1.1em; - text-align: center; - width: 100%; -} - -@media screen and (max-width: $large-screen) { - .responsive.header a { - line-height: 24px; //do we need this - } -} - -// Desktop -.header-nav li { - -webkit-box-flex: 1; - -moz-box-flex: 1; - box-flex: 1; - -webkit-flex: 1 0 0; - -moz-flex: 1 0 0; - -ms-flex: 1 0 0; - flex: 1 0 0; - display: inline-block; - margin-top: 10px; - margin-bottom: 10px; - text-align: center; -} - -@media screen and (max-width: $large-screen) { - .responsive .header-nav li { - display: inherit; - } -} -@media screen and (max-width: $large-screen) { - .responsive .header-nav li:not(.header-logo):not(.header-search) { - width: 32%; - display: inline-block; - } -} - - -.header-nav li:not(.header-logo):not(.header-search) { - width: auto; -} - -.header-nav .header-logo { - -webkit-box-flex: 1.5; - -moz-box-flex: 1.5; - box-flex: 1.5; - -webkit-flex: 1.5 0 0; - -moz-flex: 1.5 0 0; - -ms-flex: 1.5 0 0; - flex: 1.5 0 0; -} - -@media screen and (min-width: $large-screen) { -} - -.header-nav .header-search { - -webkit-box-flex: 2; - -moz-box-flex: 2; - box-flex: 2; - -webkit-flex: 2 0 0; - -moz-flex: 2 0 0; - -ms-flex: 2 0 0; - flex: 2 0 0; -} - -@media screen and (max-width: $large-screen) { - .responsive .header-nav .header-search { - display: block; - } -} - -.header-logo a { - padding: 0.5rem; - margin-right: 0; - height: 40px; - width: 100px; - background: url("/assets/images/ember-logo.svg") no-repeat; - display: block; -} - -@media screen and (max-width: $large-screen) { - .responsive .header-logo a { - margin: 0 auto; - } -} - - -.header-search { - margin-left: 4%; - - .algolia-autocomplete { - display: block !important; // beats `inline-block` added by DocSearch script - } - .st-search-input { - width: 100%; - height: 35px; - margin-bottom: 0; - padding-left: 2.5em; - border: none; - border-radius: 35px; - outline: none; - appearance: none; - background: url("/assets/images/search-icon.svg") rgba(white, 0.1) 10px 10px no-repeat; - box-shadow: none; - font-size: 0.9rem; - line-height: 35px; - color: $white; - - // @include placeholder { - // color: $white; - // } - } - - .st-search-input::-webkit-input-placeholder { - color: white; - } - .st-search-input:-moz-placeholder { - color: white; - } - .st-search-input::-moz-placeholder { - color: white; - } - .st-search-input:-ms-input-placeholder { - color: white; - } -} -@media screen and (max-width: $large-screen) { - .responsive .header-search { - margin-left: 0; - } -} - -.visually-hidden { - border: 0 !important; - clip: rect(0 0 0 0) !important; - height: 1px !important; - margin: -1px !important; - overflow: hidden !important; - padding: 0 !important; - position: absolute !important; - width: 1px !important; -} diff --git a/app/styles/components/_highlight.scss b/app/styles/components/_highlight.scss index 562b08382..b9da5dcac 100644 --- a/app/styles/components/_highlight.scss +++ b/app/styles/components/_highlight.scss @@ -5,7 +5,6 @@ font-family: $monospace-font-family; font-size: 0.8em; line-height: 1.5em; - margin: $small-spacing 0 $large-spacing; overflow: hidden; position: relative; font-variant-ligatures: none; @@ -165,7 +164,7 @@ } code { - background-color: $base-border-color; + background-color: #DCE0E6; border-radius: $base-border-radius; font-family: $monospace-font-family; font-size: 0.9em; diff --git a/app/styles/components/_layout.scss b/app/styles/components/_layout.scss index dbc39f28c..e0217b5ed 100644 --- a/app/styles/components/_layout.scss +++ b/app/styles/components/_layout.scss @@ -1,20 +1,9 @@ -body { - background-color: $base-background-color; - margin: 0; -} - main { - @include media($large-screen) { + @media screen and (min-width: $large-screen) { display: flex; } } -.container { - @include outer-container; - padding: 0 1em; - &::after { - clear: both; - content: ''; - display: table; - } -} +body { + background: var(--color-gray-100); +} \ No newline at end of file diff --git a/app/styles/components/_sidebar.scss b/app/styles/components/_sidebar.scss index 501dad3a5..99f5a24ab 100644 --- a/app/styles/components/_sidebar.scss +++ b/app/styles/components/_sidebar.scss @@ -1,31 +1,9 @@ .sidebar { - background-color: $sidebar-background-color; - border-bottom: $base-border; - position: relative; - z-index: 1; - padding: $small-spacing 0; - @include media($large-screen-up) { - // fixed sidebar, full height - @include span-columns(3.5); + @media (min-width: $large-screen-up) { margin-right: 0; - width: 19em; border-bottom: 0; - border-right: $base-border; padding: $small-spacing $base-spacing $base-spacing * 1.5; - - &::before { - @include position(absolute, 0 0 0 -100vw); - content: ""; - display: block; - background-color: $sidebar-background-color; - z-index: -1; - } - - &::after { - clear: both; - display: block; - } } @media (min-width: 1200px) { @@ -37,9 +15,18 @@ } } +.link-underline-override { + text-decoration: none!important; + background: none!important; + + a { + text-decoration: none!important; + background: none!important; + } +} + label[for="toc-toggle"] { cursor: pointer; - font-size: 1.25em; position: relative; &:hover { @@ -54,7 +41,6 @@ label[for="toc-toggle"] { &:after { content: ''; - border-color: $light-brown rgba(0, 0, 0, 0) rgba(0, 0, 0, 0) rgba(0, 0, 0, 0); border-style: solid; border-width: 5px 4px 0 4px; height: 0; @@ -67,11 +53,10 @@ label[for="toc-toggle"] { } .toc-toggle:checked ~ &:after { - border-color: rgba(0, 0, 0, 0) rgba(0, 0, 0, 0) $light-brown rgba(0, 0, 0, 0); border-width: 0 4px 5px 4px; } - @include media($large-screen) { + @media screen and (min-width: $large-screen) { display: none; } } @@ -84,7 +69,7 @@ label[for="toc-toggle"] { .toc-toggle:checked ~ & { display: block; } - @include media($large-screen) { + @media screen and (min-width: $large-screen) { display: block; // ensure toc-toggle can not cause toc-container to be hidden on large screen @@ -94,60 +79,34 @@ label[for="toc-toggle"] { } } -li.toc-level-0 { - margin-bottom: 0.5em; - - a { - color: $brown; - display: block; - line-height: 1.25; - padding-top: 0.25em; - padding-bottom: 0.25em; - - &:hover { - color: $ember-orange; - } - &.active { - color: $ember-orange; - font-weight: bold; - } - } - - > a { - font-weight: bold; - } -} - ol.toc-level-1 { - border-left: $base-border; - font-size: $base-font-size * 0.9; transition: max-height 0.5s ease; + border-left: 1px solid #74B0CE; &.selected{ max-height: 3000px; } + // override ember-styleguide link color + a { + color: #42474f; + padding-left: 0.5rem; + } + &:not(.selected) { overflow: hidden; max-height: 0; } li { - border-left: 3px solid transparent; + border-left: 5px solid transparent; transition: border-width $duration, margin-right $duration; + padding-top: 0.3em; + padding-bottom: 0.3em; &.selected, &:hover { - border-left-color: $base-border-color; - } - - &:hover { - border-left-width: 6px; - margin-right: -3px; + border-left-color: #74B0CE; } } - - a { - padding-left: $small-spacing; - } } diff --git a/app/styles/components/_tabbed-layout.scss b/app/styles/components/_tabbed-layout.scss index 721a0f594..92d21e8f1 100644 --- a/app/styles/components/_tabbed-layout.scss +++ b/app/styles/components/_tabbed-layout.scss @@ -1,5 +1,4 @@ .tabbed-layout { - margin-top: 1em; border: 1px solid #e0e0e0; border-radius: 4px; overflow: hidden; @@ -14,7 +13,6 @@ } .api-index-filter, section { - padding: 0 1em; @media (max-width: $mobile-portrait-screen){ padding: 0; diff --git a/app/styles/components/_toc.scss b/app/styles/components/_toc.scss index 33b1e9186..0c39a94fb 100644 --- a/app/styles/components/_toc.scss +++ b/app/styles/components/_toc.scss @@ -23,10 +23,9 @@ a.toc-anchor { margin-top: -5px; } -.toc-private-toggle { - font-size: $small-font-size; -} - -.toc-level-0 > a { +.toc-level-0 > a, .toc-spacing { transition: color 0.1s linear; + margin-bottom: 0.5em; + margin-top:0.5em; + display: block; } diff --git a/app/templates/application.hbs b/app/templates/application.hbs index 1f355c5a7..acf018a1d 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -1,9 +1,5 @@ - - - - - -
                  + +
                  {{outlet}}
                  diff --git a/app/templates/components/api-index-filter.hbs b/app/templates/components/api-index-filter.hbs index 5293704e2..36b8a5c66 100644 --- a/app/templates/components/api-index-filter.hbs +++ b/app/templates/components/api-index-filter.hbs @@ -1 +1,3 @@ -{{yield this.filteredData}} +
                  + {{yield this.filteredData}} +
                  diff --git a/app/templates/components/search-input/dropdown-result.hbs b/app/templates/components/search-input/dropdown-result.hbs deleted file mode 100644 index f5a210b2d..000000000 --- a/app/templates/components/search-input/dropdown-result.hbs +++ /dev/null @@ -1,57 +0,0 @@ -
                  -
                  -
                  - {{this._primaryColumn}} -
                  -
                  - {{#if this.result.static}} - -
                  - {{!-- Sometimes hierarchy lvl1 is null, fall-back to lvl0 --}} - {{#if this.result._highlightResult.hierarchy.lvl1}} - {{html-safe this.result._highlightResult.hierarchy.lvl1.value}} - {{else}} - {{html-safe this.result._highlightResult.hierarchy.lvl0.value}} - {{/if}} -
                  -
                  - {{html-safe this.result._highlightResult.hierarchy.lvl2.value}} - {{#if this.result._highlightResult.hierarchy.lvl3}} - - {{html-safe this.result._highlightResult.hierarchy.lvl3.value}} - {{/if}} - {{#if this.result._highlightResult.hierarchy.lvl4}} - - {{html-safe this.result._highlightResult.hierarchy.lvl4.value}} - {{/if}} -
                  -                   - {{else}} - -
                  - {{!-- Sometimes hierarchy lvl1 is null, fall-back to lvl0 --}} - {{#if this.result._highlightResult.hierarchy.lvl1}} - {{html-safe this.result._highlightResult.hierarchy.lvl1.value}} - {{else}} - {{html-safe this.result._highlightResult.hierarchy.lvl0.value}} - {{/if}} -
                  -
                  - {{html-safe this.result._highlightResult.hierarchy.lvl2.value}} - {{#if this.result._highlightResult.hierarchy.lvl3}} - - {{html-safe this.result._highlightResult.hierarchy.lvl3.value}} - {{/if}} - {{#if this.result._highlightResult.hierarchy.lvl4}} - - {{html-safe this.result._highlightResult.hierarchy.lvl4.value}} - {{/if}} -
                  -                   - {{/if}} -
                  -
                  -
                  - -{{yield}} \ No newline at end of file diff --git a/app/templates/components/search-input/dropdown.hbs b/app/templates/components/search-input/dropdown.hbs deleted file mode 100644 index 3f4cfc5eb..000000000 --- a/app/templates/components/search-input/dropdown.hbs +++ /dev/null @@ -1,33 +0,0 @@ - - {{#if this.noResults}} - - No results found - -
                  -
                  -

                  Try searching the deprecations guide.

                  -
                  -
                  - - {{else}} - {{!-- Level 0 hierarchy --}} - {{#each-in this._groupedResults as |lvl0section _lvl0results|}} - {{!-- Dropdown header --}} - - - {{lvl0section}} - - - {{!-- Level 1 hierarchy --}} - {{#each-in _lvl0results as |lvl1section _lvl1results|}} - {{!-- Each result will be shown here --}} - {{#each _lvl1results as |result index|}} - - {{/each}} - - {{/each-in}} - {{/each-in}} - {{/if}} -                   - -{{yield}} diff --git a/app/templates/project-version.hbs b/app/templates/project-version.hbs index 5deeaa9ad..dccd56885 100644 --- a/app/templates/project-version.hbs +++ b/app/templates/project-version.hbs @@ -1,14 +1,14 @@ -