Commit 07bb81f0 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Merge branch 'starling-patch-datepicker' into starling 

+ Fix Compilation JS
parents 81c782ed 7ebac2e0

module/Oscar/src/Oscar/Controller/PublicController.php

+1 −2
Original line number Diff line number Diff line
@@ -225,8 +225,7 @@ class PublicController extends AbstractOscarController implements UseTimesheetSe 
     */

    public function testAction()

    {

        echo unknwo_function();

        die("DEV ONLY");

        return [];

    }



    /**

module/Oscar/view/oscar/public/test.phtml

+0 −4
Original line number Diff line number Diff line 
<div class="container">

    <div id="test"></div>

    <?= $this->Vite()->addJs('src/Test.js'); ?>



<!---->

<!--    <div id="unexpected"></div>-->

<!--    --><?php //= $this->Vite()->addJs('src/Unexpected.js'); ?>

</div>

public/css/_common.scss

+0 −334
Original line number Diff line number Diff line
@@ -3758,185 +3758,6 @@ pre.alert { 
  }

}



.datepicker-selector {

  position: absolute;

  width: 16em;

  z-index: 1000;

  background: white;

  font-size: .9em;

  box-shadow: 0 0 1em rgba(0, 0, 0, 0.25);

  border: thin solid rgba(0, 0, 0, 0.5);

  .datepicker-wrapper {

    position: relative;

    z-index: 900;

    background: white;

    padding: 4px;

  }

  &:before {

    content: '';

    position: absolute;

    background: white;

    border: thin solid rgba(0, 0, 0, 0.5);

    width: 16px;

    left: 16px;

    height: 16px;

    transform: rotate(45deg);

    top: -8px;

    z-index: 800;

  }



  header nav {

    display: flex;

    .heading {

      white-space: nowrap;

      text-align: center;

    }

    .currentMonth, .currentYear {

      cursor: pointer;

      &:hover {

        background: rgba(255, 0, 0, 0.5);

      }

    }

    > * {

      flex: 1;

    }

    > span {

      flex: 0;

      cursor: pointer;

      &:hover {

        background: rgba(255, 0, 0, 0.5);

      }

    }

  }



  .day-labels {

    display: flex;

    align-items: stretch;



    .day-label {

      color: rgba(0, 0, 0, 0.5);

      flex: 1;

    }

  }



  .months, .years, .week {

    display: flex;

    flex-wrap: wrap;

    cursor: pointer;

  }



  .months .month {

    flex: 1;

    width: 33.3333333333333333%;

    padding: .3em 0;

  }

}



.datepicker-selector .months .month, .datepicker-selector .months .year, .datepicker-selector .months .week-day, .datepicker-selector .years .month, .datepicker-selector .years .year, .datepicker-selector .years .week-day, .datepicker-selector .week .month, .datepicker-selector .week .year, .datepicker-selector .week .week-day {

  padding: .3em;

  flex: 1;

  text-align: center;

  border-radius: 4px;

}



.datepicker-selector .months .month:hover, .datepicker-selector .months .year:hover, .datepicker-selector .months .week-day:hover, .datepicker-selector .years .month:hover, .datepicker-selector .years .year:hover, .datepicker-selector .years .week-day:hover, .datepicker-selector .week .month:hover, .datepicker-selector .week .year:hover, .datepicker-selector .week .week-day:hover {

  background: rgba(255, 0, 0, 0.9);

  color: white;

}



.datepicker-selector .months .month.active, .datepicker-selector .months .year.active, .datepicker-selector .months .week-day.active, .datepicker-selector .years .month.active, .datepicker-selector .years .year.active, .datepicker-selector .years .week-day.active, .datepicker-selector .week .month.active, .datepicker-selector .week .year.active, .datepicker-selector .week .week-day.active {

  background: rgba(255, 0, 0, 0.4) !important;

  text-shadow: -1px 1px 0 rgba(0, 0, 0, 0.3);

  color: white;

}



.datepicker-selector .months .month.disabled, .datepicker-selector .months .year.disabled, .datepicker-selector .months .week-day.disabled, .datepicker-selector .years .month.disabled, .datepicker-selector .years .year.disabled, .datepicker-selector .years .week-day.disabled, .datepicker-selector .week .month.disabled, .datepicker-selector .week .year.disabled, .datepicker-selector .week .week-day.disabled {

  background: white !important;

  color: rgba(0, 0, 0, 0.2);

  pointer-events: none;

}



.datepicker-selector .week {

  display: flex;

  align-items: stretch;

  line-height: 1em;

}



.datepicker-selector .week .week-label {

  font-size: .8em;

  flex: 1;

  color: rgba(0, 0, 0, 0.5);

}



.datepicker-selector .week .week-day {

  text-align: center;

  flex: 1;

  padding: 4px;

  cursor: pointer;

}



.datepicker-selector .week .week-day:hover {

  background-color: rgba(255, 0, 0, 0.75) !important;

  color: white;

}



.datepicker-selector .week .week-day:nth-child(odd) {

  background: rgba(0, 0, 0, 0.05);

}



.datepicker {

  font-size: $font-size-base;



  thead, tfoot {

    th {

      text-align: center;

      color: $gray-dark;

      font-weight: 100;

      cursor: pointer;

      transition: all .3s;

      &:hover {

        background: rgba($brand-complementary, .25);

      }

    }

  }

  .datepicker-switch {

    text-align: center;

  }

  .next {

    text-align: right;

  }

  tr td {

    padding: 2px;

  }



  .old {

    color: white;

  }



  .day.active, .active {

    color: white !important;

    background: $brand-complementary !important;

  }



  .day:nth-child(odd) {

    background: rgba($brand-complementary, .1);

  }



  .day, .month, .year {

    color: $brand-primary;

    text-align: center;

    background: rgba($brand-complementary, .05);

    padding: 4px;

    cursor: pointer;

    transition: all .3s;

    //text-shadow: -1px 1px 1px rgba(0,0,0,.3), 1px -1px 0 rgba(255,255,255,.3);

    &:hover {

      color: white;

      background: rgba($brand-complementary, .5);

      border-radius: 4px;

    }

  }

}



.workpackages {

  display: flex;
@@ -5453,162 +5274,7 @@ pre.alert-danger, pre.alert-info { 
  }

}



////////////////////////////////// DATE PICKER

.datepicker-selector {

  position: absolute;

  width: 16em;

  z-index: 1000;

  background: white;

  font-size: .9em;

  box-shadow: 0 0 1em rgba(0, 0, 0, 0.25);

  border: thin solid rgba(0, 0, 0, 0.5);

  .datepicker-wrapper {

    position: relative;

    z-index: 900;

    background: white;

    padding: 4px;

  }

  &:before {

    content: '';

    position: absolute;

    background: white;

    border: thin solid rgba(0, 0, 0, 0.5);

    width: 16px;

    left: 16px;

    height: 16px;

    transform: rotate(45deg);

    top: -8px;

    z-index: 800;

  }



  header nav {

    display: flex;

    .heading {

      white-space: nowrap;

      text-align: center;

    }

    .currentMonth, .currentYear {

      cursor: pointer;

      &:hover {

        background: rgba(255, 0, 0, 0.5);

      }

    }

    > * {

      flex: 1;

    }

    > span {

      flex: 0;

      cursor: pointer;

      &:hover {

        background: rgba(255, 0, 0, 0.5);

      }

    }

  }



  .day-labels {

    display: flex;

    align-items: stretch;



    .day-label {

      color: rgba(0, 0, 0, 0.5);

      flex: 1;

    }

  }



  .months, .years, .week {

    display: flex;

    flex-wrap: wrap;

    cursor: pointer;

  }



  .months .month {

    flex: 1;

    width: 33.3333333333333333%;

    padding: .3em 0;

  }

}



.datepicker-selector .months .month, .datepicker-selector .months .year, .datepicker-selector .months .week-day, .datepicker-selector .years .month, .datepicker-selector .years .year, .datepicker-selector .years .week-day, .datepicker-selector .week .month, .datepicker-selector .week .year, .datepicker-selector .week .week-day {

  padding: .3em;

  flex: 1;

  text-align: center;

  border-radius: 4px;

}



.datepicker-selector .months .month:hover, .datepicker-selector .months .year:hover, .datepicker-selector .months .week-day:hover, .datepicker-selector .years .month:hover, .datepicker-selector .years .year:hover, .datepicker-selector .years .week-day:hover, .datepicker-selector .week .month:hover, .datepicker-selector .week .year:hover, .datepicker-selector .week .week-day:hover {

  background: rgba(255, 0, 0, 0.9);

  color: white;

}



.datepicker-selector .months .month.active, .datepicker-selector .months .year.active, .datepicker-selector .months .week-day.active, .datepicker-selector .years .month.active, .datepicker-selector .years .year.active, .datepicker-selector .years .week-day.active, .datepicker-selector .week .month.active, .datepicker-selector .week .year.active, .datepicker-selector .week .week-day.active {

  background: rgba(255, 0, 0, 0.4) !important;

  text-shadow: -1px 1px 0 rgba(0, 0, 0, 0.3);

  color: white;

}



.datepicker-selector .months .month.disabled, .datepicker-selector .months .year.disabled, .datepicker-selector .months .week-day.disabled, .datepicker-selector .years .month.disabled, .datepicker-selector .years .year.disabled, .datepicker-selector .years .week-day.disabled, .datepicker-selector .week .month.disabled, .datepicker-selector .week .year.disabled, .datepicker-selector .week .week-day.disabled {

  background: white !important;

  color: rgba(0, 0, 0, 0.2);

  pointer-events: none;

}



.datepicker-selector .week {

  display: flex;

  align-items: stretch;

  line-height: 1em;

}



.datepicker-selector .week .week-label {

  font-size: .8em;

  flex: 1;

  color: rgba(0, 0, 0, 0.5);

}



.datepicker-selector .week .week-day {

  text-align: center;

  flex: 1;

  padding: 4px;

  cursor: pointer;

}



.datepicker-selector .week .week-day:hover {

  background-color: rgba(255, 0, 0, 0.75) !important;

  color: white;

}



.datepicker-selector .week .week-day:nth-child(odd) {

  background: rgba(0, 0, 0, 0.05);

}



.list-selector {

  display: block;



  div {

    display: block;



    article {

      cursor: pointer;

      display: block;

      align-items: center;

      justify-items: center;

      &:nth-child(even) {

        background: rgba(#0a3783,.05);

      }

      &:hover {

        background: rgba(#9CEFE8,.8);

      }



      strong {

        flex: 5;

      }



      small {

        margin-left: auto;

        flex: 0;

      }

    }

  }

}



/** SELECTEUR d'ORGANISATION **/

