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.

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

Add ember-appuniversum #171

Merged
merged 10 commits into from
Nov 4, 2021
Merged
Prev Previous commit
Next Next commit
refactor theme file and usage of variables
Dietr committed Oct 21, 2021
commit 2f140cccceafbe845e6c5fc2cc41e2e6a650177b
6 changes: 3 additions & 3 deletions app/styles/ember-rdfa-editor/_c-alert.scss
Original file line number Diff line number Diff line change
@@ -4,14 +4,14 @@

.say-alert {
display: flex;
color: $say-neutral-800;
color: $au-gray-800;
padding: $au-unit;
margin-bottom: $au-unit;
background-color: $say-neutral-200;
background-color: $au-gray-200;
}

.say-alert__icon {
background-color: $say-white;
background-color: $au-white;
border-radius: $au-unit-large;
height: $au-unit-large - .1rem; // compensate for visual distortion of perfect circle
width: $au-unit-large;
16 changes: 8 additions & 8 deletions app/styles/ember-rdfa-editor/_c-annotation-flag.scss
Original file line number Diff line number Diff line change
@@ -9,32 +9,32 @@
.rdfa-annotations:not(.show-rdfa-blocks) {
[data-flagged-remove="almost-complete"][data-editor-position-level="0"],
[data-flagged-remove="almost-complete"]:hover {
box-shadow: -2px 0 0 $say-warning-400;
background-color: $say-warning-200;
box-shadow: -2px 0 0 $au-yellow-400;
background-color: $au-yellow-200;

&:hover {
background-color: $say-warning-200 !important; // Conflict with .annotation style @TODO: remove when annotation classes are removed
background-color: $au-yellow-200 !important; // Conflict with .annotation style @TODO: remove when annotation classes are removed
}
}

[data-flagged-remove="complete"][data-editor-position-level="0"],
[data-flagged-remove="complete"] {
cursor: text;
box-shadow: none;
background-color: $say-neutral-100;
background-color: $au-gray-100;
min-width: $au-unit-tiny;
color: $say-neutral-700;
color: $au-gray-700;
font-style: italic;
text-decoration: none;
font-weight: $au-light !important;

&:hover {
background-color: $say-neutral-100 !important; // Conflict with .annotation style @TODO: remove when annotation classes are removed
background-color: $au-gray-100 !important; // Conflict with .annotation style @TODO: remove when annotation classes are removed
}

&:hover:after,
&:focus:after {
color: rgba($say-neutral-700,.7);
color: rgba($au-gray-700,.7);
}

&:after {
@@ -63,7 +63,7 @@
left: 0;
width: 100%;
height: 100%;
background: rgba($say-white,.9);
background: rgba($au-white,.9);
opacity: 1;
padding: $au-unit;
border: 0;
14 changes: 7 additions & 7 deletions app/styles/ember-rdfa-editor/_c-annotation-hover.scss
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@
[data-type],
[data-editor-highlight="true"]:not([contenteditable=""]) {
&:hover {
border-bottom-color: tint($say-neutral-600,20);
border-bottom-color: tint($au-gray-600,20);
}

&:before {
@@ -74,18 +74,18 @@
text-transform: uppercase;
text-overflow: ellipsis;
white-space: nowrap;
color: $say-neutral-600;
background-color: $say-neutral-100;
color: $au-gray-600;
background-color: $au-gray-100;
pointer-events: none;
overflow: hidden;
min-height: 2rem;
border-right: 1px dashed $say-neutral-300;
border-top: 1px dashed $say-neutral-300;
border-right: 1px dashed $au-gray-300;
border-top: 1px dashed $au-gray-300;
z-index: $au-z-index-gamma;
background: linear-gradient(
to right,
$say-neutral-100,
$say-neutral-100 calc(100% - #{$say-annotation-gutter + $au-unit-tiny}),
$au-gray-100,
$au-gray-100 calc(100% - #{$say-annotation-gutter + $au-unit-tiny}),
transparent calc(100% - #{$say-annotation-gutter + $au-unit-tiny}),
transparent 100%
);
30 changes: 15 additions & 15 deletions app/styles/ember-rdfa-editor/_c-annotation.scss
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@

[property="besluit:geplandOpenbaar"],
[property="besluit:openbaar"] {
color: $say-neutral-600 !important;
color: $au-gray-600 !important;
}

[property="besluit:geplandOpenbaar"] i,
@@ -33,7 +33,7 @@
top: .2rem;
padding-left: 1px;
z-index: 2;
color: $say-neutral-600 !important;
color: $au-gray-600 !important;
}

[property="besluit:geplandOpenbaar"][content="false"],
@@ -90,7 +90,7 @@
[typeof]:not([typeof="foaf:Document"]),
[data-type],
.mark-highlight-manual {
border-bottom: .2rem dotted $say-neutral-300;
border-bottom: .2rem dotted $au-gray-300;
padding-bottom: .2rem;
transition: border $au-transition;

@@ -113,7 +113,7 @@
transition: background-color $au-transition;

&::selection {
color: $say-neutral-900;
color: $au-gray-900;
background-color: $say-editor-highlight-color;
}

@@ -130,17 +130,17 @@
left: 0;
width: 100%;
height: 100%;
background-color: rgba($say-neutral-100,.5);
background-color: rgba($au-gray-100,.5);
}

span.mark-highlight-manual {
color: $say-neutral-700;
background-color: $say-neutral-100;
color: $au-gray-700;
background-color: $au-gray-100;
font-style: italic;

&[data-editor-position-level="1"],
&:hover {
color: rgba($say-neutral-700,.7);
color: rgba($au-gray-700,.7);
}
}
}
@@ -153,7 +153,7 @@
[data-type],
.mark-highlight-manual {
position: relative;
border: 1px solid $say-neutral-200;
border: 1px solid $au-gray-200;
display: block !important; // Override inline styles
margin: $au-unit-tiny;
padding: 0;
@@ -164,7 +164,7 @@
font-family: $say-font-family;
font-weight:$au-medium;
letter-spacing: .01rem;
color: $say-neutral-600;
color: $au-gray-600;
text-transform: uppercase;
pointer-events: none;
content: attr(property) " " attr(typeof) " " attr(data-type);
@@ -176,8 +176,8 @@
width: 100%;
padding: $au-unit-tiny/2;
transition: none;
border-bottom: 1px solid $say-neutral-200;
background-color: $say-neutral-100;
border-bottom: 1px solid $au-gray-200;
background-color: $au-gray-100;
opacity: 1;
}
}
@@ -189,7 +189,7 @@
font-family: $say-font-family;
font-weight: $au-regular;
letter-spacing: .01rem;
color: $say-neutral-600;
color: $au-gray-600;
text-transform: uppercase;
pointer-events: none;
position: relative;
@@ -200,8 +200,8 @@
width: 100%;
padding: $au-unit-tiny/2;
transition: none;
border-top: 1px solid $say-neutral-200;
background-color: $say-white;
border-top: 1px solid $au-gray-200;
background-color: $au-white;
opacity: 1;
margin: 0;
}
6 changes: 3 additions & 3 deletions app/styles/ember-rdfa-editor/_c-article.scss
Original file line number Diff line number Diff line change
@@ -13,12 +13,12 @@
flex-direction: row-reverse;

& + & {
border-top: .1rem solid $say-neutral-200;
border-top: .1rem solid $au-gray-200;
}
}

.say-article__section--highlight {
background-color: $say-neutral-100;
background-color: $au-gray-100;
}

.say-article__action {
@@ -28,7 +28,7 @@
}

.say-article__content {
color: $say-neutral-800;
color: $au-gray-800;
margin-right: $au-unit;

> * {
8 changes: 4 additions & 4 deletions app/styles/ember-rdfa-editor/_c-button.scss
Original file line number Diff line number Diff line change
@@ -99,8 +99,8 @@
opacity: 0;
transition: opacity $au-transition;
margin-left: $au-unit-small;
color: $say-neutral-700;
background-color: $say-neutral-200;
color: $au-gray-700;
background-color: $au-gray-200;
padding-left: $au-unit-tiny;
padding-right: $au-unit-tiny;
border-radius: .3rem;
@@ -114,8 +114,8 @@
width: 0;
position: absolute;
pointer-events: none;
border-color: rgba($say-white, 0);
border-right-color: $say-neutral-200;
border-color: rgba($au-white, 0);
border-right-color: $au-gray-200;
border-width: .6rem;
margin-top: -.6rem;
}
22 changes: 11 additions & 11 deletions app/styles/ember-rdfa-editor/_c-card.scss
Original file line number Diff line number Diff line change
@@ -6,42 +6,42 @@
display: flex;
flex-direction: column;
z-index: $au-z-index-gamma;
background-color: $say-white;
box-shadow: 0 1px 3px rgba($say-neutral-900, .1), 0 4px 20px rgba($say-neutral-900, .035), 0 1px 1px rgba($say-neutral-900, .025);
background-color: $au-white;
box-shadow: 0 1px 3px rgba($au-gray-900, .1), 0 4px 20px rgba($au-gray-900, .035), 0 1px 1px rgba($au-gray-900, .025);
z-index: 99;
}

.say-card__header {
padding: $au-unit-small;
border-bottom: .1rem solid $say-neutral-200;
border-bottom: .1rem solid $au-gray-200;
}

.say-card__title {
@include au-font-size($au-h5);
font-weight:$au-medium;
color: $say-neutral-800;
color: $au-gray-800;
}

.say-card__subtitle {
@include au-font-size($au-h6);
font-weight:$au-medium;
color: $say-neutral-800;
color: $au-gray-800;
}

.say-card__content {
position: relative;

& + & {
border-top: .1rem dotted $say-neutral-300;
border-top: .1rem dotted $au-gray-300;
}

& + &.say-card__content--padding {
border-top: .1rem solid $say-neutral-200;
border-top: .1rem solid $au-gray-200;
}
}

.say-card__content--tint {
background-color: $say-neutral-100;
background-color: $au-gray-100;
}

.say-card__content--padding {
@@ -56,7 +56,7 @@
.say-card__info {
@include au-font-size($au-h6);
padding: $au-unit-small;
color: $say-neutral-600;
color: $au-gray-600;
font-style: italic;

* + * {
@@ -66,7 +66,7 @@

.say-card__footer {
@include au-font-size($au-h6);
background-color: $say-neutral-100;
background-color: $au-gray-100;
padding: $au-unit-tiny $au-unit-small;
border-top: .1rem solid $say-neutral-200;
border-top: .1rem solid $au-gray-200;
}
14 changes: 7 additions & 7 deletions app/styles/ember-rdfa-editor/_c-content.scss
Original file line number Diff line number Diff line change
@@ -261,7 +261,7 @@
margin-top: $au-unit;
margin-bottom: $au-unit;
border: 0;
border-bottom: 3px solid $say-neutral-200;
border-bottom: 3px solid $au-gray-200;
}

// Add custom font styling
@@ -281,7 +281,7 @@
// Table styling
table th {
white-space: initial;
background-color: $say-white;
background-color: $au-white;
}

.data-table th,
@@ -309,9 +309,9 @@
// Imported HTML - Used for tables
[property="http://lblod.data.gift/vocabularies/editor/isLumpNode"] {
position: relative;
background-color: $say-neutral-200;
background-color: $au-gray-200;
border-radius: .2rem;
outline: 2px dashed $say-neutral-300;
outline: 2px dashed $au-gray-300;
outline-offset: .2rem;
margin-top: 1.2rem;
margin-bottom: 1.2rem;
@@ -326,7 +326,7 @@
// Reset some table styles
th {
font-weight:$au-medium;
border-bottom: 1px solid $say-neutral-300;
border-bottom: 1px solid $au-gray-300;
}

th,
@@ -335,7 +335,7 @@
vertical-align: top;
padding: .6rem;
background-color: transparent !important;
border: 1px solid $say-neutral-300;
border: 1px solid $au-gray-300;
}

// Style links as plain text
@@ -344,7 +344,7 @@
&:hover,
&:visited,
&:focus {
color: $say-neutral-800;
color: $au-gray-800;
text-decoration: none;
}

Loading