diff --git a/frontend/.sass-lint.yml b/frontend/.sass-lint.yml index e753c8c91..a91922a0b 100644 --- a/frontend/.sass-lint.yml +++ b/frontend/.sass-lint.yml @@ -8,7 +8,7 @@ rules: clean-import-paths: - 0 property-sort-order: - - 0 + - 1 indentation: - 2 - @@ -23,4 +23,5 @@ leading-underscore: false files: ignore: - - 'app/theme/_mixins.scss' \ No newline at end of file + - 'app/theme/_mixins.scss' + - 'node_modules/**/*.*' \ No newline at end of file diff --git a/frontend/app-config/webpack.config.js b/frontend/app-config/webpack.config.js index f569ea05a..e022f7ede 100644 --- a/frontend/app-config/webpack.config.js +++ b/frontend/app-config/webpack.config.js @@ -25,7 +25,9 @@ const plugins = { // https://github.com/NMFR/optimize-css-assets-webpack-plugin OptimizeCSSAssetsPlugin: require("optimize-css-assets-webpack-plugin"), // https://github.com/jrparish/tslint-webpack-plugin - TsLintPlugin: require('tslint-webpack-plugin') + TsLintPlugin: require('tslint-webpack-plugin'), + // https://www.npmjs.com/package/sass-lint-webpack + SassLintPlugin: require('sass-lint-webpack') }; module.exports = function (env) { @@ -131,13 +133,18 @@ module.exports = function (env) { plugins.MiniCssExtractPlugin.loader, { loader: 'css-loader' + }, { + loader: 'postcss-loader' }] }, { test: /\.scss$/, use: [{ loader: 'raw-loader' }, { - loader: 'sass-loader', options: { + loader: 'postcss-loader' + }, { + loader: 'sass-loader', + options: { sassOptions: { includePaths: [root('app', 'theme')] } @@ -172,6 +179,8 @@ module.exports = function (env) { } }), + new plugins.SassLintPlugin(), + /** * Detect circular dependencies in app. * @@ -347,6 +356,8 @@ module.exports = function (env) { plugins.MiniCssExtractPlugin.loader, { loader: 'css-loader' + }, { + loader: 'postcss-loader' }, { loader: 'sass-loader' }], @@ -362,6 +373,8 @@ module.exports = function (env) { loader: 'style-loader' }, { loader: 'css-loader' + }, { + loader: 'postcss-loader' }, { loader: 'sass-loader?sourceMap' }], diff --git a/frontend/app/features/administration/pages/cluster/cluster-page.component.scss b/frontend/app/features/administration/pages/cluster/cluster-page.component.scss index 240132dcf..e4e8902fd 100644 --- a/frontend/app/features/administration/pages/cluster/cluster-page.component.scss +++ b/frontend/app/features/administration/pages/cluster/cluster-page.component.scss @@ -3,7 +3,6 @@ iframe { @include absolute(0, 0, 0, 0); - min-width: 100%; - min-height: 100%; + @include force-width(100%); border: 0; } \ No newline at end of file diff --git a/frontend/app/features/administration/pages/event-consumers/event-consumers-page.component.html b/frontend/app/features/administration/pages/event-consumers/event-consumers-page.component.html index 2b7033039..a0b66ebcc 100644 --- a/frontend/app/features/administration/pages/event-consumers/event-consumers-page.component.html +++ b/frontend/app/features/administration/pages/event-consumers/event-consumers-page.component.html @@ -51,7 +51,7 @@ - + \ No newline at end of file diff --git a/frontend/app/features/administration/pages/event-consumers/event-consumers-page.component.scss b/frontend/app/features/administration/pages/event-consumers/event-consumers-page.component.scss index 446243a46..954eadba8 100644 --- a/frontend/app/features/administration/pages/event-consumers/event-consumers-page.component.scss +++ b/frontend/app/features/administration/pages/event-consumers/event-consumers-page.component.scss @@ -13,6 +13,8 @@ .error-message { height: 18rem; - font-size: .8rem; - font-weight: normal; +} + +.small { + font-size: 90%; } \ No newline at end of file diff --git a/frontend/app/features/administration/pages/restore/restore-page.component.scss b/frontend/app/features/administration/pages/restore/restore-page.component.scss index f4cc3a431..7a16e83c5 100644 --- a/frontend/app/features/administration/pages/restore/restore-page.component.scss +++ b/frontend/app/features/administration/pages/restore/restore-page.component.scss @@ -27,8 +27,8 @@ h3 { } &-body { - font-family: monospace; background: $color-border; + font-family: monospace; max-height: 400px; min-height: 300px; overflow-y: scroll; @@ -39,12 +39,12 @@ h3 { &-status { & { @include circle($circle-size); - line-height: $circle-size + .1rem; - text-align: center; - font-size: .6 * $circle-size; - font-weight: normal; background: $color-border; color: $color-dark-foreground; + font-size: .6 * $circle-size; + font-weight: normal; + line-height: $circle-size + .1rem; + text-align: center; vertical-align: middle; } diff --git a/frontend/app/features/administration/pages/users/user-page.component.html b/frontend/app/features/administration/pages/users/user-page.component.html index a3f1c557d..5e314fcf6 100644 --- a/frontend/app/features/administration/pages/users/user-page.component.html +++ b/frontend/app/features/administration/pages/users/user-page.component.html @@ -55,7 +55,7 @@ -
+
@@ -73,7 +73,7 @@
-
+
diff --git a/frontend/app/features/administration/pages/users/user-page.component.scss b/frontend/app/features/administration/pages/users/user-page.component.scss index 5742bc927..8f81aae0d 100644 --- a/frontend/app/features/administration/pages/users/user-page.component.scss +++ b/frontend/app/features/administration/pages/users/user-page.component.scss @@ -1,16 +1,10 @@ @import '_vars'; @import '_mixins'; -.form-group-password { - margin-top: 2rem; -} - -.form-group-permissions { +.form-group-section { margin-top: 2rem; } textarea { height: 200px; - font-size: .9rem; - font-weight: normal; } \ No newline at end of file diff --git a/frontend/app/features/api/api-area.component.scss b/frontend/app/features/api/api-area.component.scss index 3bda24ee9..6df2bffe7 100644 --- a/frontend/app/features/api/api-area.component.scss +++ b/frontend/app/features/api/api-area.component.scss @@ -2,11 +2,11 @@ @import '_mixins'; .nav-link { - position: relative; - padding-top: .6rem; padding-bottom: .6rem; + padding-top: .6rem; + position: relative; } .icon-angle-right { - @include absolute(14px, 2rem, auto, auto); + @include absolute(14px, 2rem); } \ No newline at end of file diff --git a/frontend/app/features/apps/pages/apps-page.component.html b/frontend/app/features/apps/pages/apps-page.component.html index 2a267d86e..e7f69e19a 100644 --- a/frontend/app/features/apps/pages/apps-page.component.html +++ b/frontend/app/features/apps/pages/apps-page.component.html @@ -14,14 +14,14 @@

You are not collaborating to any app yet

-
+
-

{{app.displayName}}

+

{{app.displayName}}

-

New App

+

New App

Create a new blank app without content and schemas. @@ -65,7 +65,7 @@
-

New Blog Sample

+

New Blog Sample

Start with our ready to use blog.
@@ -82,7 +82,7 @@
-

New Profile Sample

+

New Profile Sample

Create your profile page.
@@ -99,7 +99,7 @@
-

New Identity App

+

New Identity App

Create app for Squidex Identity.
@@ -111,7 +111,9 @@
-
{{info}}
+
+ {{info}} +
- + @@ -98,26 +98,31 @@ -
- + + +
+ + + Viewing version {{version.value}}. +
+
- Viewing version {{version.value}}. -
+
+ + +
+ - - - - diff --git a/frontend/app/features/content/pages/contents/contents-filters-page.component.scss b/frontend/app/features/content/pages/contents/contents-filters-page.component.scss index fed91c194..d2ed5db4c 100644 --- a/frontend/app/features/content/pages/contents/contents-filters-page.component.scss +++ b/frontend/app/features/content/pages/contents/contents-filters-page.component.scss @@ -1,10 +1,6 @@ @import '_vars'; @import '_mixins'; -.text-muted { - pointer-events: none; -} - .status { @include truncate; } \ No newline at end of file diff --git a/frontend/app/features/content/pages/contents/contents-page.component.scss b/frontend/app/features/content/pages/contents/contents-page.component.scss index 2f1b55277..4687816d8 100644 --- a/frontend/app/features/content/pages/contents/contents-page.component.scss +++ b/frontend/app/features/content/pages/contents/contents-page.component.scss @@ -1,21 +1,15 @@ @import '_vars'; @import '_mixins'; -:host ::ng-deep { - .search-form { - display: block; - } -} - .content { cursor: pointer; } .table-container { display: inline-block; + min-width: 100%; padding: 0; padding-right: 1.5rem; - min-width: 100%; } .icon-plus { @@ -28,6 +22,6 @@ .selection { background: $color-theme-secondary; - border-bottom: 2px solid $color-border; + border-bottom: 1px solid $color-border; padding: .25 * $panel-padding $panel-padding; } \ No newline at end of file diff --git a/frontend/app/features/content/pages/schemas/schemas-page.component.scss b/frontend/app/features/content/pages/schemas/schemas-page.component.scss index a6d275dc0..fbb752506 100644 --- a/frontend/app/features/content/pages/schemas/schemas-page.component.scss +++ b/frontend/app/features/content/pages/schemas/schemas-page.component.scss @@ -1,17 +1,2 @@ @import '_vars'; -@import '_mixins'; - -.panel-header { - min-height: 8rem; - max-height: 8rem; -} - -.nav-link { - position: relative; - padding-top: .6rem; - padding-bottom: .6rem; -} - -.icon-angle-right { - @include absolute(14px, 2rem, auto, auto); -} \ No newline at end of file +@import '_mixins'; \ No newline at end of file diff --git a/frontend/app/features/content/shared/array-editor.component.scss b/frontend/app/features/content/shared/array-editor.component.scss index 35dbb6684..b08fbfc17 100644 --- a/frontend/app/features/content/shared/array-editor.component.scss +++ b/frontend/app/features/content/shared/array-editor.component.scss @@ -3,10 +3,10 @@ .array-container { background: $color-border; + margin-bottom: 1rem; padding: 1rem; padding-bottom: 1px; position: relative; - margin-bottom: 1rem; } .item { diff --git a/frontend/app/features/content/shared/array-item.component.scss b/frontend/app/features/content/shared/array-item.component.scss index 1ed7a51ec..f07387916 100644 --- a/frontend/app/features/content/shared/array-item.component.scss +++ b/frontend/app/features/content/shared/array-item.component.scss @@ -20,9 +20,8 @@ } .header-index { + @include force-width(3rem); display: inline-block; - min-width: 3rem; - max-width: 3rem; } } diff --git a/frontend/app/features/content/shared/assets-editor.component.scss b/frontend/app/features/content/shared/assets-editor.component.scss index 1ba9e507b..6734b4757 100644 --- a/frontend/app/features/content/shared/assets-editor.component.scss +++ b/frontend/app/features/content/shared/assets-editor.component.scss @@ -9,11 +9,11 @@ &-container { & { background: $color-background; + height: $asset-height + 2rem; overflow-x: hidden; overflow-y: scroll; padding: 1rem; padding-bottom: 0; - height: $asset-height + 2rem; } } } @@ -34,16 +34,16 @@ .drop-area { & { - @include transition(border-color .4s ease); @include border-radius; @include truncate-nowidth; border: 2px dashed darken($color-border, 10%); - padding: 5px .5rem; - font-weight: normal; - font-size: 1rem; - text-align: center; color: darken($color-border, 30%); cursor: pointer; + font-size: 1rem; + font-weight: normal; + padding: 5px .5rem; + text-align: center; + transition: border-color .4s ease; } &:hover { @@ -56,8 +56,8 @@ &.drag { border-color: darken($color-border, 15%); - cursor: copy; color: darken($color-border, 40%); + cursor: copy; text-decoration: none; } } diff --git a/frontend/app/features/content/shared/content-status.component.html b/frontend/app/features/content/shared/content-status.component.html index 539c10987..4c6afcc37 100644 --- a/frontend/app/features/content/shared/content-status.component.html +++ b/frontend/app/features/content/shared/content-status.component.html @@ -1,5 +1,5 @@ - + diff --git a/frontend/app/features/content/shared/content-status.component.scss b/frontend/app/features/content/shared/content-status.component.scss index ca2b22755..1d78232ef 100644 --- a/frontend/app/features/content/shared/content-status.component.scss +++ b/frontend/app/features/content/shared/content-status.component.scss @@ -13,14 +13,4 @@ &-label { color: $color-text; } - - &-tooltip { - @include border-radius; - background: $color-tooltip; - border: 0; - font-size: .9rem; - font-weight: normal; - color: $color-dark-foreground; - padding: .75rem; - } } \ No newline at end of file diff --git a/frontend/app/features/content/shared/content.component.scss b/frontend/app/features/content/shared/content.component.scss index 820f3c721..8f71e59ca 100644 --- a/frontend/app/features/content/shared/content.component.scss +++ b/frontend/app/features/content/shared/content.component.scss @@ -8,12 +8,10 @@ .edit-menu { @include absolute(.75rem, auto, auto, .25rem); + background: $color-table-background; border-right: 1px solid $color-border; - min-height: 2.4rem; - max-height: 2.4rem; padding-right: 1rem; white-space: nowrap; - background: $color-table-background; z-index: 100; } } \ No newline at end of file diff --git a/frontend/app/features/content/shared/contents-selector.component.scss b/frontend/app/features/content/shared/contents-selector.component.scss index e63fb2c3a..45537634d 100644 --- a/frontend/app/features/content/shared/contents-selector.component.scss +++ b/frontend/app/features/content/shared/contents-selector.component.scss @@ -16,15 +16,14 @@ .form-control { @include absolute(-.4rem, auto, auto, 0); - max-width: 300px; - min-width: 300px; + @include force-width(300px); color: $color-dark-foreground; } } .table-container { display: inline-block; + min-width: 100%; padding: 0; padding-right: 1.5rem; - min-width: 100%; } \ No newline at end of file diff --git a/frontend/app/features/content/shared/field-editor.component.html b/frontend/app/features/content/shared/field-editor.component.html index 071e2566c..0970a8773 100644 --- a/frontend/app/features/content/shared/field-editor.component.html +++ b/frontend/app/features/content/shared/field-editor.component.html @@ -4,7 +4,7 @@ {{field.displayName}} {{displaySuffix}} * - Disabled + Disabled diff --git a/frontend/app/features/content/shared/field-editor.component.scss b/frontend/app/features/content/shared/field-editor.component.scss index 206e9cf54..f363be204 100644 --- a/frontend/app/features/content/shared/field-editor.component.scss +++ b/frontend/app/features/content/shared/field-editor.component.scss @@ -19,12 +19,12 @@ } &-separator { - color: lighten($color-text, 20%); border-bottom: 1px solid darken($color-border, 5%); + color: lighten($color-text, 20%); font-size: 1.3rem; font-weight: normal; - padding: .25rem 0; - margin-top: 1.5rem; margin-bottom: 0; + margin-top: 1.5rem; + padding: .25rem 0; } } \ No newline at end of file diff --git a/frontend/app/features/content/shared/reference-item.component.scss b/frontend/app/features/content/shared/reference-item.component.scss index 868a1423c..c61e3cdfa 100644 --- a/frontend/app/features/content/shared/reference-item.component.scss +++ b/frontend/app/features/content/shared/reference-item.component.scss @@ -3,24 +3,16 @@ .reference-edit { & { + @include hover-visible('.reference-menu'); position: relative; } - &:hover { - .reference-menu { - display: block; - } - } - .reference-menu { @include absolute(0, -.25rem, auto, auto); + background: $color-table-background; border-left: 1px solid $color-border; - display: none; - min-height: 2.4rem; - max-height: 2.4rem; padding-left: 1rem; white-space: nowrap; - background: $color-table-background; } } diff --git a/frontend/app/features/content/shared/references-editor.component.scss b/frontend/app/features/content/shared/references-editor.component.scss index c7ed7fd10..91fbf4c99 100644 --- a/frontend/app/features/content/shared/references-editor.component.scss +++ b/frontend/app/features/content/shared/references-editor.component.scss @@ -6,33 +6,33 @@ } .invalid { - padding: 2rem; + color: darken($color-border, 30%); font-size: 1.2rem; font-weight: normal; + padding: 2rem; text-align: center; - color: darken($color-border, 30%); } .references-container { background: $color-background; + max-height: 20rem; + min-height: 6rem; overflow-x: hidden; overflow-y: auto; padding: 1rem; - min-height: 6rem; - max-height: 20rem; } .drop-area { & { - @include transition(border-color .4s ease); @include border-radius; border: 2px dashed darken($color-border, 10%); + color: darken($color-border, 30%); + cursor: pointer; font-size: 1.2rem; font-weight: normal; - text-align: center; padding: 1rem; - cursor: pointer; - color: darken($color-border, 30%); + text-align: center; + transition: border-color .4s ease; } &:hover { diff --git a/frontend/app/features/dashboard/pages/dashboard-page.component.scss b/frontend/app/features/dashboard/pages/dashboard-page.component.scss index 1b5d18fe4..487878184 100644 --- a/frontend/app/features/dashboard/pages/dashboard-page.component.scss +++ b/frontend/app/features/dashboard/pages/dashboard-page.component.scss @@ -12,9 +12,9 @@ } &-inner { + max-width: 75rem; padding: 2rem; padding-right: 1rem; - max-width: 75rem; } } @@ -25,8 +25,8 @@ :host ::ng-deep { canvas { height: 12rem !important; - margin-top: -1rem; margin-bottom: 0; + margin-top: -1rem; } } @@ -38,12 +38,11 @@ .card { & { - margin-right: 1rem; + @include force-height(16rem); + float: left; margin-bottom: 1rem; + margin-right: 1rem; width: 16rem; - min-height: 16rem; - max-height: 16rem; - float: left; } &-lg { @@ -60,14 +59,14 @@ &-text { color: $color-text-decent; - font-weight: normal; font-size: .9rem; + font-weight: normal; } &-title { color: $color-title; - font-weight: light; font-size: 1.2rem; + font-weight: light; margin-top: 1rem; } @@ -103,7 +102,7 @@ &-value { font-size: 3rem; - margin-top: 1rem; margin-bottom: .5rem; + margin-top: 1rem; } } \ No newline at end of file diff --git a/frontend/app/features/rules/pages/events/rule-events-page.component.scss b/frontend/app/features/rules/pages/events/rule-events-page.component.scss index 5b1f0ba5c..9714b2f2b 100644 --- a/frontend/app/features/rules/pages/events/rule-events-page.component.scss +++ b/frontend/app/features/rules/pages/events/rule-events-page.component.scss @@ -11,21 +11,21 @@ h3 { } &-dump { - margin-top: 1rem; font-family: monospace; font-size: .8rem; font-weight: normal; height: 20rem; + margin-top: 1rem; } &-header { & { - padding: .75rem 1.25rem; - position: relative; background: $color-border; border: 0; margin: -.75rem -1.25rem; margin-bottom: 1rem; + padding: .75rem 1.25rem; + position: relative; } &::before { diff --git a/frontend/app/features/rules/pages/rules/rule-element.component.scss b/frontend/app/features/rules/pages/rules/rule-element.component.scss index 2bb9bc0c1..3f6119d72 100644 --- a/frontend/app/features/rules/pages/rules/rule-element.component.scss +++ b/frontend/app/features/rules/pages/rules/rule-element.component.scss @@ -3,9 +3,9 @@ .small { & { - @include transition(background-color .4s ease); height: 3rem; position: relative; + transition: background-color .4s ease; } &.editable { @@ -16,26 +16,25 @@ @include absolute(0, 0, 0, 3rem); @include truncate; color: $color-dark-foreground; - line-height: 3rem; font-size: 1rem; font-weight: normal; + line-height: 3rem; padding: 0 .8rem; } &-icon { @include absolute(0, auto, 0, 0); color: $color-dark-foreground; - line-height: 3.2rem; font-size: 1.2rem; font-weight: normal; + line-height: 3.2rem; padding: 0 .8rem; } } .large { & { - min-height: 100px; - max-height: 100px; + @include force-height(100px); } &.editable { @@ -47,23 +46,23 @@ } &-title { - font-weight: bold; font-size: 1rem; + font-weight: bold; line-height: 1; } &-text { font-size: .8rem; - margin-top: .25rem; margin-bottom: .25rem; + margin-top: .25rem; } &-icon { color: $color-dark-foreground; display: inline-block; + line-height: 1px; margin-right: .5rem; - position: relative; padding: 1rem; - line-height: 1px; + position: relative; } } \ No newline at end of file diff --git a/frontend/app/features/rules/pages/rules/rule.component.scss b/frontend/app/features/rules/pages/rules/rule.component.scss index 669137560..65ee99bc7 100644 --- a/frontend/app/features/rules/pages/rules/rule.component.scss +++ b/frontend/app/features/rules/pages/rules/rule.component.scss @@ -3,8 +3,8 @@ .card { & { - @include border-radius(0); border-bottom-width: 2px; + border-radius: 0; border-top-width: 0; margin-bottom: .25rem; } @@ -16,12 +16,11 @@ &-footer { background: $color-theme-secondary; - font-weight: normal; font-size: 90%; + font-weight: normal; } } .col-last { - min-width: 80px; - max-width: 80px; + @include force-width(80px); } \ No newline at end of file diff --git a/frontend/app/features/rules/pages/rules/triggers/content-changed-trigger.component.scss b/frontend/app/features/rules/pages/rules/triggers/content-changed-trigger.component.scss index 0f21fbc94..858cd09ff 100644 --- a/frontend/app/features/rules/pages/rules/triggers/content-changed-trigger.component.scss +++ b/frontend/app/features/rules/pages/rules/triggers/content-changed-trigger.component.scss @@ -3,8 +3,8 @@ .section { border-top: 1px solid $color-border; - padding-top: 1rem; padding-bottom: 1rem; + padding-top: 1rem; } .form-check { diff --git a/frontend/app/features/schemas/pages/schema/field.component.scss b/frontend/app/features/schemas/pages/schema/field.component.scss index 894871e4d..0dad76061 100644 --- a/frontend/app/features/schemas/pages/schema/field.component.scss +++ b/frontend/app/features/schemas/pages/schema/field.component.scss @@ -17,9 +17,9 @@ $padding: 1rem; } .table-items-row-summary { - position: relative; - padding-right: 1.25rem; padding-left: 3rem; + padding-right: 1.25rem; + position: relative; } .drag-container { @@ -39,12 +39,12 @@ $padding: 1rem; } .nested-fields { + background: $color-theme-secondary; + border: 1px solid $color-border; + border-top-width: 0; padding: $padding; padding-left: 2 * $padding; position: relative; - border: 1px solid $color-border; - border-top-width: 0; - background: $color-theme-secondary; } .nested-field { @@ -54,8 +54,8 @@ $padding: 1rem; &-add { border: 2px dashed $field-line; - position: relative; padding: 1rem; + position: relative; } &-line-v { @@ -79,10 +79,10 @@ $padding: 1rem; } &-icon { - margin-right: 1rem; color: $color-border-dark; font-size: 1.2rem; font-weight: normal; + margin-right: 1rem; vertical-align: middle; } @@ -96,13 +96,13 @@ $padding: 1rem; &-partitioning { color: $color-text-decent; - font-weight: normal; font-size: .85rem; + font-weight: normal; } .tag { - @include opacity(.9); - min-width: 4rem; max-width: 6rem; + min-width: 4rem; + opacity: .9; } } \ No newline at end of file diff --git a/frontend/app/features/schemas/pages/schema/schema-export-form.component.scss b/frontend/app/features/schemas/pages/schema/schema-export-form.component.scss index 220b21514..9f8d22053 100644 --- a/frontend/app/features/schemas/pages/schema/schema-export-form.component.scss +++ b/frontend/app/features/schemas/pages/schema/schema-export-form.component.scss @@ -4,9 +4,9 @@ :host, .inner-form, .inner-main { - @include flex-box; - @include flex-grow(1); - @include flex-direction(column); + display: flex; + flex-direction: column; + flex-grow: 1; } .inner-header, diff --git a/frontend/app/features/schemas/pages/schema/schema-fields.component.scss b/frontend/app/features/schemas/pages/schema/schema-fields.component.scss index b07a07549..7b7990804 100644 --- a/frontend/app/features/schemas/pages/schema/schema-fields.component.scss +++ b/frontend/app/features/schemas/pages/schema/schema-fields.component.scss @@ -2,10 +2,10 @@ @import '_mixins'; :host { + overflow-x: hidden; + overflow-y: auto; padding: $panel-padding; padding-bottom: 8rem; - overflow-y: auto; - overflow-x: hidden; } .field-button { diff --git a/frontend/app/features/schemas/pages/schema/schema-page.component.scss b/frontend/app/features/schemas/pages/schema/schema-page.component.scss index afcd1649a..8d0a3c7eb 100644 --- a/frontend/app/features/schemas/pages/schema/schema-page.component.scss +++ b/frontend/app/features/schemas/pages/schema/schema-page.component.scss @@ -4,13 +4,13 @@ .btn-publishing { &.disabled, &:disabled { - @include opacity(1); + opacity: 1; } } .cards { - padding: $panel-padding; overflow-y: auto; + padding: $panel-padding; } .nav-tabs2 { diff --git a/frontend/app/features/schemas/pages/schema/schema-preview-urls-form.component.scss b/frontend/app/features/schemas/pages/schema/schema-preview-urls-form.component.scss index d52d903a6..3724160b0 100644 --- a/frontend/app/features/schemas/pages/schema/schema-preview-urls-form.component.scss +++ b/frontend/app/features/schemas/pages/schema/schema-preview-urls-form.component.scss @@ -11,10 +11,9 @@ } .col-options { - min-width: 6rem; + @include force-width(6rem); } .col-name { - min-width: 14rem; - max-width: 14rem; + @include force-width(14rem); } \ No newline at end of file diff --git a/frontend/app/features/schemas/pages/schema/schema-scripts-form.component.scss b/frontend/app/features/schemas/pages/schema/schema-scripts-form.component.scss index 220b21514..9f8d22053 100644 --- a/frontend/app/features/schemas/pages/schema/schema-scripts-form.component.scss +++ b/frontend/app/features/schemas/pages/schema/schema-scripts-form.component.scss @@ -4,9 +4,9 @@ :host, .inner-form, .inner-main { - @include flex-box; - @include flex-grow(1); - @include flex-direction(column); + display: flex; + flex-direction: column; + flex-grow: 1; } .inner-header, diff --git a/frontend/app/features/schemas/pages/schema/schema-ui-form.component.scss b/frontend/app/features/schemas/pages/schema/schema-ui-form.component.scss index d28bf56d4..4ffde1f88 100644 --- a/frontend/app/features/schemas/pages/schema/schema-ui-form.component.scss +++ b/frontend/app/features/schemas/pages/schema/schema-ui-form.component.scss @@ -4,9 +4,9 @@ :host, .inner-form, .inner-main { - @include flex-box; - @include flex-grow(1); - @include flex-direction(column); + display: flex; + flex-direction: column; + flex-grow: 1; } .inner-header, diff --git a/frontend/app/features/schemas/pages/schema/types/string-validation.component.scss b/frontend/app/features/schemas/pages/schema/types/string-validation.component.scss index 4ce16a3c9..4d9a2db97 100644 --- a/frontend/app/features/schemas/pages/schema/types/string-validation.component.scss +++ b/frontend/app/features/schemas/pages/schema/types/string-validation.component.scss @@ -14,8 +14,8 @@ .control-dropdown { & { max-width: 285px; - min-width: 200px; min-height: 220px; + min-width: 200px; } h4 { diff --git a/frontend/app/features/schemas/pages/schemas/schema-form.component.scss b/frontend/app/features/schemas/pages/schemas/schema-form.component.scss index 89be2f494..6e51df9be 100644 --- a/frontend/app/features/schemas/pages/schemas/schema-form.component.scss +++ b/frontend/app/features/schemas/pages/schemas/schema-form.component.scss @@ -4,8 +4,8 @@ $icon-size: 4.5rem; .btn-text { - margin-top: -1rem; margin-left: -.5rem; + margin-top: -1rem; } .form-group { @@ -32,16 +32,17 @@ $icon-size: 4.5rem; &-icon { & { @include border-radius; - height: $icon-size; + background: transparent; + border: 1px solid $color-border; color: $color-theme-blue; cursor: pointer; - border: 1px solid $color-border; - background: transparent; - margin-right: .5rem; - line-height: $icon-size; font-size: 1.75rem; font-weight: normal; + height: $icon-size; + line-height: $icon-size; + margin-right: .5rem; text-align: center; + text-decoration: none; width: $icon-size; } diff --git a/frontend/app/features/schemas/pages/schemas/schemas-page.component.scss b/frontend/app/features/schemas/pages/schemas/schemas-page.component.scss index 5a29b59c7..f2917dfb1 100644 --- a/frontend/app/features/schemas/pages/schemas/schemas-page.component.scss +++ b/frontend/app/features/schemas/pages/schemas/schemas-page.component.scss @@ -4,27 +4,24 @@ $button-size: calc(2.5rem - 2px); .subheader-button { + @include force-width($button-size); + font-size: 1rem; height: $button-size; + line-height: 2.5rem; margin-right: .4rem; - min-width: $button-size; - max-width: $button-size; padding: 0; - padding-left: 0; - padding-right: 0; - font-size: 1rem; - line-height: 2.5rem; } .new-category-input { & { - margin-top: 1rem; background: 0; - border-width: 0; border-bottom-width: 1px; + border-width: 0; + margin-top: 1rem; padding-left: 0; } &:focus { - @include box-shadow-none; + box-shadow: none; } } \ No newline at end of file diff --git a/frontend/app/features/settings/pages/clients/client-connect-form.component.scss b/frontend/app/features/settings/pages/clients/client-connect-form.component.scss index aa6cb75f6..a93f684b8 100644 --- a/frontend/app/features/settings/pages/clients/client-connect-form.component.scss +++ b/frontend/app/features/settings/pages/clients/client-connect-form.component.scss @@ -3,8 +3,8 @@ .badge { @include circle(1.3rem); - margin-right: .25rem; font-size: 80%; + margin-right: .25rem; padding-left: 0; padding-right: 0; vertical-align: top; @@ -20,12 +20,12 @@ .option { @include border-radius; - cursor: pointer; background: none; border: 1px solid $color-border; + cursor: pointer; + margin-top: .5rem; padding: 1rem; position: relative; - margin-top: .5rem; &:hover { border-color: darken($color-border, 10%); @@ -33,16 +33,16 @@ i { @include absolute(1.6rem, 1rem, auto, auto); + color: $color-border; font-size: 1.8rem; font-weight: 300; - color: $color-border; } } .access-token { - height: 10rem; + font-family: monospace; font-size: 1rem; font-weight: normal; - font-family: monospace; + height: 10rem; resize: none; } \ No newline at end of file diff --git a/frontend/app/features/settings/pages/contributors/contributor-add-form.component.html b/frontend/app/features/settings/pages/contributors/contributor-add-form.component.html index 761b717a8..5fc33f1b7 100644 --- a/frontend/app/features/settings/pages/contributors/contributor-add-form.component.html +++ b/frontend/app/features/settings/pages/contributors/contributor-add-form.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/frontend/app/features/settings/pages/contributors/contributor-add-form.component.scss b/frontend/app/features/settings/pages/contributors/contributor-add-form.component.scss index dfcfab111..55a7f9849 100644 --- a/frontend/app/features/settings/pages/contributors/contributor-add-form.component.scss +++ b/frontend/app/features/settings/pages/contributors/contributor-add-form.component.scss @@ -12,7 +12,7 @@ } .table-items-header { - border-width: 0; - border-bottom-width: 2px; + border: 0; + border-bottom: 2px solid $color-border; margin: 0; } \ No newline at end of file diff --git a/frontend/app/features/settings/pages/languages/language.component.scss b/frontend/app/features/settings/pages/languages/language.component.scss index 674c37356..3c5f53ab9 100644 --- a/frontend/app/features/settings/pages/languages/language.component.scss +++ b/frontend/app/features/settings/pages/languages/language.component.scss @@ -17,19 +17,19 @@ $field-header: #e7ebef; &-languages { @include border-radius; background: $color-border; - border-top: .5rem solid $color-border; border-bottom: 1px solid $color-border; + border-top: .5rem solid $color-border; padding: 0 .5rem; } &-language { @include border-radius(2px); - padding: .5rem; background: $color-dark-foreground; border: 0; + line-height: 2rem; margin: 0; margin-bottom: .5rem; - line-height: 2rem; + padding: .5rem; } &-label { diff --git a/frontend/app/features/settings/pages/more/more-page.component.scss b/frontend/app/features/settings/pages/more/more-page.component.scss index d35443598..eaacb7164 100644 --- a/frontend/app/features/settings/pages/more/more-page.component.scss +++ b/frontend/app/features/settings/pages/more/more-page.component.scss @@ -3,9 +3,9 @@ .app { &-image { - position: relative; - min-width: 150px; min-height: 150px; + min-width: 150px; + position: relative; } &-image-remove { @@ -24,17 +24,17 @@ @mixin overlay { & { - @include transition(opacity .4s ease); @include absolute(0, 0, 0, 0); - @include opacity(0); - @include flex-box; color: $color-dark-foreground; + display: flex; + opacity: 0; + transition: opacity .4s ease; } &-background { @include absolute(0, 0, 0, 0); - @include opacity(.7); background: $color-dark-black; + opacity: .7; } } @@ -55,15 +55,15 @@ } &-text { - position: absolute; font-size: 1.25rem; font-weight: lighter; + position: absolute; } } .drag { .drop-overlay { - @include opacity(1); + opacity: 1; } .app-image-remove { diff --git a/frontend/app/features/settings/pages/patterns/pattern.component.scss b/frontend/app/features/settings/pages/patterns/pattern.component.scss index d0064ba3d..d86c13db6 100644 --- a/frontend/app/features/settings/pages/patterns/pattern.component.scss +++ b/frontend/app/features/settings/pages/patterns/pattern.component.scss @@ -2,11 +2,10 @@ @import '_mixins'; .col-options { - min-width: 6rem; + @include force-width(6rem); } .col-name, .col-message { - min-width: 10rem; - max-width: 10rem; + @include force-width(10rem); } \ No newline at end of file diff --git a/frontend/app/features/settings/pages/plans/plan.component.scss b/frontend/app/features/settings/pages/plans/plan.component.scss index 09ed842c3..7242ddf06 100644 --- a/frontend/app/features/settings/pages/plans/plan.component.scss +++ b/frontend/app/features/settings/pages/plans/plan.component.scss @@ -3,15 +3,15 @@ .plan { & { - min-width: 13rem; - max-width: 20rem; margin: .5rem; + max-width: 20rem; + min-width: 13rem; } &-price { color: $color-theme-blue; - margin-top: 0; margin-bottom: 0; + margin-top: 0; } &-selected { diff --git a/frontend/app/features/settings/pages/plans/plans-page.component.scss b/frontend/app/features/settings/pages/plans/plans-page.component.scss index 6079c4b72..cefe5d808 100644 --- a/frontend/app/features/settings/pages/plans/plans-page.component.scss +++ b/frontend/app/features/settings/pages/plans/plans-page.component.scss @@ -3,15 +3,15 @@ .plan { & { - min-width: 13rem; - max-width: 20rem; margin: .5rem; + max-width: 20rem; + min-width: 13rem; } &-price { color: $color-theme-blue; - margin-top: 0; margin-bottom: 0; + margin-top: 0; } &-selected { diff --git a/frontend/app/features/settings/pages/roles/role.component.scss b/frontend/app/features/settings/pages/roles/role.component.scss index cd34bfd31..fc0c0ecff 100644 --- a/frontend/app/features/settings/pages/roles/role.component.scss +++ b/frontend/app/features/settings/pages/roles/role.component.scss @@ -14,9 +14,9 @@ .prefix { border: 0; border-bottom: 1px solid $color-input; + color: $color-text-decent; padding-left: 0; padding-right: 0; - color: $color-text-decent; } .rule-name { diff --git a/frontend/app/features/settings/pages/workflows/workflow-step.component.scss b/frontend/app/features/settings/pages/workflows/workflow-step.component.scss index 426813d3f..48e11ccd5 100644 --- a/frontend/app/features/settings/pages/workflows/workflow-step.component.scss +++ b/frontend/app/features/settings/pages/workflows/workflow-step.component.scss @@ -17,44 +17,40 @@ } .col-arrow { - min-width: 2rem; - max-width: 2rem; + @include force-width(2rem); } .col-button { - min-width: 3rem; - max-width: 3rem; + @include force-width(3rem); } .col-step { - min-width: 10rem; - max-width: 10rem; + @include force-width(10rem); } .col-roles { - min-width: 18rem; - max-width: 18rem; + @include force-width(18rem); } .transition { & { - margin-top: .25rem; - margin-bottom: .5rem; line-height: 2.2rem; + margin-bottom: .5rem; + margin-top: .25rem; } &-to { + line-height: 1.2rem; padding: .5rem .75rem; padding-right: 0; - line-height: 1.2rem; } } } .step { & { - margin-bottom: 1.5rem; border-bottom: 1px solid $color-border; + margin-bottom: 1.5rem; } &-inner { @@ -72,16 +68,16 @@ .btn-initial { & { - visibility: hidden; line-height: 1.6rem; padding-left: 0; padding-right: 0; - width: 2rem; text-align: center; + visibility: hidden; + width: 2rem; } &:disabled { - @include opacity(1); + opacity: 1; } &.active { @@ -91,15 +87,15 @@ .transition-prevent-updates { & { - margin-top: .25rem; - margin-bottom: 1rem; line-height: 2.5rem; + margin-bottom: 1rem; + margin-top: .25rem; } &-to { + line-height: 1.2rem; padding: .5rem .75rem; padding-right: 0; - line-height: 1.2rem; } } diff --git a/frontend/app/features/settings/pages/workflows/workflow-transition.component.scss b/frontend/app/features/settings/pages/workflows/workflow-transition.component.scss index df6f1397f..c7f0dcea7 100644 --- a/frontend/app/features/settings/pages/workflows/workflow-transition.component.scss +++ b/frontend/app/features/settings/pages/workflows/workflow-transition.component.scss @@ -3,11 +3,11 @@ .select-placeholder { @include absolute(0, 0, 0, 0); + border: 1px solid transparent; color: $color-theme-secondary; + line-height: 1.2rem; padding: .5rem .75rem; pointer-events: none; - line-height: 1.2rem; - border: 1px solid transparent; } .form-control { diff --git a/frontend/app/features/settings/pages/workflows/workflow.component.scss b/frontend/app/features/settings/pages/workflows/workflow.component.scss index b39e484f1..bccddffa8 100644 --- a/frontend/app/features/settings/pages/workflows/workflow.component.scss +++ b/frontend/app/features/settings/pages/workflows/workflow.component.scss @@ -14,13 +14,11 @@ } .col-form-label { - min-width: 4rem; - max-width: 4rem; + @include force-width(4rem); } .col-tags { - padding: .6rem 1rem; - padding-bottom: 0; + padding: .6rem 1rem 0; } .form-group { diff --git a/frontend/app/features/settings/settings-area.component.scss b/frontend/app/features/settings/settings-area.component.scss index b559c6580..84549cd07 100644 --- a/frontend/app/features/settings/settings-area.component.scss +++ b/frontend/app/features/settings/settings-area.component.scss @@ -2,9 +2,9 @@ @import '_mixins'; .nav-link { - position: relative; - padding-top: .6rem; padding-bottom: .6rem; + padding-top: .6rem; + position: relative; } .header-link { diff --git a/frontend/app/framework/angular/code.component.scss b/frontend/app/framework/angular/code.component.scss index 2046ad9a3..84af62494 100644 --- a/frontend/app/framework/angular/code.component.scss +++ b/frontend/app/framework/angular/code.component.scss @@ -3,17 +3,17 @@ .code { background: $color-code-background; + margin: .25rem 0; padding-left: .5rem; padding-right: 3rem; - margin: .25rem 0; } .code, .code-copy { font-size: .8rem; - padding-top: .25rem; - padding-bottom: .25rem; min-height: 27px; + padding-bottom: .25rem; + padding-top: .25rem; } .copy-container { @@ -23,11 +23,11 @@ .code-copy { & { @include absolute(0, 0, auto, auto); - border: 0; background: darken($color-border-dark, 30%); + border: 0; + color: $color-dark-foreground; padding-left: .375rem; padding-right: .375rem; - color: $color-dark-foreground; } &:focus { diff --git a/frontend/app/framework/angular/external-link.directive.ts b/frontend/app/framework/angular/external-link.directive.ts index 2f758a5b1..5c9533789 100644 --- a/frontend/app/framework/angular/external-link.directive.ts +++ b/frontend/app/framework/angular/external-link.directive.ts @@ -21,16 +21,18 @@ export class ExternalLinkDirective implements AfterViewInit { } public ngAfterViewInit() { - this.renderer.setProperty(this.element.nativeElement, 'target', '_blank'); - this.renderer.setProperty(this.element.nativeElement, 'rel', 'noopener'); + const element = this.element.nativeElement; + + this.renderer.setProperty(element, 'target', '_blank'); + this.renderer.setProperty(element, 'rel', 'noopener'); if (this.type !== 'noicon') { const icon = this.renderer.createElement('i'); this.renderer.addClass(icon, 'icon-external-link'); - this.renderer.addClass(icon, 'ml-1'); - this.renderer.appendChild(this.element.nativeElement, icon); + this.renderer.appendChild(element, this.renderer.createText(' ')); + this.renderer.appendChild(element, icon); } } } \ No newline at end of file diff --git a/frontend/app/framework/angular/forms/checkbox-group.component.scss b/frontend/app/framework/angular/forms/checkbox-group.component.scss index 773582ba7..ae6844c67 100644 --- a/frontend/app/framework/angular/forms/checkbox-group.component.scss +++ b/frontend/app/framework/angular/forms/checkbox-group.component.scss @@ -3,8 +3,8 @@ .form-check { display: block; - margin-left: 0; margin-bottom: .5rem; + margin-left: 0; } .form-check-input { diff --git a/frontend/app/framework/angular/forms/control-errors.component.scss b/frontend/app/framework/angular/forms/control-errors.component.scss index 7308d860c..cb1f07fcd 100644 --- a/frontend/app/framework/angular/forms/control-errors.component.scss +++ b/frontend/app/framework/angular/forms/control-errors.component.scss @@ -2,7 +2,6 @@ @import '_vars'; :host { + @include force-width(100%); align-self: flex-start; - min-width: 100%; - max-width: 100%; } \ No newline at end of file diff --git a/frontend/app/framework/angular/forms/date-time-editor.component.scss b/frontend/app/framework/angular/forms/date-time-editor.component.scss index 1a009a5e9..363464f90 100644 --- a/frontend/app/framework/angular/forms/date-time-editor.component.scss +++ b/frontend/app/framework/angular/forms/date-time-editor.component.scss @@ -23,8 +23,8 @@ .input-group { .form-control { &:last-child { - position: relative; padding-right: 2rem; + position: relative; } } @@ -47,6 +47,6 @@ } &:focus { - @include box-shadow-none; + box-shadow: none; } } \ No newline at end of file diff --git a/frontend/app/framework/angular/forms/dropdown.component.scss b/frontend/app/framework/angular/forms/dropdown.component.scss index 33057fafb..0a5e383da 100644 --- a/frontend/app/framework/angular/forms/dropdown.component.scss +++ b/frontend/app/framework/angular/forms/dropdown.component.scss @@ -22,28 +22,28 @@ $color-input-disabled: #eef1f4; } .control-dropdown { - max-width: 40rem; max-height: none; + max-width: 40rem; overflow-y: hidden; } .control-dropdown-items { - overflow-y: auto; max-height: 15rem; + overflow-y: auto; } .selection { & { - position: relative; overflow: hidden; + position: relative; } .control-dropdown-item { @include absolute(0, 1rem, 0, 0); + line-height: 1.2rem; padding-bottom: 0; pointer-events: none; position: absolute; - line-height: 1.2rem; } .icon-caret-down { diff --git a/frontend/app/framework/angular/forms/editable-title.component.scss b/frontend/app/framework/angular/forms/editable-title.component.scss index 8546568ef..b59469469 100644 --- a/frontend/app/framework/angular/forms/editable-title.component.scss +++ b/frontend/app/framework/angular/forms/editable-title.component.scss @@ -3,41 +3,28 @@ .title { & { + @include hover-visible('.title-edit', inline); position: relative; } &-edit { color: $color-border-dark; - display: none; - font-size: .9rem; - font-weight: normal; + cursor: pointer; padding: .6rem .25rem; - border: 0; - background: transparent; - vertical-align: baseline; } &-name { - font-family: -apple-system, system-ui, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif; + display: inline; font-size: 1.2rem; font-weight: normal; - display: inline; - margin: 0; } &-view { @include truncate; + border-bottom: 1px solid transparent; + border-top: 0; padding: .375rem 0; position: absolute; - border-top: 0; - border-bottom: 1px solid transparent; - line-height: 1.5rem; - } - - &:hover { - .title-edit { - display: inline; - } } } diff --git a/frontend/app/framework/angular/forms/iframe-editor.component.scss b/frontend/app/framework/angular/forms/iframe-editor.component.scss index a095b5177..e3678801d 100644 --- a/frontend/app/framework/angular/forms/iframe-editor.component.scss +++ b/frontend/app/framework/angular/forms/iframe-editor.component.scss @@ -2,7 +2,7 @@ @import '_vars'; iframe { - border: 0; background: 0; + border: 0; overflow: hidden; } \ No newline at end of file diff --git a/frontend/app/framework/angular/forms/json-editor.component.scss b/frontend/app/framework/angular/forms/json-editor.component.scss index b2bd14707..f0c225b44 100644 --- a/frontend/app/framework/angular/forms/json-editor.component.scss +++ b/frontend/app/framework/angular/forms/json-editor.component.scss @@ -7,7 +7,6 @@ $editor-height: 30rem; :host ::ng-deep { .ace_editor { - background: $color-dark-foreground; border: 1px solid $color-input; &.no-border { diff --git a/frontend/app/framework/angular/forms/stars.component.scss b/frontend/app/framework/angular/forms/stars.component.scss index 324a3ee10..557ae22af 100644 --- a/frontend/app/framework/angular/forms/stars.component.scss +++ b/frontend/app/framework/angular/forms/stars.component.scss @@ -9,9 +9,6 @@ $color-gold: #ffd700; .stars { & { - display: inline-block; - border: 0; - height: 2.4rem; line-height: 2.4rem; } @@ -26,17 +23,16 @@ $color-gold: #ffd700; .star { & { - background: transparent; - border: 0; line-height: 1px; vertical-align: middle; } &::before { - display: inline-block; color: $color-gold; content: '☆'; + display: inline-block; font-size: 1.8rem; + font-weight: normal; line-height: 1px; } diff --git a/frontend/app/framework/angular/forms/tag-editor.component.scss b/frontend/app/framework/angular/forms/tag-editor.component.scss index 62a67411e..57c96273b 100644 --- a/frontend/app/framework/angular/forms/tag-editor.component.scss +++ b/frontend/app/framework/angular/forms/tag-editor.component.scss @@ -2,6 +2,7 @@ @import '_vars'; $focus-color: #b3d3ff; +$focus-shadow: rgba(51, 137, 255, .25); :host { text-align: left; @@ -22,8 +23,8 @@ $focus-color: #b3d3ff; } &.focus { - @include box-shadow-raw(0 0 0 .2rem rgba(51, 137, 255, .25)); border-color: $focus-color; + box-shadow: 0 0 0 .2rem $focus-shadow; } &.single-line { @@ -40,26 +41,26 @@ $focus-color: #b3d3ff; div { &.form-control { height: auto; + position: relative; text-align: left; text-decoration: none; - position: relative; } } .blank { & { @include placeholder-color($color-input-placeholder); - padding: 0; - border: 0; background: transparent; - min-width: 50px; - max-width: 100%; + border: 0; height: auto !important; + max-width: 100%; + min-width: 50px; + padding: 0; } &:focus, &.focus { - @include box-shadow-none; + box-shadow: none; outline: none; } @@ -88,15 +89,15 @@ div { .item { & { @include border-radius(10px); - color: $color-dark-foreground; - cursor: default; - padding: 1px .6rem; background: $color-theme-blue; border: 0; - height: 1.25rem; + color: $color-dark-foreground; + cursor: default; font-size: .8rem; font-weight: normal; + height: 1.25rem; margin-right: 2px; + padding: 1px .6rem; white-space: nowrap; } diff --git a/frontend/app/framework/angular/forms/toggle.component.scss b/frontend/app/framework/angular/forms/toggle.component.scss index 66bb0f905..1af4cb40a 100644 --- a/frontend/app/framework/angular/forms/toggle.component.scss +++ b/frontend/app/framework/angular/forms/toggle.component.scss @@ -10,23 +10,23 @@ $toggle-button-size: $toggle-height - .25rem; @include circle($toggle-button-size); @include box-shadow(0, 2px, 2px, .2); @include absolute($toggle-height * .5, auto, auto, $toggle-width * .5); - @include transition(left .3s ease); background: $color-dark-foreground; border: 0; margin-left: -$toggle-button-size * .5; margin-top: -$toggle-button-size * .5; + transition: left .3s ease; } &-container { & { @include border-radius($toggle-height * .5); @include box-shadow-inner; - @include transition(background-color .3s ease); - display: inline-block; - position: relative; background: lighten($color-border, 6%); border: 0; + display: inline-block; height: $toggle-height; + position: relative; + transition: background-color .3s ease; width: $toggle-width; } diff --git a/frontend/app/framework/angular/list-view.component.scss b/frontend/app/framework/angular/list-view.component.scss index 0358e3f70..2766c5663 100644 --- a/frontend/app/framework/angular/list-view.component.scss +++ b/frontend/app/framework/angular/list-view.component.scss @@ -2,9 +2,9 @@ @import '_vars'; :host { - @include flex-box; - @include flex-direction(column); - @include flex-grow(1); + display: flex; + flex-direction: column; + flex-grow: 1; overflow: hidden; padding: 0; position: relative; @@ -18,17 +18,17 @@ &-content, &-header, &-footer { - @include transition(opacity .2 ease); padding: 0 $panel-padding; + transition: opacity .2 ease; } &-content { - @include flex-grow(1); + flex-grow: 1; padding: $panel-padding; &.tabled { - padding-top: .5rem; padding-bottom: .5rem; + padding-top: .5rem; } &.normal { @@ -36,17 +36,17 @@ } &.synced { - overflow-y: auto; overflow-x: auto; + overflow-y: auto; padding-right: 0; } } &-header { & { - @include flex-shrink(0); border: 0; border-bottom: 1px solid $color-border; + flex-shrink: 0; overflow-x: hidden; overflow-y: hidden; } @@ -70,9 +70,9 @@ &-footer { & { - @include flex-shrink(1); border: 0; border-top: 1px solid $color-border; + flex-shrink: 0; } /deep/ .pagination { @@ -87,7 +87,7 @@ } .loading-indicator { - @include opacity(.5); + opacity: .5; } .loader { diff --git a/frontend/app/framework/angular/modals/dialog-renderer.component.scss b/frontend/app/framework/angular/modals/dialog-renderer.component.scss index 7b093f020..34d984da6 100644 --- a/frontend/app/framework/angular/modals/dialog-renderer.component.scss +++ b/frontend/app/framework/angular/modals/dialog-renderer.component.scss @@ -5,10 +5,9 @@ .notification-container { & { + @include force-width(30rem); + @include fixed; margin: .625rem; - max-width: 30rem; - min-width: 30rem; - position: fixed; z-index: 100000; } @@ -45,13 +44,12 @@ $caret-size: 6px; .tooltip2 { & { - color: $color-dark-foreground; background: $color-tooltip; - border: 0; + color: $color-dark-foreground; font-size: .9rem; font-weight: normal; - white-space: nowrap; padding: .5rem; + white-space: nowrap; } &-left { diff --git a/frontend/app/framework/angular/modals/modal-dialog.component.html b/frontend/app/framework/angular/modals/modal-dialog.component.html index 4d49c1370..0e24d5628 100644 --- a/frontend/app/framework/angular/modals/modal-dialog.component.html +++ b/frontend/app/framework/angular/modals/modal-dialog.component.html @@ -19,8 +19,8 @@
-