Skip to content

Commit b03d4c1

Browse files
psbankaRobbieTheWagner
authored andcommitted
Upgrade to tailwind 1.x (#435)
* Update config file according to upgrade-guide * upgrade tailwind to 1.x * rename tailwind config file * replace calls to config with calls to theme * remove all use of list-reset, as this is already being done * convert "pin" styles
1 parent b4a2d0c commit b03d4c1

File tree

15 files changed

+882
-1039
lines changed

15 files changed

+882
-1039
lines changed

addon/components/api/x-toggles/template.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ul class="docs-list-reset docs-mb-6">
1+
<ul class="docs-mb-6">
22
{{#each-in toggles as |key toggle|}}
33
{{#if (not-eq toggle undefined)}}
44
<li class="docs-inline docs-ml-4">

addon/components/docs-header/search-box/template.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="docs-relative docs-text-grey-darkest" data-search-box>
2-
{{svg-jar "search" width=12 height=12 class="docs-absolute docs-pin-t docs-h-full docs-ml-1"}}
2+
{{svg-jar "search" width=12 height=12 class="docs-absolute docs-top-0 docs-h-full docs-ml-1"}}
33

44
{{!--
55
This is a dumb input - so why not use the {{input}} helper? Because apparently

addon/components/docs-header/search-results/template.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
targetAttachment="bottom left"
88
constraints=(array (hash to="window" attachment="together" pin=true))}}
99

10-
<ul class="docs-w-76 docs-bg-white docs-shadow-md docs-list-reset" data-test-search-result-list>
10+
<ul class="docs-w-76 docs-bg-white docs-shadow-md" data-test-search-result-list>
1111
{{#each (take 5 searchResults) as |result index|}}
1212
<li>
1313
{{docs-header/search-result

addon/components/docs-header/version-selector/template.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
clickOutsideToClose=true
55
onClose=(action on-close)
66
targetAttachment="bottom right"}}
7-
<ul class="docs-list-reset docs-mt-2 docs-bg-white docs-shadow-md docs-text-xs docs-rounded docs-z-10">
7+
<ul class="docs-mt-2 docs-bg-white docs-shadow-md docs-text-xs docs-rounded docs-z-10">
88
{{#each sortedVersions as |version|}}
99
<li data-test-id="version">
1010
<a {{action "changeVersion" version}} href="#"

addon/components/docs-snippet/template.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
clipboardText=snippetText
2020
title="copy to clipboard"
2121
class="
22-
docs-absolute docs-pin-t docs-pin-r docs-bg-transparent hover:docs-bg-transparent
22+
docs-absolute docs-top-0 docs-right-0 docs-bg-transparent hover:docs-bg-transparent
2323
docs-border-none docs-opacity-50 hover:docs-opacity-100 docs-p-3 docs-text-white
2424
"
2525
}}

addon/components/docs-viewer/x-current-page-index/template.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<nav class="AddonDocs-DocsViewer-CurrentPageIndex docs-hidden xl:docs-block docs-flex-no-shrink docs-mr-auto" data-test-current-page-index>
2-
<div class="docs-sticky docs-pin-t docs-pt-4 docs-pb-8 docs-pr-8 docs-max-h-screen docs-overflow-y-scroll">
3-
<ul class="docs-list-reset docs-border-l docs-border-grey-lighter docs-pl-6 docs-leading-normal">
2+
<div class="docs-sticky docs-top-0 docs-pt-4 docs-pb-8 docs-pr-8 docs-max-h-screen docs-overflow-y-scroll">
3+
<ul class="docs-border-l docs-border-grey-lighter docs-pl-6 docs-leading-normal">
44
{{#if pageIndex.length}}
55
<li class="docs-mt-12 docs-text-grey docs-font-bold docs-tracking-wide docs-uppercase docs-text-xxs">
66
On This Page

addon/components/docs-viewer/x-nav-list/component.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
import { hbs } from 'ember-cli-htmlbars';
21
import Component from '@ember/component';
2+
import { hbs } from 'ember-cli-htmlbars';
33

44
export default Component.extend({
55
tagName: 'ul',
66

7-
classNames: ['docs-list-reset'],
8-
97
layout: hbs`
108
{{yield (hash
119
item=(component 'docs-viewer/x-nav-item')

addon/components/docs-viewer/x-nav/template.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<div class="AddonDocs-DocsViewer-Nav docs-bg-grey-lightest docs-border-r docs-flex-no-shrink">
1111
<nav onclick={{action (mut isShowingMenu) false}}
1212
class="
13-
docs-absolute docs-pin-r md:docs-relative docs-shadow-lg md:docs-shadow-none docs-mr-2 md:docs-mr-0 md:docs-pl-2
14-
docs-max-w-xs docs-w-90% md:docs-w-72 docs-z-10 docs-transition md:docs-sticky md:docs-pin-t
13+
docs-absolute docs-right-0 md:docs-relative docs-shadow-lg md:docs-shadow-none docs-mr-2 md:docs-mr-0 md:docs-pl-2
14+
docs-max-w-xs docs-w-90% md:docs-w-72 docs-z-10 docs-transition md:docs-sticky md:docs-top-0
1515
{{if media.isMobile
1616
(if isShowingMenu "docs-opacity-100 docs-bg-white" "docs-opacity-0 docs-pointer-events-none")
1717
}}

addon/styles/addon.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Global settings
22
$site-container: 1400px;
33

4-
@tailwind preflight;
4+
@tailwind base;
55
@tailwind components;
66
@tailwind utilities;
77

addon/styles/components/_docs-container.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.docs-container {
22
@apply docs-px-4 docs-max-w-site-container docs-mx-auto;
33
}
4-
@media (min-width: config('screens.md')) {
4+
@media (min-width: theme('screens.md')) {
55
.docs-container {
66
@apply docs-px-6;
77
}

0 commit comments

Comments
 (0)