public/css/adaj.css

+0 −314
Original line number Diff line number Diff line
@@ -10917,173 +10917,6 @@ pre.alert { 
  border-bottom: thin rgba(49, 112, 143, 0.3) solid;

}



.datepicker-selector {

  position: absolute;

  width: 16em;

  z-index: 1000;

  background: white;

  font-size: 0.9em;

  box-shadow: 0 0 1em rgba(0, 0, 0, 0.25);

  border: thin solid rgba(0, 0, 0, 0.5);

}

.datepicker-selector .datepicker-wrapper {

  position: relative;

  z-index: 900;

  background: white;

  padding: 4px;

}

.datepicker-selector:before {

  content: "";

  position: absolute;

  background: white;

  border: thin solid rgba(0, 0, 0, 0.5);

  width: 16px;

  left: 16px;

  height: 16px;

  transform: rotate(45deg);

  top: -8px;

  z-index: 800;

}

.datepicker-selector header nav {

  display: flex;

}

.datepicker-selector header nav .heading {

  white-space: nowrap;

  text-align: center;

}

.datepicker-selector header nav .currentMonth, .datepicker-selector header nav .currentYear {

  cursor: pointer;

}

.datepicker-selector header nav .currentMonth:hover, .datepicker-selector header nav .currentYear:hover {

  background: rgba(255, 0, 0, 0.5);

}

