tsai
/
squidex
mirror of https://github.com/Squidex/squidex.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Color fixes.

pull/743/head
Sebastian 4 years ago
parent
9391ade004
commit
c993b975da
21 changed files with 77 additions and 79 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      frontend/app/features/administration/pages/restore/restore-page.component.scss
  2. 2
      frontend/app/features/apps/pages/onboarding-dialog.component.scss
  3. 2
      frontend/app/features/assets/pages/asset-tags.component.scss
  4. 4
      frontend/app/features/content/shared/forms/stock-photo-editor.component.scss
  5. 2
      frontend/app/features/rules/pages/rule/rule-page.component.scss
  6. 2
      frontend/app/features/rules/pages/rules/rule.component.scss
  7. 6
      frontend/app/features/schemas/pages/schemas/schema-form.component.scss
  8. 2
      frontend/app/features/settings/pages/plans/plan.component.scss
  9. 2
      frontend/app/framework/angular/forms/editors/toggle.component.scss
  10. 4
      frontend/app/shared/components/assets/asset-uploader.component.scss
  11. 2
      frontend/app/shared/components/assets/asset.component.scss
  12. 2
      frontend/app/shared/components/assets/assets-list.component.scss
  13. 2
      frontend/app/shared/components/comments/comments.component.scss
  14. 2
      frontend/app/shell/pages/internal/internal-area.component.scss
  15. 10
      frontend/app/theme/_bootstrap-vars.scss
  16. 44
      frontend/app/theme/_bootstrap.scss
  17. 14
      frontend/app/theme/_common.scss
  18. 10
      frontend/app/theme/_forms.scss
  19. 8
      frontend/app/theme/_lists.scss
  20. 10
      frontend/app/theme/_panels2.scss
  21. 24
      frontend/app/theme/_vars.scss

2
frontend/app/features/administration/pages/restore/restore-page.component.scss
View File

@ -40,7 +40,7 @@ h3 {
&-success { &-success {
@extend %default-color; @extend %default-color;
background: $color-theme-green; background: $color-theme-success;
} }
} }

2
frontend/app/features/apps/pages/onboarding-dialog.component.scss
View File

@ -48,7 +48,7 @@ p {
} }
.header-focus { .header-focus {
color: $color-theme-blue; color: $color-theme-brand;
} }
.header-left { .header-left {

2
frontend/app/features/assets/pages/asset-tags.component.scss
View File

@ -3,6 +3,6 @@
background: none; background: none;
border: 0; border: 0;
border-radius: 0; border-radius: 0;
color: $color-theme-blue; color: $color-theme-brand;
} }
} }

4
frontend/app/features/content/shared/forms/stock-photo-editor.component.scss
View File

