Skip to content

Commit 046a1c5

Browse files
dew326dew326
authored
Feature discount (#1429)
2 parents 23dd150 + a2e53cb commit 046a1c5

File tree

57 files changed

+1781
-540
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1781
-540
lines changed

‎src/bundle/Resources/public/img/background-gray.svg

Lines changed: 14 additions & 0 deletions
Loading

‎src/bundle/Resources/public/scss/_dropdown.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@
269269
}
270270

271271
.ibexa-input {
272+
flex-shrink: 0;
272273
margin: 0 calculateRem(16px) 0 0;
273274
}
274275

‎src/bundle/Resources/public/scss/_inputs.scss

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,12 @@
400400
}
401401

402402
.ibexa-input-text-wrapper {
403-
position: relative;
403+
display: flex;
404+
405+
&__input-wrapper {
406+
position: relative;
407+
flex-grow: 1;
408+
}
404409

405410
&__actions {
406411
display: flex;
@@ -425,6 +430,23 @@
425430
padding: 0;
426431
}
427432

433+
&__right-side-label-wrapper {
434+
display: flex;
435+
}
436+
437+
&__right-side-label {
438+
display: flex;
439+
justify-content: center;
440+
align-items: center;
441+
background-color: $ibexa-color-light-200;
442+
border: calculateRem(1px) solid $ibexa-color-dark-200;
443+
border-left: 0;
444+
border-radius: 0 $ibexa-border-radius $ibexa-border-radius 0;
445+
padding-left: calculateRem(16px);
446+
padding-right: calculateRem(16px);
447+
font-size: $ibexa-text-font-size-medium;
448+
}
449+
428450
&--type-number {
429451
max-width: calculateRem(150px);
430452

@@ -482,6 +504,13 @@
482504
}
483505
}
484506
}
507+
508+
&--has-right-side-label {
509+
.ibexa-input {
510+
border-bottom-right-radius: 0;
511+
border-top-right-radius: 0;
512+
}
513+
}
485514
}
486515

487516
.ibexa-input--date:placeholder-shown + .ibexa-input-text-wrapper__actions .ibexa-input-text-wrapper__action-btn--clear,

‎src/bundle/Resources/public/scss/ui/modules/_universal.discovery.scss

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,41 @@
1+
@import 'universal-discovery/mixins/collapsible-arrow';
2+
@import 'universal-discovery/mixins/filters-panel';
3+
@import 'universal-discovery/mixins/filters-row';
4+
@import 'universal-discovery/mixins/selected.items.panel.item';
5+
@import 'universal-discovery/mixins/selected.items.panel';
6+
17
@import 'universal-discovery/main';
28
@import 'universal-discovery/tab';
39
@import 'universal-discovery/top.menu';
410
@import 'universal-discovery/top.menu.search.input';
511
@import 'universal-discovery/actions.menu';
12+
@import 'universal-discovery/collapsible';
613
@import 'universal-discovery/content.create';
714
@import 'universal-discovery/content.create.widget';
815
@import 'universal-discovery/content.create.button';
916
@import 'universal-discovery/content.edit';
1017
@import 'universal-discovery/content.edit.button';
18+
@import 'universal-discovery/content.type.selector.list';
1119
@import 'universal-discovery/sort.switcher';
1220
@import 'universal-discovery/view.switcher';
1321
@import 'universal-discovery/tab.selector';
1422
@import 'universal-discovery/finder';
1523
@import 'universal-discovery/finder.branch';
1624
@import 'universal-discovery/finder.leaf';
1725
@import 'universal-discovery/content.meta.preview';
26+
@import 'universal-discovery/selected.items.panel.item';
27+
@import 'universal-discovery/selected.items.panel';
1828
@import 'universal-discovery/selected.locations';
1929
@import 'universal-discovery/selected.locations.item';
2030
@import 'universal-discovery/grid';
2131
@import 'universal-discovery/breadcrumbs';
32+
@import 'universal-discovery/search.no.results';
2233
@import 'universal-discovery/search';
2334
@import 'universal-discovery/search.tags';
2435
@import 'universal-discovery/content.table.item';
2536
@import 'universal-discovery/content.table';
37+
@import 'universal-discovery/filters-panel';
38+
@import 'universal-discovery/filters-row';
2639
@import 'universal-discovery/filters';
2740
@import 'universal-discovery/bookmarks.list';
2841
@import 'universal-discovery/translation.selector';