.datepicker-selector header nav > * {

  flex: 1;

}

.datepicker-selector header nav > span {

  flex: 0;

  cursor: pointer;

}

.datepicker-selector header nav > span:hover {

  background: rgba(255, 0, 0, 0.5);

}

.datepicker-selector .day-labels {

  display: flex;

  align-items: stretch;

}

.datepicker-selector .day-labels .day-label {

  color: rgba(0, 0, 0, 0.5);

  flex: 1;

}

.datepicker-selector .months, .datepicker-selector .years, .datepicker-selector .week {

  display: flex;

  flex-wrap: wrap;

  cursor: pointer;

}

.datepicker-selector .months .month {

  flex: 1;

  width: 33.3333333333%;

  padding: 0.3em 0;

}



.datepicker-selector .months .month, .datepicker-selector .months .year, .datepicker-selector .months .week-day, .datepicker-selector .years .month, .datepicker-selector .years .year, .datepicker-selector .years .week-day, .datepicker-selector .week .month, .datepicker-selector .week .year, .datepicker-selector .week .week-day {

  padding: 0.3em;

  flex: 1;

  text-align: center;

  border-radius: 4px;

}



.datepicker-selector .months .month:hover, .datepicker-selector .months .year:hover, .datepicker-selector .months .week-day:hover, .datepicker-selector .years .month:hover, .datepicker-selector .years .year:hover, .datepicker-selector .years .week-day:hover, .datepicker-selector .week .month:hover, .datepicker-selector .week .year:hover, .datepicker-selector .week .week-day:hover {

  background: rgba(255, 0, 0, 0.9);

  color: white;

}



