Browse Source

Custom scroll bar colors and preparation for tables.

pull/389/head
Sebastian Stehle 6 years ago
parent
commit
c790869763
  1. 2
      src/Squidex/app/features/settings/pages/clients/client.component.scss
  2. 1
      src/Squidex/app/framework/declarations.ts
  3. 3
      src/Squidex/app/framework/module.ts
  4. 2
      src/Squidex/app/theme/_common.scss
  5. 18
      src/Squidex/app/theme/_lists.scss
  6. 35
      src/Squidex/app/theme/_mixins.scss
  7. 1
      src/Squidex/app/theme/_panels.scss

2
src/Squidex/app/features/settings/pages/clients/client.component.scss

@ -33,7 +33,7 @@ $color-editor: #eceeef;
} }
.cell-actions { .cell-actions {
width: 3.2rem; @include force-width(3.2rem);
} }
.cell-input { .cell-input {

1
src/Squidex/app/framework/declarations.ts

@ -67,6 +67,7 @@ export * from './angular/scroll-active.directive';
export * from './angular/shortcut.component'; export * from './angular/shortcut.component';
export * from './angular/sorted.directive'; export * from './angular/sorted.directive';
export * from './angular/stop-click.directive'; export * from './angular/stop-click.directive';
export * from './angular/sync-scrolling.directive';
export * from './angular/template-wrapper.directive'; export * from './angular/template-wrapper.directive';
export * from './angular/title.component'; export * from './angular/title.component';

3
src/Squidex/app/framework/module.ts

@ -82,6 +82,7 @@ import {
SortedDirective, SortedDirective,
StarsComponent, StarsComponent,
StopClickDirective, StopClickDirective,
SyncScollingDirective,
TagEditorComponent, TagEditorComponent,
TemplateWrapperDirective, TemplateWrapperDirective,
TitleComponent, TitleComponent,
@ -157,6 +158,7 @@ import {
SortedDirective, SortedDirective,
StarsComponent, StarsComponent,
StopClickDirective, StopClickDirective,
SyncScollingDirective,
TagEditorComponent, TagEditorComponent,
TemplateWrapperDirective, TemplateWrapperDirective,
TitleComponent, TitleComponent,
@ -226,6 +228,7 @@ import {
SortedDirective, SortedDirective,
StarsComponent, StarsComponent,
StopClickDirective, StopClickDirective,
SyncScollingDirective,
TagEditorComponent, TagEditorComponent,
TemplateWrapperDirective, TemplateWrapperDirective,
TitleComponent, TitleComponent,

2
src/Squidex/app/theme/_common.scss

@ -15,6 +15,8 @@ body {
} }
} }
@include scrollbars(10px, $color-dark2-placeholder, transparent);
// Common style for user email. // Common style for user email.
.user-email { .user-email {
font-style: italic; font-style: italic;

18
src/Squidex/app/theme/_lists.scss

@ -184,39 +184,39 @@
// //
.cell { .cell {
&-40 { &-40 {
width: 40%; @include force-width(40%);
} }
&-60 { &-60 {
width: 60%; @include force-width(60%);
} }
&-select { &-select {
width: 50px; @include force-width(50px);
} }
&-label { &-label {
width: 100px; @include force-width(100px);
} }
&-separator { &-separator {
width: 60px; @include force-width(60px);
} }
&-user { &-user {
width: 55px; @include force-width(55px);
} }
&-time { &-time {
width: 160px; @include force-width(160px);
} }
&-actions { &-actions {
width: 70px; @include force-width(70px);
} }
&-actions-lg { &-actions-lg {
width: 150px; @include force-width(150px);
} }
&-separator, &-separator,

35
src/Squidex/app/theme/_mixins.scss

@ -40,11 +40,32 @@
} }
} }
@mixin scrollbars($size, $foreground-color, $background-color: mix($foreground-color, white, 50%)) {
&::-webkit-scrollbar {
width: $size;
height: $size;
}
&::-webkit-scrollbar-thumb {
background: $foreground-color;
}
&::-webkit-scrollbar-track {
background: $background-color;
}
& {
scrollbar-face-color: $foreground-color;
scrollbar-track-color: $background-color;
}
}
@mixin clearfix() { @mixin clearfix() {
&::after { &::after {
content: ''; content: '';
display: table;
clear: both; clear: both;
display: table;
} }
} }
@ -55,6 +76,12 @@
position: absolute; position: absolute;
} }
@mixin force-width($width) {
min-width: $width;
max-width: $width;
width: $width;
}
@mixin flex-box { @mixin flex-box {
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
@ -160,8 +187,10 @@
@mixin caret() { @mixin caret() {
display: inline-block; display: inline-block;
width: 0; min-width: 0;
height: 0; max-width: 0;
min-height: 0;
max-height: 0;
content: ''; content: '';
} }

1
src/Squidex/app/theme/_panels.scss

@ -28,6 +28,7 @@
@include fixed($size-navbar-height, 0, 0, $size-sidebar-width); @include fixed($size-navbar-height, 0, 0, $size-sidebar-width);
overflow-x: auto; overflow-x: auto;
overflow-y: hidden; overflow-y: hidden;
@include scrollbars(10px, $color-dark2-placeholder);
} }
// //

Loading…
Cancel
Save