@ -74,11 +74,11 @@ sqx-list-view {
position: relative; position: relative;
&:hover { &:hover {
border-color: $color-theme-blue; border-color: $color-theme-brand;
} }
&.selected { &.selected {
border-color: $color-theme-blue; border-color: $color-theme-brand;
} }
&-user { &-user {

2
frontend/app/features/rules/pages/rule/rule-page.component.scss
View File

@ -32,7 +32,7 @@
} }
.btn-run { .btn-run {
color: $color-theme-blue !important; color: $color-theme-brand !important;
} }
.btn-enabled { .btn-enabled {

2
frontend/app/features/rules/pages/rules/rule.component.scss
View File

@ -7,7 +7,7 @@
} }
.btn-run { .btn-run {
color: $color-theme-blue !important; color: $color-theme-brand !important;
} }
a { a {

6
frontend/app/features/schemas/pages/schemas/schema-form.component.scss
View File

@ -28,7 +28,7 @@ $icon-size: 4.5rem;
background: transparent; background: transparent;
border: 1px solid $color-border; border: 1px solid $color-border;
border-radius: $border-radius; border-radius: $border-radius;
color: $color-theme-blue; color: $color-theme-brand;
cursor: pointer; cursor: pointer;
font-size: 1.75rem; font-size: 1.75rem;
font-weight: normal; font-weight: normal;
@ -45,8 +45,8 @@ $icon-size: 4.5rem;
&.active { &.active {
@include box-shadow-outer(0, 0, 10px, .5); @include box-shadow-outer(0, 0, 10px, .5);
background: $color-theme-blue; background: $color-theme-brand;
border-color: $color-theme-blue; border-color: $color-theme-brand;
color: $color-white; color: $color-white;
&:hover { &:hover {

2
frontend/app/features/settings/pages/plans/plan.component.scss
View File

@ -1,6 +1,6 @@
.plan { .plan {
&-price { &-price {
color: $color-theme-blue; color: $color-theme-brand;
margin-bottom: 0; margin-bottom: 0;
margin-top: 0; margin-top: 0;
} }

2
frontend/app/framework/angular/forms/editors/toggle.component.scss
View File

@ -31,7 +31,7 @@ $toggle-button-size: $toggle-height - .25rem;
width: $toggle-width; width: $toggle-width;
&.checked { &.checked {
background: $color-theme-green-dark; background: $color-theme-success-dark;
.toggle-button { .toggle-button {
left: $toggle-height * .5; left: $toggle-height * .5;

4
frontend/app/shared/components/assets/asset-uploader.component.scss
View File

@ -60,12 +60,12 @@ $circle-size: 1.6rem;
} }
&-success { &-success {
background: $color-theme-green; background: $color-theme-success;
} }
} }
.drag { .drag {
& > .uploads { & > .uploads {
border-color: $color-theme-blue; border-color: $color-theme-brand;
} }
} }

2
frontend/app/shared/components/assets/asset.component.scss
View File

@ -178,7 +178,7 @@ $list-height: 2.25rem;
width: 4px; width: 4px;
&.selected { &.selected {
background: $color-theme-blue; background: $color-theme-brand;
} }
} }

2
frontend/app/shared/components/assets/assets-list.component.scss
View File

@ -24,7 +24,7 @@ h5 {
&-over { &-over {
@include absolute(-6px, -6px, -6px, -6px); @include absolute(-6px, -6px, -6px, -6px);
border: 2px solid $color-theme-blue; border: 2px solid $color-theme-brand;
opacity: 0; opacity: 0;
} }

2
frontend/app/shared/components/comments/comments.component.scss
View File

@ -4,7 +4,7 @@
} }
.mention-active > a { .mention-active > a {
background: $color-theme-blue !important; background: $color-theme-brand !important;
} }
} }

2
frontend/app/shell/pages/internal/internal-area.component.scss
View File

@ -5,7 +5,7 @@
.navbar-brand { .navbar-brand {
@include absolute(0, null, 0, 0); @include absolute(0, null, 0, 0);
background: $color-theme-blue; background: $color-theme-brand;
color: $color-white !important; color: $color-white !important;
cursor: pointer; cursor: pointer;
font-size: 1.8rem; font-size: 1.8rem;

10
frontend/app/theme/_bootstrap-vars.scss
View File

@ -30,13 +30,14 @@ $text-muted: $color-text-decent;
$min-contrast-ratio: 1.5; $min-contrast-ratio: 1.5;
// Primary color. // Primary color.
$primary: $color-theme-blue; $primary: $color-theme-brand;
// Theme colors. // Theme colors.
$danger: $color-theme-error; $danger: $color-theme-error;
$info: $color-theme-info;
$secondary: $color-theme-secondary; $secondary: $color-theme-secondary;
$success: $color-theme-green; $success: $color-theme-success;
$warning: $color-theme-orange; $warning: $color-theme-warning;
// Background. // Background.
$body-bg: $color-background; $body-bg: $color-background;
@ -55,6 +56,7 @@ $btn-white-space: nowrap;
// Alerts // Alerts
$alert-color-scale: -100%; $alert-color-scale: -100%;
$alert-bg-scale: 0%; $alert-bg-scale: 0%;
$alert-border-scale: 0%;
$alert-link-font-weight: normal; $alert-link-font-weight: normal;
// Labels // Labels
@ -74,7 +76,7 @@ $badge-bg-level: 2;
$dropdown-border-color: 0; $dropdown-border-color: 0;
$dropdown-box-shadow: 0 3px 16px rgba(0, 0, 0, .2); $dropdown-box-shadow: 0 3px 16px rgba(0, 0, 0, .2);
$dropdown-divider-bg: $color-border-dark; $dropdown-divider-bg: $color-border-dark;
$dropdown-link-hover-bg: $color-theme-blue-lightest; $dropdown-link-hover-bg: $color-theme-brand-light;
// Horizontal separator // Horizontal separator
$hr-opacity: 1; $hr-opacity: 1;

44
frontend/app/theme/_bootstrap.scss
View File

@ -65,7 +65,7 @@
} }
.alert-hint { .alert-hint {
background: lighten($color-theme-blue, 35%); background: lighten($color-theme-brand, 35%);
border: 0; border: 0;
border-radius: $border-radius; border-radius: $border-radius;
color: $color-text; color: $color-text;
@ -76,7 +76,7 @@
i { i {
@include absolute(1rem, null, null, 1rem); @include absolute(1rem, null, null, 1rem);
color: $color-theme-blue; color: $color-theme-brand;
font-size: 1.3rem; font-size: 1.3rem;
font-weight: normal; font-weight: normal;
vertical-align: text-bottom; vertical-align: text-bottom;
@ -102,7 +102,7 @@ a {
&.force { &.force {
& { & {
color: $color-theme-blue !important; color: $color-theme-brand !important;
} }
&:hover { &:hover {
@ -229,10 +229,10 @@ a {
} }
&.done { &.done {
color: $color-theme-green !important; color: $color-theme-success !important;
a { a {
color: $color-theme-green !important; color: $color-theme-success !important;
} }
} }
@ -256,10 +256,10 @@ a {
} }
&.done { &.done {
color: $color-theme-green; color: $color-theme-success;
a { a {
color: $color-theme-green !important; color: $color-theme-success !important;
} }
i { i {
@ -290,7 +290,7 @@ a {
&.active, &.active,
&:hover { &:hover {
border-color: $color-theme-blue; border-color: $color-theme-brand;
} }
} }
} }
@ -372,28 +372,28 @@ a {
&.active { &.active {
& { & {
background: none; background: none;
border-color: $color-theme-blue; border-color: $color-theme-brand;
color: $color-theme-blue; color: $color-theme-brand;
} }
i { i {
color: $color-theme-blue; color: $color-theme-brand;
} }
&:hover { &:hover {
color: $color-theme-blue-dark; color: $color-theme-brand-dark;
i { i {
color: $color-theme-blue-dark; color: $color-theme-brand-dark;
} }
} }
} }
&:hover { &:hover {
color: $color-theme-blue; color: $color-theme-brand;
i { i {
color: $color-theme-blue; color: $color-theme-brand;
} }
} }
} }
@ -407,7 +407,7 @@ a {
} }
&.btn-primary { &.btn-primary {
@include build-toggle-button($color-theme-blue, $color-badge-primary-background); @include build-toggle-button($color-theme-brand, $color-badge-primary-background);
} }
&.btn-info { &.btn-info {
@ -419,11 +419,11 @@ a {
} }
&.btn-success { &.btn-success {
@include build-toggle-button($color-theme-green, $color-badge-success-background); @include build-toggle-button($color-theme-success, $color-badge-success-background);
} }
&.btn-warning { &.btn-warning {
@include build-toggle-button($color-theme-orange, $color-badge-warning-background); @include build-toggle-button($color-theme-warning, $color-badge-warning-background);
} }
} }
@ -435,7 +435,7 @@ a {
// Link buttons only exists with blue text color in bootstrap. Provide them for all colors. // Link buttons only exists with blue text color in bootstrap. Provide them for all colors.
&-text { &-text {
&-primary { &-primary {
@include build-text-button($color-theme-blue); @include build-text-button($color-theme-brand);
} }
&-secondary { &-secondary {
@ -447,7 +447,7 @@ a {
} }
&-success { &-success {
@include build-text-button($color-theme-green); @include build-text-button($color-theme-success);
} }
&-info { &-info {
@ -455,7 +455,7 @@ a {
} }
&-warning { &-warning {
@include build-text-button($color-theme-orange); @include build-text-button($color-theme-warning);
} }
&-secondary2 { &-secondary2 {
@ -497,7 +497,7 @@ $icon-size: 4.5rem;
} }
i { i {
color: $color-theme-blue; color: $color-theme-brand;
} }
.radio-input { .radio-input {

14
frontend/app/theme/_common.scss
View File

@ -131,7 +131,7 @@ hr {
.item-published { .item-published {
& { & {
@include circle(.5rem); @include circle(.5rem);
background: $color-theme-green; background: $color-theme-success;
border: 0; border: 0;
margin-left: .4rem; margin-left: .4rem;
} }
@ -223,7 +223,7 @@ hr {
.sidebar { .sidebar {
@include absolute($size-navbar-height, null, 0, 0); @include absolute($size-navbar-height, null, 0, 0);
background: $color-theme-blue; background: $color-theme-brand;
color: $color-white; color: $color-white;
font-size: $font-small; font-size: $font-small;
font-weight: default; font-weight: default;
@ -239,7 +239,7 @@ hr {
} }
.nav-link { .nav-link {
background: $color-theme-blue; background: $color-theme-brand;
color: $color-white !important; color: $color-white !important;
cursor: pointer; cursor: pointer;
padding: 1rem 0; padding: 1rem 0;
@ -248,11 +248,11 @@ hr {
text-decoration: none; text-decoration: none;
&:hover { &:hover {
background: $color-theme-blue-darker; background: $color-theme-brand-darker;
} }
&.active { &.active {
background: $color-theme-blue-darker; background: $color-theme-brand-darker;
} }
i { i {
@ -291,7 +291,7 @@ hr {
} }
&-warning { &-warning {
background: $color-theme-orange; background: $color-theme-warning;
} }
&-failed { &-failed {
@ -299,7 +299,7 @@ hr {
} }
&-success { &-success {
background: $color-theme-green; background: $color-theme-success;
} }
} }

10
frontend/app/theme/_forms.scss
View File

@ -86,7 +86,7 @@
} }
&-success { &-success {
background: $color-theme-green-dark; background: $color-theme-success-dark;
} }
&.closeable { &.closeable {
@ -182,18 +182,18 @@
&:active, &:active,
&.active { &.active {
background: $color-theme-blue; background: $color-theme-brand;
&.separated { &.separated {
border-color: $color-theme-blue; border-color: $color-theme-brand;
} }
} }
&:hover { &:hover {
background: $color-theme-blue; background: $color-theme-brand;
&.separated { &.separated {
border-color: $color-theme-blue; border-color: $color-theme-brand;
} }
} }

8
frontend/app/theme/_lists.scss
View File

@ -87,7 +87,7 @@
// Blue background and white text when active. // Blue background and white text when active.
&.active { &.active {
td { td {
border-color: $color-theme-blue; border-color: $color-theme-brand;
} }
} }
} }
@ -117,9 +117,9 @@
position: relative; position: relative;
&.expanded { &.expanded {
background-color: $color-theme-blue-lightest; background-color: $color-theme-brand-light;
border-color: $color-theme-blue-lightest; border-color: $color-theme-brand-light;
color: $color-theme-blue; color: $color-theme-brand;
font-size: inherit; font-size: inherit;
font-weight: 500; font-weight: 500;

10
frontend/app/theme/_panels2.scss
View File

@ -26,7 +26,7 @@
} }
&.active { &.active {
color: $color-theme-blue; color: $color-theme-brand;
} }
} }
@ -250,7 +250,7 @@
display: block; display: block;
&:hover { &:hover {
color: $color-theme-blue-dark; color: $color-theme-brand-dark;
} }
&.active { &.active {
@ -286,14 +286,14 @@
} }
&.active { &.active {
background-color: $color-theme-blue-lightest; background-color: $color-theme-brand-light;
color: $color-theme-blue; color: $color-theme-brand;
cursor: default; cursor: default;
font-weight: 500; font-weight: 500;
} }
&:hover { &:hover {
background-color: $color-theme-blue-lightest; background-color: $color-theme-brand-light;
color: $color-text; color: $color-text;
} }
} }

24
frontend/app/theme/_vars.scss
View File

@ -14,32 +14,28 @@ $color-tooltip: #1a2129;
$color-code-background: #f5f7f9; $color-code-background: #f5f7f9;
$color-code-text: #708090; $color-code-text: #708090;
$color-extern-github: #353535;
$color-extern-google: #d34836; $color-extern-google: #d34836;
$color-extern-microsoft: #004185; $color-extern-microsoft: #004185;
$color-extern-github: #353535;
$color-extern-twitter: #1da1f2; $color-extern-twitter: #1da1f2;
$color-theme-blue: #3389ff; $color-theme-brand: #3389ff;
$color-theme-blue-dark: #3284f4; $color-theme-brand-dark: #3284f4;
$color-theme-blue-darker: #2f7deb; $color-theme-brand-darker: #2f7deb;
$color-theme-blue-lighter: #d0e6ff; $color-theme-brand-light: #d9e8fc;
$color-theme-blue-light: #edf5fe;
$color-theme-blue-lightest: #d9e8fc;
$color-theme-secondary: #e0e1e5; $color-theme-secondary: #e0e1e5;
$color-theme-green: #3ab480;
$color-theme-green-dark: #38a678;
$color-theme-orange: #ffb136;
$color-theme-orange-dark: #a65b00;
$color-theme-error: #eb3142; $color-theme-error: #eb3142;
$color-theme-error-dark: #c00; $color-theme-error-dark: #c00;
$color-theme-info: #0eafcc;
$color-theme-success-dark: #38a678;
$color-theme-success: #3ab480;
$color-theme-warning-dark: #a65b00;
$color-theme-warning: #ffb136;
$color-black: #000; $color-black: #000;
$color-white: #fff; $color-white: #fff;
$color-theme-info: #5bc0de;
$color-asset-bg: #f7f8fa; $color-asset-bg: #f7f8fa;
$color-input: #e0e1e5; $color-input: #e0e1e5;

Write Preview
Loading…
Cancel
Save