.datepicker-selector .months .month.active, .datepicker-selector .months .year.active, .datepicker-selector .months .week-day.active, .datepicker-selector .years .month.active, .datepicker-selector .years .year.active, .datepicker-selector .years .week-day.active, .datepicker-selector .week .month.active, .datepicker-selector .week .year.active, .datepicker-selector .week .week-day.active {

  background: rgba(255, 0, 0, 0.4) !important;

  text-shadow: -1px 1px 0 rgba(0, 0, 0, 0.3);

  color: white;

}



.datepicker-selector .months .month.disabled, .datepicker-selector .months .year.disabled, .datepicker-selector .months .week-day.disabled, .datepicker-selector .years .month.disabled, .datepicker-selector .years .year.disabled, .datepicker-selector .years .week-day.disabled, .datepicker-selector .week .month.disabled, .datepicker-selector .week .year.disabled, .datepicker-selector .week .week-day.disabled {

  background: white !important;

  color: rgba(0, 0, 0, 0.2);

  pointer-events: none;

}



.datepicker-selector .week {

  display: flex;

  align-items: stretch;

  line-height: 1em;

}



.datepicker-selector .week .week-label {

  font-size: 0.8em;

  flex: 1;

  color: rgba(0, 0, 0, 0.5);

}



.datepicker-selector .week .week-day {

  text-align: center;

  flex: 1;

  padding: 4px;

  cursor: pointer;

}



.datepicker-selector .week .week-day:hover {

  background-color: rgba(255, 0, 0, 0.75) !important;

  color: white;

}



.datepicker-selector .week .week-day:nth-child(odd) {

  background: rgba(0, 0, 0, 0.05);

}



.datepicker {

  font-size: 14px;

}

.datepicker thead th, .datepicker tfoot th {

  text-align: center;

  color: #444444;

  font-weight: 100;

  cursor: pointer;

  transition: all 0.3s;

}

.datepicker thead th:hover, .datepicker tfoot th:hover {

  background: rgba(71, 43, 131, 0.25);

}

.datepicker .datepicker-switch {

  text-align: center;

}

.datepicker .next {

  text-align: right;

}

.datepicker tr td {

  padding: 2px;

}

.datepicker .old {

  color: white;

}

.datepicker .day.active, .datepicker .active {

  color: white !important;

  background: #472B83 !important;

}

.datepicker .day:nth-child(odd) {

  background: rgba(71, 43, 131, 0.1);

}

.datepicker .day, .datepicker .month, .datepicker .year {

  color: #24587A;

  text-align: center;

  background: rgba(71, 43, 131, 0.05);

  padding: 4px;

  cursor: pointer;

  transition: all 0.3s;

}

.datepicker .day:hover, .datepicker .month:hover, .datepicker .year:hover {

  color: white;

  background: rgba(71, 43, 131, 0.5);

  border-radius: 4px;

}



