Skip to content
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

Ember-appuniversum upgrade > 0.11.0 #218

Merged
merged 3 commits into from
Feb 16, 2022
Merged

Ember-appuniversum upgrade > 0.11.0 #218

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
f98b346
upgrade appuniversum, simplify sass includes, remove sass deprecations
Dietr Feb 11, 2022
6fe5190
update variables
Dietr Feb 11, 2022
eba60f0
fix lint error
Dietr Feb 12, 2022
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
6 changes: 3 additions & 3 deletions app/styles/deprecated/_c-alert.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
.say-alert__icon {
background-color: var(--au-white);
border-radius: $au-unit-large;
height: $au-unit-large - 0.1rem; // compensate for visual distortion of perfect circle
height: $au-unit-large - .1rem; // compensate for visual distortion of perfect circle
width: $au-unit-large;
margin-right: $au-unit-large / 2;
margin-right: $au-unit-large * .5;

display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;

.say-icon {
height: 2rem - 0.1rem; // compensate for visual distortion of perfect circle
height: 2rem - .1rem; // compensate for visual distortion of perfect circle
width: 2rem;
bottom: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion app/styles/deprecated/_c-button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ $say-button-tertiary-bg-hover-color: transparent !default;

&:focus {
outline: var(--au-outline);
outline-offset: $au-unit-tiny/2;
outline-offset: $au-unit-tiny * .5;
}
}

Expand Down
30 changes: 16 additions & 14 deletions app/styles/ember-rdfa-editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
@import 'appuniversum/s-colors.scss';
@import 'appuniversum/s-global';
@import 'appuniversum/s-utilities';
@import 'ember-rdfa-editor/s-root';
@import 'ember-rdfa-editor/s-root'; // Say theme settings

// MIXINS
@import 'appuniversum/t-font-size';
Expand Down Expand Up @@ -84,16 +84,18 @@
@import 'ember-appuniversum/p-duet-datepicker';

// UTILITIES
@import 'appuniversum/u-align-text';
@import 'appuniversum/u-background';
@import 'appuniversum/u-break-word';
@import 'appuniversum/u-headings';
@import 'appuniversum/u-hide';
@import 'appuniversum/u-font-family';
@import 'appuniversum/u-font-weights';
@import 'appuniversum/u-paragraphs';
@import 'appuniversum/u-print';
@import 'appuniversum/u-responsive-spacings';
@import 'appuniversum/u-spacings';
@import 'appuniversum/u-visible';
@import 'appuniversum/u-widths';
@import "appuniversum/u-align-text";
@import "appuniversum/u-background";
@import "appuniversum/u-break-word";
@import "appuniversum/u-headings";
@import "appuniversum/u-hide";
@import "appuniversum/u-flex";
@import "appuniversum/u-font-family";
@import "appuniversum/u-font-weights";
@import "appuniversum/u-max-widths";
@import "appuniversum/u-paragraphs";
@import "appuniversum/u-print";
@import "appuniversum/u-responsive-spacings";
@import "appuniversum/u-spacings";
@import "appuniversum/u-visible";
@import "appuniversum/u-widths";
4 changes: 2 additions & 2 deletions app/styles/ember-rdfa-editor/_c-annotation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ $say-annotation-background-color: var(--au-gray-100) !default;
left: 0;
display: block;
width: 100%;
padding: $au-unit-tiny/2;
padding: $au-unit-tiny * .5;
transition: none;
border-bottom: 1px solid var(--au-gray-200);
background-color: var(--au-gray-100);
Expand All @@ -212,7 +212,7 @@ $say-annotation-background-color: var(--au-gray-100) !default;
left: 0;
display: block;
width: 100%;
padding: $au-unit-tiny/2;
padding: $au-unit-tiny * .5;
transition: none;
border-top: 1px solid var(--au-gray-200);
background-color: var(--au-white);
Expand Down
2 changes: 1 addition & 1 deletion app/styles/ember-rdfa-editor/_c-content.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ $say-editor-highlight-hover-color: var(--au-yellow-100) !default;

&:focus {
outline: var(--au-outline);
outline-offset: $au-unit-tiny/2;
outline-offset: $au-unit-tiny * .5;
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/styles/ember-rdfa-editor/_c-dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ $say-smaller-font-size: 1.4rem !default;
position: absolute;
pointer-events: none;
border-width: $say-dropdown-caret-size;
margin-left: -$say-dropdown-caret-size/2;
margin-left: -$say-dropdown-caret-size * .5;
}

&:before {
Expand Down
2 changes: 1 addition & 1 deletion app/styles/ember-rdfa-editor/_c-editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ $say-annotation-width: $au-unit-huge * 1.5 !default;

.say-editor {
background-color: $say-paper-background;
padding: $say-editor-padding $say-editor-padding/2;
padding: $say-editor-padding $say-editor-padding * .5;
width: 100%;
position: relative;

Expand Down
176 changes: 93 additions & 83 deletions app/styles/ember-rdfa-editor/_s-root.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,94 +1,104 @@
// Custom color variables
$say-primary-100: #faf4ff !default;
$say-primary-200: #f2e0ff !default;
$say-primary-300: #e1b8ff !default;
$say-primary-500: #b34bff !default;
$say-primary-600: #a933ff !default;
$say-primary-700: #9000fa !default;
$say-primary-800: #7700ce !default;
$say-primary-900: #550094 !default;

// Appuniversum variables
// Say editor theme
:root {
// Colors
--au-white: #{$au-white};
--au-gray-100: #{$au-gray-100};
--au-gray-200: #{$au-gray-200};
--au-gray-300: #{$au-gray-300};
--au-gray-400: #{$au-gray-400};
--au-gray-500: #{$au-gray-500};
--au-gray-600: #{$au-gray-600};
--au-gray-700: #{$au-gray-700};
--au-gray-800: #{$au-gray-800};
--au-gray-900: #{$au-gray-900};
--au-gray-1000: #{$au-gray-1000};
--au-blue-100: #{$say-primary-100};
--au-blue-200: #{$say-primary-200};
--au-blue-300: #{$say-primary-300};
--au-blue-500: #{$say-primary-500};
--au-blue-600: #{$say-primary-600};
--au-blue-700: #{$say-primary-700};
--au-blue-800: #{$say-primary-800};
--au-blue-900: #{$say-primary-900};
--au-yellow-100: #{$au-yellow-100};
--au-yellow-200: #{$au-yellow-200};
--au-yellow-300: #{$au-yellow-300};
--au-yellow-400: #{$au-yellow-400};
--au-yellow-600: #{$au-yellow-600};
--au-yellow-900: #{$au-yellow-900};
--au-red-100: #{$au-red-100};
--au-red-200: #{$au-red-200};
--au-red-500: #{$au-red-500};
--au-red-600: #{$au-red-600};
--au-red-700: #{$au-red-700};
--au-red-900: #{$au-red-900};
--au-green-100: #{$au-green-100};
--au-green-200: #{$au-green-200};
--au-green-400: #{$au-green-400};
--au-green-500: #{$au-green-500};
--au-green-700: #{$au-green-700};
--au-green-900: #{$au-green-900};
--au-white: #FFFFFF;
--au-gray-100: #F7F9FC;
--au-gray-200: #e8ebee;
--au-gray-300: #CFD5DD;
--au-gray-400: #AFB9C5;
--au-gray-500: #8695A8;
--au-gray-600: #7F8B99;
--au-gray-700: #687483;
--au-gray-800: #4F5864;
--au-gray-900: #333332;
--au-gray-1000: #000000;
--au-blue-100: #faf4ff;
--au-blue-200: #f2e0ff;
--au-blue-300: #e1b8ff;
--au-blue-500: #b34bff;
--au-blue-600: #a933ff;
--au-blue-700: #9000fa;
--au-blue-800: #7700ce;
--au-blue-900: #550094;
--au-yellow-100: #FFF9D5;
--au-yellow-200: #FFF29B;
--au-yellow-300: #FFE615;
--au-yellow-400: #FFC515;
--au-yellow-600: #7F6E3B;
--au-yellow-900: #473D21;
--au-orange-200: #fff9e8;
--au-orange-300: #FFEEB9;
--au-orange-400: #FFE49C;
--au-orange-500: #FFA10A;
--au-orange-600: #D07B06;
--au-orange-700: #9F5804;
--au-red-100: #FDF7F7;
--au-red-200: #FBEDED;
--au-red-300: #F4C8C9;
--au-red-400: #F1AEAE;
--au-red-500: #E77474;
--au-red-600: #D2373C;
--au-red-700: #AA2729;
--au-red-900: #470000;
--au-green-100: #F8FCF9;
--au-green-200: #ecf6ee;
--au-green-300: #C5E5CC;
--au-green-400: #b1dcbb;
--au-green-500: #009E47;
--au-green-700: #007A37;
--au-green-900: #323D08;

// Typography
--au-global-font-size: #{$au-global-font-size};
--au-global-line-height: #{$au-global-line-height};
--au-global-font-size: 1.5rem;
--au-global-line-height: 1.5;
--au-font: BlinkMacSystemFont, -apple-system, 'Segoe UI', Roboto, Helvetica,
Arial, sans-serif;
--au-font-secondary: #{$au-font-secondary};
--au-font-tertiary: #{$au-font-tertiary};
--au-light: #{$au-light};
--au-regular: #{$au-regular};
--au-medium: #{$au-medium};
--au-bold: #{$au-bold};
--au-base: #{$au-base};
--au-tiny: #{$au-tiny};
--au-small: #{$au-small};
--au-h6: #{$au-h6};
--au-h5: #{$au-h5};
--au-h4: #{$au-h4};
--au-h3: #{$au-h3};
--au-h2: #{$au-h2};
--au-h1: #{$au-h1};
--au-font-secondary: "flanders-serif";
--au-font-tertiary: courier, monospace;
--au-light: 300;
--au-regular: 400;
--au-medium: 500;
--au-bold: 700;
--au-base: 1.5rem;
--au-para: 1.8rem;
--au-para-small: 1.6rem;
--au-lead: 2.2rem;
--au-lead-medium: 2rem;
--au-lead-small: 1.8rem;
--au-small: 1.4rem;
--au-tiny: 1.3rem;
--au-h-functional-small: 1.3rem;
--au-h-functional: 1.5rem;
--au-h6: 1.6rem;
--au-h5: 1.8rem;
--au-h4: 2rem;
--au-h3-small: 2.2rem;
--au-h3: 2.6rem;
--au-h2-small: 2.6rem;
--au-h2: 3.2rem;
--au-h1-small: 3rem;
--au-h1-medium: 4rem;
--au-h1: 4.4rem;

// UI
--au-page-bg: #{$au-page-bg};
--au-select-text-color: #{$au-select-text-color};
--au-select-text-bg: #{$say-primary-200};
--au-radius: #{$au-radius};
--au-border: #{$au-border};
--au-outline-color: #{$say-primary-500};
--au-outline-border: #{$au-outline-border};
--au-outline-border-style: #{$au-outline-border-style};
--au-outline: 0.3rem solid rgba(#a933ff, 0.65);
--au-outline-offset: #{$au-outline-offset};
--au-outline-offset-negative: #{$au-outline-offset-negative};
--au-duration: #{$au-duration};
--au-easing: #{$au-easing};
--au-transition: #{$au-transition};
--au-z-index-alpha: #{$au-z-index-alpha};
--au-z-index-beta: #{$au-z-index-beta};
--au-z-index-gamma: #{$au-z-index-gamma};
--au-page-bg: #FFFFFF;
--au-select-text-color: #333332;
--au-select-text-bg: #f2e0ff;
--au-radius: .3rem;
--au-border: .2rem;
--au-outline-color: #b34bff;
--au-outline-border: .3rem;
--au-outline-border-style: solid;
--au-outline: #5990DE .3rem solid;
--au-outline-offset: .2rem;
--au-outline-offset-negative: -.3rem;
--au-duration: .125s;
--au-easing: cubic-bezier(0.190, 1.000, 0.220, 1.000);
--au-transition: .125s cubic-bezier(0.190, 1.000, 0.220, 1.000);
--au-z-index-alpha: 1;
--au-z-index-beta: 2;
--au-z-index-gamma: 3;

// Duet datepicker
--duet-color-primary: #{$say-primary-600};
--duet-color-primary: #a933ff;
}
4 changes: 0 additions & 4 deletions ember-cli-build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ module.exports = function (defaults) {
},
sassOptions: {
sourceMapEmbed: true,
includePaths: [
'node_modules/@appuniversum/appuniversum',
'node_modules/@appuniversum/ember-appuniversum/app/styles',
],
},
autoprefixer: {
enabled: true,
Expand Down
11 changes: 10 additions & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,16 @@ module.exports = {
},
},

included() {
included: function (app) {
this._super.included.apply(this, arguments);

app.options.sassOptions = app.options.sassOptions || {};
app.options.sassOptions.includePaths =
app.options.sassOptions.includePaths || [];

app.options.sassOptions.includePaths.push(
'node_modules/@appuniversum/appuniversum',
'node_modules/@appuniversum/ember-appuniversum/app/styles'
);
},
};
Loading