‎src/bundle/Resources/public/scss/ui/modules/common/_popup.scss

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
.c-popup {
2+
$self: &;
3+
24
&__dialog {
35
@include modal-main();
46
}
@@ -53,6 +55,21 @@
5355
}
5456
}
5557

58+
&--has-subheader {
59+
.modal-header {
60+
border-bottom: 0;
61+
padding-bottom: 0;
62+
}
63+
64+
#{$self} {
65+
&__subheader {
66+
border-bottom: calculateRem(1px) solid $ibexa-color-light-500;
67+
padding-bottom: calculateRem(16px);
68+
color: $ibexa-color-dark-400;
69+
}
70+
}
71+
}
72+
5673
.ibexa-label--checkbox-radio {
5774
padding-left: calculateRem(4px);
5875
}

‎src/bundle/Resources/public/scss/ui/modules/universal-discovery/_collapsible.scss

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
.c-collapsible {
2+
$self: &;
3+
4+
& + .c-filters-row,
5+
& + .c-filters__row {
6+
border-top: calculateRem(1px) solid $ibexa-color-light;
7+
}
8+
9+
&--hidden {
10+
#{$self} {
11+
&__title {
12+
box-shadow: none;
13+
border-bottom-color: transparent;
14+
15+
&:before {
16+
transform: rotate(135deg);
17+
}
18+
19+
&:after {
20+
transform: rotate(-135deg);
21+
}
22+
}
23+
24+
&__content {
25+
transform: scaleY(0);
26+
opacity: 0;
27+
height: 0;
28+
}
29+
}
30+
}
31+
32+
&__title {
33+
position: relative;
34+
cursor: pointer;
35+
padding: 0 calculateRem(24px);
36+
font-size: $ibexa-text-font-size-medium;
37+
font-weight: 600;
38+
min-height: calculateRem(40px);
39+
display: flex;
40+
align-items: center;
41+
border-style: solid;
42+
border-color: $ibexa-color-light;
43+
border-width: calculateRem(1px) 0;
44+
box-shadow: calculateRem(4px) calculateRem(22px) calculateRem(47px) 0 rgba($ibexa-color-info, 0.05);
45+
46+
@include collapsible-arrow;
47+
}
48+
49+
&__content {
50+
transform: scaleY(1);
51+
transform-origin: top center;
52+
}
53+
54+
&__content-wrapper {
55+
padding: calculateRem(16px) calculateRem(24px);
56+
}
57+
58+
&__list {
59+
padding: 0;
60+
margin-bottom: 0;
61+
list-style-type: none;
62+
}
63+
64+
&__list-item {
65+
padding: calculateRem(6px) 0;
66+
67+
.form-check {
68+
width: 100%;
69+
}
70+
71+
.form-check-label {
72+
width: 100%;
73+
text-overflow: ellipsis;
74+
overflow: hidden;
75+
}
76+
77+
.ibexa-input--checkbox {
78+
margin-right: calculateRem(8px);
79+
}
80+
}
81+
}

‎src/bundle/Resources/public/scss/ui/modules/universal-discovery/_content.type.selector.list.scss

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
.c-content-type-selector-list {
2+
padding: 0;
3+
margin-bottom: 0;
4+
list-style-type: none;
5+
6+
&__item {
7+
padding: calculateRem(6px) 0;
8+
9+
.form-check {
10+
width: 100%;
11+
}
12+
13+
.form-check-label {
14+
width: 100%;
15+
text-overflow: ellipsis;
16+
overflow: hidden;
17+
}
18+
19+
.ibexa-input--checkbox {
20+
margin-right: calculateRem(8px);
21+
}
22+
}
23+
}

‎src/bundle/Resources/public/scss/ui/modules/universal-discovery/_filters-panel.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.c-filters-panel {
2+
@include c-filters-panel('.c-filters-row');
3+
}

‎src/bundle/Resources/public/scss/ui/modules/universal-discovery/_filters-row.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.c-filters-row {
2+
@include c-filters-row('__title');
3+
}

0 commit comments

Comments
 (0)