.workpackages {

  display: flex;

  justify-content: flex-start;
@@ -12454,153 +12287,6 @@ pre.alert-danger, pre.alert-info { 
  text-shadow: 1px -1px 1px rgba(0, 0, 0, 0.8);

}



.datepicker-selector {

  position: absolute;

  width: 16em;

  z-index: 1000;

  background: white;

  font-size: 0.9em;

  box-shadow: 0 0 1em rgba(0, 0, 0, 0.25);

  border: thin solid rgba(0, 0, 0, 0.5);

}

.datepicker-selector .datepicker-wrapper {

  position: relative;

  z-index: 900;

  background: white;

  padding: 4px;

}

.datepicker-selector:before {

  content: "";

  position: absolute;

  background: white;

  border: thin solid rgba(0, 0, 0, 0.5);

  width: 16px;

  left: 16px;

  height: 16px;

  transform: rotate(45deg);

  top: -8px;

  z-index: 800;

}

.datepicker-selector header nav {

  display: flex;

}

.datepicker-selector header nav .heading {

  white-space: nowrap;

  text-align: center;

}

.datepicker-selector header nav .currentMonth, .datepicker-selector header nav .currentYear {

  cursor: pointer;

}

.datepicker-selector header nav .currentMonth:hover, .datepicker-selector header nav .currentYear:hover {

  background: rgba(255, 0, 0, 0.5);

}

.datepicker-selector header nav > * {

  flex: 1;

}

.datepicker-selector header nav > span {

  flex: 0;

  cursor: pointer;

}

.datepicker-selector header nav > span:hover {

  background: rgba(255, 0, 0, 0.5);

}

.datepicker-selector .day-labels {

  display: flex;

  align-items: stretch;

}

.datepicker-selector .day-labels .day-label {

  color: rgba(0, 0, 0, 0.5);

  flex: 1;

}

.datepicker-selector .months, .datepicker-selector .years, .datepicker-selector .week {

  display: flex;

  flex-wrap: wrap;

  cursor: pointer;

}

.datepicker-selector .months .month {

  flex: 1;

  width: 33.3333333333%;

  padding: 0.3em 0;

}



.datepicker-selector .months .month, .datepicker-selector .months .year, .datepicker-selector .months .week-day, .datepicker-selector .years .month, .datepicker-selector .years .year, .datepicker-selector .years .week-day, .datepicker-selector .week .month, .datepicker-selector .week .year, .datepicker-selector .week .week-day {

  padding: 0.3em;

  flex: 1;

  text-align: center;

  border-radius: 4px;

}



.datepicker-selector .months .month:hover, .datepicker-selector .months .year:hover, .datepicker-selector .months .week-day:hover, .datepicker-selector .years .month:hover, .datepicker-selector .years .year:hover, .datepicker-selector .years .week-day:hover, .datepicker-selector .week .month:hover, .datepicker-selector .week .year:hover, .datepicker-selector .week .week-day:hover {

  background: rgba(255, 0, 0, 0.9);

  color: white;

}



.datepicker-selector .months .month.active, .datepicker-selector .months .year.active, .datepicker-selector .months .week-day.active, .datepicker-selector .years .month.active, .datepicker-selector .years .year.active, .datepicker-selector .years .week-day.active, .datepicker-selector .week .month.active, .datepicker-selector .week .year.active, .datepicker-selector .week .week-day.active {

  background: rgba(255, 0, 0, 0.4) !important;

  text-shadow: -1px 1px 0 rgba(0, 0, 0, 0.3);

  color: white;

}



.datepicker-selector .months .month.disabled, .datepicker-selector .months .year.disabled, .datepicker-selector .months .week-day.disabled, .datepicker-selector .years .month.disabled, .datepicker-selector .years .year.disabled, .datepicker-selector .years .week-day.disabled, .datepicker-selector .week .month.disabled, .datepicker-selector .week .year.disabled, .datepicker-selector .week .week-day.disabled {

  background: white !important;

  color: rgba(0, 0, 0, 0.2);

  pointer-events: none;

}



.datepicker-selector .week {

  display: flex;

  align-items: stretch;

  line-height: 1em;

}



.datepicker-selector .week .week-label {

  font-size: 0.8em;

  flex: 1;

  color: rgba(0, 0, 0, 0.5);

}



.datepicker-selector .week .week-day {

  text-align: center;

  flex: 1;

  padding: 4px;

  cursor: pointer;

}



.datepicker-selector .week .week-day:hover {

  background-color: rgba(255, 0, 0, 0.75) !important;

  color: white;

}



.datepicker-selector .week .week-day:nth-child(odd) {

  background: rgba(0, 0, 0, 0.05);

}



.list-selector {

  display: block;

}

.list-selector div {

  display: block;

}

.list-selector div article {

  cursor: pointer;

  display: block;

  align-items: center;

  justify-items: center;

}

.list-selector div article:nth-child(even) {

  background: rgba(10, 55, 131, 0.05);

}

.list-selector div article:hover {

  background: rgba(156, 239, 232, 0.8);

}

.list-selector div article strong {

  flex: 5;

}

.list-selector div article small {

  margin-left: auto;

  flex: 0;

}



/** SELECTEUR d'ORGANISATION **/

.oscar-selector {

  position: relative;

public/css/adaj.css.map

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.