Compare commits

..

No commits in common. '5bb67fe9579cacd3b27a6f8083d9a5f8bf0742d5' and 'df5c7b1d6907564293b4a9599c1cd0eb12b79a8f' have entirely different histories.

  1. 8
      src/_components/boxChart/boxChart.scss
  2. 18
      src/_screens/home/detail-room-education/detailRoomEducation.style.scss
  3. 8
      src/_screens/home/detail-room-education/index.js

@ -7,10 +7,6 @@
display: flex;
flex-direction: column;
@media (max-width: 1750px) {
max-width: 250px;
}
.box-chart-title {
font-size: 2rem;
font-weight: 700;
@ -54,12 +50,12 @@
}
.chart-container {
// max-width: 360px;
overflow-x: scroll;
height: 100%;
width: 300px;
@media (max-width: 1750px) {
max-width: 220px;
max-width: 300px;
}
}
}

@ -4,7 +4,7 @@
display: flex;
.detail-room-education-left-side {
width: 43%;
width: 48%;
border-right: 1px solid #c7c7c7;
display: flex;
flex-direction: column;
@ -29,30 +29,26 @@
.detail-room-education-right-p-h {
padding-right: 32px;
}
.detail-room-education-list-container {
padding: 2rem 0;
display: flex;
flex-direction: column;
height: 100%;
.detail-room-education-header {
.detail-room-education-header{
width: 100%;
.detail-room-education-list-header {
.detail-room-education-list-header{
justify-content: space-around;
margin: 12px;
gap: 12px;
margin: 12px 32px;
gap: 32px;
.criteria-manage-search-input {
height: 46px;
border-radius: 40px;
@include screen_pc_sm {
height: 36px;
}
}
.criteria-manage-item {
min-width: fit-content;
flex: 1;
@ -66,7 +62,7 @@
display: flex;
flex-direction: column;
padding-bottom: 16px;
padding-left: 16px;
padding-left: 32px;
@include screen_pc_sm {
gap: 16px;

@ -441,24 +441,24 @@ export default function DetailRoomEducation() {
</PrimaryButton>
</div>
</div>
<div className="flex gap-16 align-item-center" style={{padding: '1rem'}}>
<div className="flex gap-16 align-item-center" style={{padding: '1rem 3.2rem'}}>
<RootSelect
data={LIST_SCHOOL_YEAR}
value={schoolYear}
setValue={setSchoolYear}
style={{flex: 1, minWidth: '200px', padding:'0 10px'}}
style={{flex: 1,minWidth: '100px'}}
/>
<RootSelect
data={LIST_SEMESTER}
value={semester}
setValue={changeSemester}
style={{flex: 0.5, minWidth: '151px', padding:'0 10px'}}
style={{flex: 0.5,minWidth: '200px'}}
/>
<RootSelect
data={getListMonthBySemester(semester.value)}
value={month}
setValue={setMonth}
style={{flex: 0.5, minWidth: '150px', padding:'0 10px'}}
style={{flex: 0.5,minWidth: '180px'}}
/>
<PrimaryButton onClick={handleFilter}>
Áp dụng

Loading…
Cancel
Save