diff --git a/client/src/components/manageProjects/editableMeeting.jsx b/client/src/components/manageProjects/editableMeeting.jsx index 5a29945b2..4d4644a38 100644 --- a/client/src/components/manageProjects/editableMeeting.jsx +++ b/client/src/components/manageProjects/editableMeeting.jsx @@ -49,6 +49,7 @@ const EditableMeeting = ({ handleInputChange={handleInputChange} formValues={formValues} formErrors={formErrors} + title="Edit Recurring Event" > { // This creates the clock hours for the form const clockHours = createClockHours(); + return ( - + {title && {title}} - - Event Name: - + - {formErrors?.name && - {formErrors.name} - } - - - - Event Type: - + + + Event Type + - Team Meeting - Onboarding - - - - Day of the Week: - Team Meeting + Onboarding + + + + Day of the Week + - Sunday - Monday - Tuesday - Wednesday - Thursday - Friday - Saturday - - - - - - Start Time: - Sunday + Monday + Tuesday + Wednesday + Thursday + Friday + Saturday + + + + + + Start Time + {clockHours.map((value) => { return ( - + {value} - + ); })} - - - - Duration: - + + + Duration + - .5 - 1 - 1.5 - 2 - 2.5 - 3 - 3.5 - 4 - - - - - Description: - - - - Event Link: - - {formErrors?.videoConferenceLink && - - {formErrors.videoConferenceLink} - - } - + .5 + 1 + 1.5 + 2 + 2.5 + 3 + 3.5 + 4 + + + + + + + + + + + + + {children} - + ); }; diff --git a/client/src/sass/CheckIn.scss b/client/src/sass/CheckIn.scss index 694f1bd70..9317b3e86 100644 --- a/client/src/sass/CheckIn.scss +++ b/client/src/sass/CheckIn.scss @@ -1,162 +1,165 @@ .check-in-container { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - z-index: 1; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + z-index: 1; } .check-in-headers { - display: flex; - flex-direction: column; - justify-content: flex-start; - align-items: flex-start; - text-align: left; - width: 300px; - max-width: 300px; + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: flex-start; + text-align: left; + width: 300px; + max-width: 300px; } .check-in-form { - display: flex; - justify-content: center; - align-items: center; - min-height: 30vh; + display: flex; + justify-content: center; + align-items: center; + min-height: 30vh; } .form-check-in { - width: 300px; - max-width: 300px; + width: 300px; + max-width: 300px; } .form-row { - max-width: 300px; - width: 300px; - margin: 6px 0px; - - p { - text-align: left; - font-weight: bold; - letter-spacing: .05em; - } + max-width: 300px; + width: 300px; + margin: 6px 0px; + + p { + text-align: left; + font-weight: bold; + letter-spacing: .05em; + } } .last-row { - margin-top: 24px; + margin-top: 24px; } .form-input-text { - display: flex; - flex-direction: column; + display: flex; + flex-direction: column; - label { - font-size: 14px; - font-weight: 100px; - } + label { + font-size: 14px; + font-weight: 100px; + } } label { - max-width: 300px; - width: 300px; - text-align: left; - font-size: 20px; - font-weight: bold; -} - -input[type=text], input[type=email] { - -webkit-appearance: none; - max-width: 310px; - width: 310px; - height: 36px; - outline: none; - background-color: inherit; - border-top: none; - border-right: none; - border-bottom: 3px solid black; - border-left: none; - border-radius: 2px; - font-size: 24px; - padding: 0 4px; - margin: 4px 0px; + max-width: 300px; + width: 300px; + text-align: left; + font-size: 20px; + font-weight: bold; +} + +// Following styles apply to all text fields including Material UI component +// Global styles help with UI consistency but can lead to style conflicts +// Commented out styles that conflict with MUI component styling +// See PR #1844 + +input[type='text'], +input[type='email'] { + -webkit-appearance: none; + // max-width: 310px; + // width: 310px; + // height: 36px; + outline: none; + background-color: inherit; + border-top: none; + border-right: none; + border-bottom: 3px solid black; + border-left: none; + border-radius: 2px; + font-size: 24px; + // padding: 0 4px; + margin: 4px 0px; + color: rgb(250, 17, 79); + font-weight: bold; + transition: all .3s ease-in-out; + + &::placeholder { color: rgb(250, 17, 79); - font-weight: bold; - transition: all .3s ease-in-out; + font-weight: 200; + } - &::placeholder { - color: rgb(250, 17, 79); - font-weight: 200; - } - - &:focus { - border-color: rgb(250, 17, 79); - } + &:focus { + border-color: rgb(250, 17, 79); + } } input[type=radio] { - transform: scale(1.8); - margin-right: 24px; - margin-top: 8px; + transform: scale(1.8); + margin-right: 24px; + margin-top: 8px; - &:checked { - background-color: black; - color: black; - } + &:checked { + background-color: black; + color: black; + } - &:checked:after { - background-color: black; - color: black; - } + &:checked:after { + background-color: black; + color: black; + } } .form-input-radio { - display: flex; - flex-direction: column; - justify-content: center; - align-content: center; - margin: 4px; - + display: flex; + flex-direction: column; + justify-content: center; + align-content: center; + margin: 4px; } .radio-buttons { - display: flex; - justify-content: space-around; + display: flex; + justify-content: space-around; } .first-time-select { - margin: 8px; + margin: 8px; } - .form-input-button { - display: flex; - justify-content: center; - align-items: center; - width: 300px; - height: 40px; - margin-top: 20px; - margin-bottom: 36px; - button { - border: 3px solid black; - border-radius: 4px; - font-weight: bold; - font-size: 18px; - font-weight: bold; - transition: all .3s ease-in-out; - - &:hover { - background-color: black; - color: white; - } - &:disabled { - color: #bbb; - border-color: #bbb; - pointer-events: none; - } - + display: flex; + justify-content: center; + align-items: center; + width: 300px; + height: 40px; + margin-top: 20px; + margin-bottom: 36px; + button { + border: 3px solid black; + border-radius: 4px; + font-weight: bold; + font-size: 18px; + font-weight: bold; + transition: all .3s ease-in-out; + + &:hover { + background-color: black; + color: white; + } + &:disabled { + color: #bbb; + border-color: #bbb; + pointer-events: none; } + } } input:-webkit-autofill, -input:-webkit-autofill:hover, +input:-webkit-autofill:hover, input:-webkit-autofill:focus, textarea:-webkit-autofill, textarea:-webkit-autofill:hover, @@ -172,33 +175,33 @@ select:-webkit-autofill:focus { } select { - width: 140px; - padding: 6px; - font-size: 16px; - font-weight: bold; - color: rgb(250, 17, 79); - background-color: inherit; - border: 3px solid black; - border-radius: 0px; - margin: 12px; - - &:focus { - border: 3px solid rgb(250, 17, 79); - outline: none; - } + width: 140px; + padding: 6px; + font-size: 16px; + font-weight: bold; + color: rgb(250, 17, 79); + background-color: inherit; + border: 3px solid black; + border-radius: 0px; + margin: 12px; + + &:focus { + border: 3px solid rgb(250, 17, 79); + outline: none; + } } .select-reason { - display: flex; - justify-content: space-around; - margin: 8px; + display: flex; + justify-content: space-around; + margin: 8px; - select { - min-width: 280px; - } + select { + min-width: 280px; + } } .block { - pointer-events: none; - opacity: .4; -} \ No newline at end of file + pointer-events: none; + opacity: .4; +} diff --git a/client/src/sass/ManageProjects.scss b/client/src/sass/ManageProjects.scss index 46899a9dc..94480193b 100644 --- a/client/src/sass/ManageProjects.scss +++ b/client/src/sass/ManageProjects.scss @@ -218,7 +218,6 @@ div.editable-field { background-color: white; } -// create new event form on createNewEvent.js .event-form-box { min-width: 100%; min-height: 540px; @@ -227,25 +226,33 @@ div.editable-field { border: solid black 2px; display: flex; flex-direction: column; + gap: 20px; background-color: white; + + // Temporary solution until Globally applied CSS is refactored/removed + + // Resets the label text size on EventForm.tsx Text Fields + // A global variable was interacting with MUI styles and overflowing the label on in EventForm.tsx + .MuiInputLabel-root { + font-size: inherit; + } + + // Forces horizontal padding inside EventForm.tsx Text Fields + // A global variable was interacting with MUI styles and affecting padding inside in EventForm.tsx + .MuiInputBase-input { + padding-left: 15px !important; + padding-right: 15px !important; + } } -.event-form-box .event-form-title { +.event-form-title { font-size: 20px; - margin-bottom: 16px; } .event-form-row { display: flex; flex-direction: row; -} - -.event-form-label { - display: block; - margin-top: 4px; - select { - display: block; - } + gap: 16px; } .event-form-error { @@ -253,39 +260,6 @@ div.editable-field { margin-bottom: 10px; } -.event-form-box input, -textarea { - display: block; - width: 100%; - padding: 2px 0 15px 10px; - margin: 5px 0; - border: 1px; - border-radius: 5px; - font-size: 20px; - color: black; -} - -.event-form-box select { - color: black; - width: 140px; - padding: 6px; - font-size: 16px; - font-weight: bold; - border: 1px solid black; - border-radius: 0px; - margin: 12px; -} - -.event-form-box textarea { - height: 25px; -} - -.event-form-box label { - font-size: 15px; - width: 100%; - display: block; -} - .button-box { margin-top: 10px; } @@ -312,7 +286,7 @@ textarea { } .event-list-details { - display: flex; + display: flex; } .edit-icon {