Skip to content

Commit

Permalink
Version preps
Browse files Browse the repository at this point in the history
  • Loading branch information
@coastforge-mei
coastforge-mei committed Feb 22, 2023
1 parent 4f4b680 commit 7e50602
Show file tree
Hide file tree
Showing 8 changed files with 200 additions and 188 deletions.
4 changes: 2 additions & 2 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
"require": {
"php": "^7.4 || ^8.0",
"contao/core-bundle": "^4.9",
"con4gis/core": "^v6.0.19",
"con4gis/core": "^v6.0.22",
"menatwork/contao-multicolumnwizard-bundle": "^3.5",
"doctrine/orm": "^2.8.5",
"doctrine/data-fixtures": "^1.4.4",
"doctrine/persistence": "^2.3.0",
"doctrine/persistence": "^2|^3",
"terminal42/notification_center": "^1.6",
"contao-components/jquery": "^3.6",
"bacon/bacon-qr-code": "^2.0"
Expand Down
30 changes: 15 additions & 15 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"postcss": "^8.4.21",
"postcss-loader": "^5.3.0",
"raw-loader": "^4.0.2",
"sass": "^1.57.1",
"sass": "^1.58.3",
"style-loader": "^2.0.0",
"svg-inline-loader": "^0.8.2",
"terser-webpack-plugin": "^5.3.6",
Expand All @@ -38,8 +38,8 @@
"dependencies": {
"@fortawesome/fontawesome-free": "^5.15.4",
"datatables-buttons": "^1.0.3",
"datatables.net": "^1.13.1",
"datatables.net-jqui": "^1.13.1",
"datatables.net": "^1.13.2",
"datatables.net-jqui": "^1.13.2",
"datatables.net-scroller": "^2.1.0",
"jquery": "^3.6.3",
"jquery-ui": "^1.13.2",
Expand All @@ -48,6 +48,6 @@
"magnific-popup": "^1.1.0",
"minisearch": "^3.3.0",
"trix": "^1.3.1",
"vanillajs-datepicker": "^1.2.0"
"vanillajs-datepicker": "^1.3.1"
}
}
170 changes: 88 additions & 82 deletions src/Resources/public/dist/css/c4g-brick.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4670,16 +4670,15 @@ fieldset:disabled .ui-button {
border-top-right-radius: 0
}
.datepicker {
display: none
width: -moz-min-content;
width: -webkit-min-content;
width: min-content
}
.datepicker.active,
.datepicker.c4g__state-active {
display: block
.datepicker:not(.active):not(.c4g__state-active) {
display: none
}
.datepicker-dropdown {
position: absolute;
top: 0;
left: 0;
z-index: 1000;
padding-top: 4px
}
Expand All @@ -4688,61 +4687,32 @@ fieldset:disabled .ui-button {
padding-bottom: 4px
}
.datepicker-picker {
display: inline-block;
border-radius: .25rem;
display: flex;
flex-direction: column;
border-radius: .375rem;
background-color: #fff
}
.datepicker-dropdown .datepicker-picker {
box-shadow: 0 .5rem 1rem rgba(0,0,0,.15)
}
.datepicker-picker span {
display: block;
flex: 1;
border: 0;
border-radius: .25rem;
cursor: default;
text-align: center;
-webkit-touch-callout: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none
}
.datepicker-main {
flex: auto;
padding: 2px
}
.datepicker-footer {
box-shadow: inset 0 1px 1px rgba(0,0,0,.1);
background-color: #f8f9fa
}
.datepicker-controls,
.datepicker-grid,
.datepicker-view,
.datepicker-view .days-of-week {
display: flex
}
.datepicker-grid {
flex-wrap: wrap
}
.datepicker-view .days .datepicker-cell,
.datepicker-view .dow {
flex-basis: 14.2857142857%
}
.datepicker-view.datepicker-grid .datepicker-cell {
flex-basis: 25%
}
.datepicker-cell,
.datepicker-view .week {
height: 2.25rem;
line-height: 2.25rem
}
.datepicker-title {
box-shadow: inset 0 -1px 1px rgba(0,0,0,.1);
background-color: #f8f9fa;
padding: .375rem .75rem;
text-align: center;
font-weight: 700
}
.datepicker-controls {
display: flex
}
.datepicker-header .datepicker-controls {
padding: 2px 2px 0
}
Expand All @@ -4755,14 +4725,14 @@ fieldset:disabled .ui-button {
.datepicker-controls .btn:hover,
.datepicker-controls .c4g__btn:hover,
.datepicker-controls .ui-button:hover {
border-color: #dae0e5;
border-color: #dbe0e5;
background-color: #e2e6ea;
color: #000
}
.datepicker-controls .btn:focus,
.datepicker-controls .c4g__btn:focus,
.datepicker-controls .ui-button:focus {
border-color: #dae0e5;
border-color: #dbe0e5;
box-shadow: 0 0 0 .25rem rgba(211,212,213,.5);
background-color: #e2e6ea;
color: #000
Expand All @@ -4777,8 +4747,8 @@ fieldset:disabled .ui-button {
.datepicker-controls .btn:not(:disabled):active,
.datepicker-controls .c4g__btn:not(:disabled):active,
.datepicker-controls .ui-button:not(:disabled):active {
border-color: #d3d9df;
background-color: #dae0e5;
border-color: #d4dae0;
background-color: #dbe0e5;
color: #000
}
.datepicker-controls .btn:not(:disabled):active:focus,
Expand All @@ -4795,47 +4765,87 @@ fieldset:disabled .ui-button {
.datepicker-footer .datepicker-controls .btn,
.datepicker-footer .datepicker-controls .c4g__btn,
.datepicker-footer .datepicker-controls .ui-button {
flex: auto;
margin: calc(.375rem - 1px) .375rem;
border-radius: .2rem;
width: 100%;
border-radius: .25rem;
font-size: .875rem
}
.datepicker-controls .view-switch {
flex: auto
}
.datepicker-controls .next-btn,
.datepicker-controls .prev-btn {
.datepicker-controls .next-button,
.datepicker-controls .prev-button {
padding-right: .375rem;
padding-left: .375rem;
width: 2.25rem
flex: 0 0 14.2857142857%
}
.datepicker-controls .next-btn.disabled,
.datepicker-controls .prev-btn.disabled {
.datepicker-controls .next-button.disabled,
.datepicker-controls .prev-button.disabled {
visibility: hidden
}
.datepicker-view .dow {
.datepicker-grid,
.datepicker-view {
display: flex
}
.datepicker-view {
align-items: stretch;
width: 15.75rem
}
.datepicker-grid {
flex-wrap: wrap;
flex: auto
}
.datepicker .days {
display: flex;
flex-direction: column;
flex: auto
}
.datepicker .days-of-week {
display: flex
}
.datepicker .week-numbers {
display: flex;
flex-direction: column;
flex: 0 0 9.6774193548%
}
.datepicker .weeks {
display: flex;
flex-direction: column;
align-items: stretch;
flex: auto
}
.datepicker span {
display: flex;
align-items: center;
justify-content: center;
border-radius: .375rem;
cursor: default;
-webkit-touch-callout: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none
}
.datepicker .dow {
height: 1.5rem;
line-height: 1.5rem;
font-size: .9375rem;
font-weight: 700
}
.datepicker-view .week {
width: 2.25rem;
.datepicker .week {
flex: auto;
color: #dee2e6;
font-size: .875rem
}
@media (max-width:22.5rem) {
.datepicker-view .week {
width: 1.96875rem
}
.datepicker .days .dow,
.datepicker-cell {
flex-basis: 14.2857142857%
}
.datepicker-grid {
width: 15.75rem
.datepicker-cell {
height: 2.25rem
}
@media (max-width:22.5rem) {
.calendar-weeks + .days .datepicker-grid {
width: 13.78125rem
}
.datepicker-cell:not(.day) {
flex-basis: 25%;
height: 4.5rem
}
.datepicker-cell:not(.disabled):hover {
background-color: #f9f9f9;
Expand All @@ -4855,7 +4865,7 @@ fieldset:disabled .ui-button {
}
.datepicker-cell.next:not(.disabled),
.datepicker-cell.prev:not(.disabled) {
color: color("gray")
color: #6c757d
}
.datepicker-cell.next.selected,
.datepicker-cell.prev.selected {
Expand All @@ -4878,7 +4888,7 @@ fieldset:disabled .ui-button {
color: #fff
}
.datepicker-cell.today.focused:not(.selected) {
background-color: #1ebe8f
background-color: #1fc493
}
.datepicker-cell.range-end:not(.selected),
.datepicker-cell.range-start:not(.selected) {
Expand All @@ -4887,13 +4897,13 @@ fieldset:disabled .ui-button {
}
.datepicker-cell.range-end.focused:not(.selected),
.datepicker-cell.range-start.focused:not(.selected) {
background-color: #666f76
background-color: #69727a
}
.datepicker-cell.range-start {
border-radius: .25rem 0 0 .25rem
.datepicker-cell.range-start:not(.range-end) {
border-radius: .375rem 0 0 .375rem
}
.datepicker-cell.range-end {
border-radius: 0 .25rem .25rem 0
.datepicker-cell.range-end:not(.range-start) {
border-radius: 0 .375rem .375rem 0
}
.datepicker-cell.range {
border-radius: 0;
Expand All @@ -4903,21 +4913,17 @@ fieldset:disabled .ui-button {
background-color: #e2e6ea
}
.datepicker-cell.range.disabled {
color: #cbd3da
color: #ced4db
}
.datepicker-cell.range.focused {
background-color: #dadfe4
}
.datepicker-view.datepicker-grid .datepicker-cell {
height: 4.5rem;
line-height: 4.5rem
background-color: #dbe0e5
}
.datepicker-input.in-edit {
border-color: #6da8fe
border-color: #73acfe
}
.datepicker-input.in-edit:active,
.datepicker-input.in-edit:focus {
box-shadow: 0 0 .25em .25em rgba(109,168,254,.2)
box-shadow: 0 0 .25em .25em rgba(115,172,254,.2)
}
@font-face {
font-family: "Font Awesome 5 Free";
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/public/dist/css/c4g-brick.min.css
View file

Large diffs are not rendered by default.

0 comments on commit 7e50602

Please sign in to comment.