Skip to content

Fix stylesheets #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roncodes merged 3 commits into from
Jun 6, 2023
Merged

Fix stylesheets #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3304a8
unnest css patch styles so that minification can work, patch `<ModelS…
roncodes Jun 6, 2023
7ec939d
bump version to 0.0.5
roncodes Jun 6, 2023
19d651b
pass lint and build
roncodes Jun 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions addon/components/layout/header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,22 @@ export default class LayoutHeaderComponent extends Component {
text: 'Explore extensions',
icon: 'puzzle-piece',
},
]);

if (this.user.get('is_admin')) {
items.pushObjects([
{
seperator: true,
},
{
route: 'console.admin',
text: 'Admin',
icon: 'toolbox',
},
]);
}

items.pushObjects([
{
seperator: true,
},
Expand Down
2 changes: 1 addition & 1 deletion addon/components/model-select-multiple.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ModelSelect {{!-- model-select arguments --}} @modelName={{@modelName}} @selectedModel={{@selectedModel}} @labelProperty={{@labelProperty}} @searchProperty={{@searchProperty}} @searchKey={{@searchKey}} @loadDefaultOptions={{@loadDefaultOptions}} @infiniteScroll={{@infiniteScroll}} @pageSize={{@pageSize}} @query={{@query}} @debounceDuration={{this.debounceDuration}} @withCreate={{@withCreate}} @buildSuggestion={{@buildSuggestion}} @perPageParam={{@perPageParam}} @pageParam={{@pageParam}} @totalPagesParam={{@totalPagesParam}} @onCreate={{@onCreate}} {{!-- overwritten arguments --}} @onChange={{this.change}} @searchField={{@labelProperty}} @triggerClass="ember-model-select-multiple-trigger {{@triggerClass}}" {{!-- power-select-multiple defaults --}} @triggerRole={{@triggerRole}} @ariaDescribedBy={{@ariaDescribedBy}} @ariaInvalid={{@ariaInvalid}} @ariaLabel={{@ariaLabel}} @ariaLabelledBy={{@ariaLabelledBy}} @afterOptionsComponent={{@afterOptionsComponent}} @allowClear={{@allowClear}} @beforeOptionsComponent={{or @beforeOptionsComponent null}} @buildSelection={{or @buildSelection this.defaultBuildSelection}} @calculatePosition={{@calculatePosition}} @closeOnSelect={{@closeOnSelect}} @defaultHighlighted={{@defaultHighlighted}} @destination={{@destination}} @disabled={{@disabled}} @dropdownClass={{@dropdownClass}} @extra={{@extra}} @groupComponent={{@groupComponent}} @horizontalPosition={{@horizontalPosition}} @initiallyOpened={{@initiallyOpened}} @loadingMessage={{@loadingMessage}} @matcher={{@matcher}} @matchTriggerWidth={{@matchTriggerWidth}} @noMatchesMessage={{@noMatchesMessage}} @onBlur={{@onBlur}} {{!-- @onChange={{@onChange}} --}} @onClose={{@onClose}} @onFocus={{this.handleFocus}} @onInput={{@onInput}} @onKeydown={{this.handleKeydown}} @onOpen={{this.handleOpen}} @options={{@options}} @optionsComponent={{@optionsComponent}} @placeholder={{@placeholder}} @placeholderComponent={{@placeholderComponent}} @preventScroll={{@preventScroll}} @registerAPI={{@registerAPI}} @renderInPlace={{@renderInPlace}} @required={{@required}} @scrollTo={{@scrollTo}} @search={{@search}} @searchEnabled={{@searchEnabled}} {{!-- @searchField={{@searchField}} --}} @searchMessage={{@searchMessage}} @searchPlaceholder={{@searchPlaceholder}} {{!-- @selected={{@selected}} --}} @selectedItemComponent={{@selectedItemComponent}} @eventType={{@eventType}} @title={{@title}} {{!-- @triggerClass="ember-power-select-multiple-trigger {{@triggerClass}}" --}} @triggerComponent={{component (or @triggerComponent "power-select-multiple/trigger") tabindex=@tabindex}} @triggerId={{@triggerId}} @verticalPosition={{@verticalPosition}} @tabindex={{this.computedTabIndex}} ...attributes as |model|>
<ModelSelect @modelName={{@modelName}} @selectedModel={{@selectedModel}} @labelProperty={{@labelProperty}} @searchProperty={{@searchProperty}} @searchKey={{@searchKey}} @loadDefaultOptions={{@loadDefaultOptions}} @infiniteScroll={{@infiniteScroll}} @pageSize={{@pageSize}} @query={{@query}} @debounceDuration={{this.debounceDuration}} @withCreate={{@withCreate}} @buildSuggestion={{@buildSuggestion}} @perPageParam={{@perPageParam}} @pageParam={{@pageParam}} @totalPagesParam={{@totalPagesParam}} @onCreate={{@onCreate}} {{!-- overwritten arguments --}} @onChange={{this.change}} @searchField={{@labelProperty}} @triggerClass="ember-model-select-multiple-trigger {{@triggerClass}}" {{!-- power-select-multiple defaults --}} @triggerRole={{@triggerRole}} @ariaDescribedBy={{@ariaDescribedBy}} @ariaInvalid={{@ariaInvalid}} @ariaLabel={{@ariaLabel}} @ariaLabelledBy={{@ariaLabelledBy}} @afterOptionsComponent={{@afterOptionsComponent}} @allowClear={{@allowClear}} @beforeOptionsComponent={{or @beforeOptionsComponent null}} @buildSelection={{or @buildSelection this.defaultBuildSelection}} @calculatePosition={{@calculatePosition}} @closeOnSelect={{@closeOnSelect}} @defaultHighlighted={{@defaultHighlighted}} @destination={{@destination}} @disabled={{@disabled}} @dropdownClass={{@dropdownClass}} @extra={{@extra}} @groupComponent={{@groupComponent}} @horizontalPosition={{@horizontalPosition}} @initiallyOpened={{@initiallyOpened}} @loadingMessage={{@loadingMessage}} @matcher={{@matcher}} @matchTriggerWidth={{@matchTriggerWidth}} @noMatchesMessage={{@noMatchesMessage}} @onBlur={{@onBlur}} {{!-- @onChange={{@onChange}} --}} @onClose={{@onClose}} @onFocus={{this.handleFocus}} @onInput={{@onInput}} @onKeydown={{this.handleKeydown}} @onOpen={{this.handleOpen}} @options={{@options}} @optionsComponent={{@optionsComponent}} @placeholder={{@placeholder}} @placeholderComponent={{@placeholderComponent}} @preventScroll={{@preventScroll}} @registerAPI={{@registerAPI}} @renderInPlace={{@renderInPlace}} @required={{@required}} @scrollTo={{@scrollTo}} @search={{@search}} @searchEnabled={{@searchEnabled}} {{!-- @searchField={{@searchField}} --}} @searchMessage={{@searchMessage}} @searchPlaceholder={{@searchPlaceholder}} {{!-- @selected={{@selected}} --}} @selectedItemComponent={{@selectedItemComponent}} @eventType={{@eventType}} @title={{@title}} {{!-- @triggerClass="ember-power-select-multiple-trigger {{@triggerClass}}" --}} @triggerComponent={{component (or @triggerComponent "power-select-multiple/trigger") tabindex=@tabindex}} @triggerId={{@triggerId}} @verticalPosition={{@verticalPosition}} @tabindex={{this.computedTabIndex}} ...attributes as |model|>
{{#if (has-block)}}
{{yield model}}
{{else}}
Expand Down
2 changes: 1 addition & 1 deletion addon/components/model-select.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="fleetbase-model-select ember-model-select">
<div class="fleetbase-model-select fleetbase-power-select ember-model-select">
<PowerSelect @afterOptionsComponent={{@afterOptionsComponent}} @allowClear={{@allowClear}} @animationEnabled={{@animationEnabled}} @ariaDescribedBy={{@ariaDescribedBy}} @ariaInvalid={{@ariaInvalid}} @ariaLabel={{@ariaLabel}} @ariaLabelledBy={{@ariaLabelledBy}} @beforeOptionsComponent={{@beforeOptionsComponent}} @buildSelection={{@buildSelection}} @calculatePosition={{@calculatePosition}} @closeOnSelect={{@closeOnSelect}} @defaultHighlighted={{@defaultHighlighted}} @destination={{@destination}} @disabled={{@disabled}} @dropdownClass={{or @dropdownClass "ember-model-select__dropdown"}} @extra={{@extra}} @groupComponent={{@groupComponent}} @highlightOnHover={{@highlightOnHover}} @horizontalPosition={{@horizontalPosition}} @initiallyOpened={{@initiallyOpened}} @loadingMessage={{@loadingMessage}} @eventType={{@eventType}} @matcher={{@matcher}} @matchTriggerWidth={{@matchTriggerWidth}} @noMatchesMessage={{@noMatchesMessage}} @onBlur={{@onBlur}} @onChange={{this.change}} @onClose={{this.onClose}} @onFocus={{@onFocus}} @onInput={{this.onInput}} @onKeydown={{@onKeydown}} @onOpen={{this.onOpen}} @options={{this._options}} @optionsComponent={{component
this.optionsComponent
infiniteScroll=this.infiniteScroll
Expand Down
2 changes: 1 addition & 1 deletion app/styles/addon.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
@import 'components/calendar.css';
@import 'components/pagination.css';
@import 'components/overlay.css';
@import 'components/badges.css';
@import 'components/badge.css';
@import 'components/dropdown.css';
@import 'components/cards.css';
@import 'components/timeline.css';
Expand Down
119 changes: 60 additions & 59 deletions app/styles/components/attacher.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
--positions: 'top', 'bottom', 'left', 'right';
--origins: bottom, top, right, left;
--circle-origins: 0% 50%, 0% -50%, 50% 5%, -50% 5%;
:root {
--origins: bottom, top, right, left;
--circle-origins: 0% 50%, 0% -50%, 50% 5%, -50% 5%;
}

@define-mixin arrow $position, $width {
@if '$position' == 'top' {
Expand Down Expand Up @@ -33,7 +34,7 @@
}

@define-mixin ember-attacher-hide-transform $position, $animation {
@if $animation == 'perspective' {
@if '$animation' == 'perspective' {
@if '$position' == 'top' {
transform: translateY(0) rotateX(90deg);
} @else if '$position' == 'bottom' {
Expand All @@ -43,7 +44,7 @@
} @else if '$position' == 'right' {
transform: translateX(0) rotateY(90deg);
}
} @else if $animation == 'shift' {
} @else if '$animation' == 'shift' {
@if '$position' == 'top' {
transform: translateY(0);
} @else if '$position' == 'bottom' {
Expand All @@ -53,7 +54,7 @@
} @else if '$position' == 'right' {
transform: translateX(0);
}
} @else if $animation == 'scale' {
} @else if '$animation' == 'scale' {
@if '$position' == 'top' {
transform: translateY(0) scale(0);
} @else if '$position' == 'bottom' {
Expand All @@ -63,7 +64,7 @@
} @else if '$position' == 'right' {
transform: translateX(0) scale(0);
}
} @else if $animation == 'none' {
} @else if '$animation' == 'none' {
@if '$position' == 'top' {
transform: translateY(-10px);
} @else if '$position' == 'bottom' {
Expand All @@ -77,7 +78,7 @@
}

@define-mixin ember-attacher-show-transform $position, $animation {
@if $animation == 'perspective' {
@if '$animation' == 'perspective' {
@if '$position' == 'top' {
transform: translateY(-10px) rotateX(0);
} @else if '$position' == 'bottom' {
Expand All @@ -87,7 +88,7 @@
} @else if '$position' == 'right' {
transform: translateX(10px) rotateY(0);
}
} @else if $animation == 'fade' {
} @else if '$animation' == 'fade' {
@if '$position' == 'top' {
transform: translateY(-10px);
} @else if '$position' == 'bottom' {
Expand All @@ -97,7 +98,7 @@
} @else if '$position' == 'right' {
transform: translateX(10px);
}
} @else if $animation == 'scale' {
} @else if '$animation' == 'scale' {
@if '$position' == 'top' {
transform: translateY(-10px) scale(1);
} @else if '$position' == 'bottom' {
Expand All @@ -115,15 +116,15 @@
border: 1px solid #ced2e2;
box-shadow: 0 0 16px -4px rgba(0, 20, 40, 0.2), 0 0 80px -10px rgba(0, 20, 40, 0.3);
color: #203d5d;
}

& > div[x-arrow] {
background-color: #f3f6f9;
border-color: transparent transparent #ced2e2 #ced2e2;
}
.ember-attacher-light-theme > div[x-arrow] {
background-color: #f3f6f9;
border-color: transparent transparent #ced2e2 #ced2e2;
}

& > div[x-circle] {
background-color: #f3f6f9;
}
.ember-attacher-light-theme > div[x-circle] {
background-color: #f3f6f9;
}

.ember-attacher {
Expand All @@ -144,32 +145,32 @@
}

& > .ember-attacher-fill {
@mixin ember-attacher-hide-transform $position, 'shift';
@mixin ember-attacher-hide-transform $position, shift;
opacity: 0;
}

& > .ember-attacher-none {
@mixin ember-attacher-hide-transform $position, 'none';
@mixin ember-attacher-hide-transform $position, none;
opacity: 1;
}

& > .ember-attacher-fade {
@mixin ember-attacher-show-transform $position, 'fade';
@mixin ember-attacher-show-transform $position, fade;
opacity: 0;
}

& > .ember-attacher-shift {
@mixin ember-attacher-hide-transform $position, 'shift';
@mixin ember-attacher-hide-transform $position, shift;
opacity: 0;
}

& > .ember-attacher-scale {
@mixin ember-attacher-hide-transform $position, 'scale';
@mixin ember-attacher-hide-transform $position, scale;
opacity: 0;
}

& > .ember-attacher-perspective {
@mixin ember-attacher-hide-transform $position, 'perspective';
@mixin ember-attacher-hide-transform $position, perspective;
opacity: 0;
transform-origin: nth(var(--origins), $index);
}
Expand All @@ -184,17 +185,17 @@
&.ember-attacher-fill,
&.ember-attacher-none,
&.ember-attacher-shift {
@mixin ember-attacher-show-transform $position, 'fade';
@mixin ember-attacher-show-transform $position, fade;
opacity: 1;
}

&.ember-attacher-scale {
@mixin ember-attacher-show-transform $position, 'scale';
@mixin ember-attacher-show-transform $position, scale;
opacity: 1;
}

&.ember-attacher-perspective {
@mixin ember-attacher-show-transform $position, 'perspective';
@mixin ember-attacher-show-transform $position, perspective;
opacity: 1;
}
}
Expand All @@ -209,42 +210,42 @@
max-width: 380px;
position: relative;
will-change: transform;
}

&.ember-attacher-fill {
background-color: transparent;
overflow: hidden;
}
.ember-attacher-tooltip.ember-attacher-fill {
background-color: transparent;
overflow: hidden;
}

& > div[x-arrow] {
background-color: #333;
border: 1px solid;
border-color: transparent transparent #333 #333;
height: 10px;
position: absolute;
width: 10px;
z-index: -1;
}
.ember-attacher-tooltip > div[x-arrow] {
background-color: #333;
border: 1px solid;
border-color: transparent transparent #333 #333;
height: 10px;
position: absolute;
width: 10px;
z-index: -1;
}

& > div[x-circle] {
background-color: #333;
border-radius: 50%;
left: 50%;
opacity: 0;
overflow: hidden;
position: absolute;
transition: all ease-out;
width: 120%;
width: calc(100% + 2rem);
will-change: transform;
z-index: -1;

&::before {
content: '';
padding-top: 100%;
padding-top: calc(75% + 2rem);
float: left;
}
}
.ember-attacher-tooltip > div[x-circle] {
background-color: #333;
border-radius: 50%;
left: 50%;
opacity: 0;
overflow: hidden;
position: absolute;
transition: all ease-out;
width: 120%;
width: calc(100% + 2rem);
will-change: transform;
z-index: -1;
}

.ember-attacher-tooltip > div[x-circle]::before {
content: '';
padding-top: 100%;
padding-top: calc(75% + 2rem);
float: left;
}

@media (max-width: 450px) {
Expand Down
Loading