Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Edit/Return Exam Modal Styling #106

Merged
merged 1 commit into from
Jan 21, 2019
Merged

Edit/Return Exam Modal Styling #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions frontend/src/assets/css/q.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
top: 20%;
width: 50%;
height: 60%;
overflow: auto;
overflow: hidden;
transition: display 1s;
border: 10px solid white;
border-radius: 25px;
Expand Down Expand Up @@ -40,7 +40,7 @@
top: 35%;
width: 30%;
height: 22%;
overflow: auto;
overflow: hidden;
transition: display 1s;
border: 10px solid white;
border-radius: 25px;
Expand All @@ -55,7 +55,22 @@
top: 35%;
width: 22%;
height: 22%;
overflow: auto;
overflow: hidden;
transition: display 1s;
border: 10px solid white;
border-radius: 25px;
padding-left: 10px;
}

.exam-modal-content-message-failure {
background-color: #fefefe;
position: fixed;
z-index: 3;
left: 35%;
top: 35%;
width: 35%;
height: 20%;
overflow: hidden;
transition: display 1s;
border: 10px solid white;
border-radius: 25px;
Expand Down Expand Up @@ -103,11 +118,11 @@
.return-exam-modal {
position: fixed;
z-index: 3;
left: 25%;
top: 25%;
width: 50%;
left: 35%;
top: 35%;
width: 40%;
height: 33%;
overflow: auto;
overflow: hidden;
transition: display 1s;
border: 10px solid white;
border-radius: 25px;
Expand Down
9 changes: 5 additions & 4 deletions frontend/src/exams/return-exam-form-modal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<template v-if="showExamEditModalVisible">
<div id ="examBackground" class="edit-exam-modal-background">
<div id="examModal" v-bind:class="{'return-exam-modal': !editExamSuccess,
'exam-modal-content-message': editExamSuccess || editExamFailure }">
<div id="examModal" v-bind:class="{'return-exam-modal': !editExamSuccess && !editExamFailure,
'exam-modal-content-message': editExamSuccess,
'exam-modal-content-message-failure': editExamFailure }">
<div v-bind:class="{ 'edit-exam-modal-content': !editExamSuccess, 'exam-modal-content-message': editExamSuccess }">
<div class="modal_header" v-if="!editExamSuccess && !editExamFailure">
<div>
Expand All @@ -13,15 +14,15 @@
</b-row>
<b-row class="my-1">
<b-col sm="4"><label>Exam Returned: </label></b-col>
<b-col sm="6">
<b-col sm="7">
<select class="form-control" name="examReturned" v-model=selectedReturned>
<option v-for="returned in examReturnedOptions" :value="returned.value">{{ returned.value }}</option>
</select>
</b-col>
</b-row>
<b-row>
<b-col sm="4"><label>Tracking Number: </label></b-col>
<b-col sm="6"><b-form-input id="trackingNumber" type="text" v-model=fields.exam_returned_tracking_number></b-form-input></b-col>
<b-col sm="7"><b-form-input id="trackingNumber" type="text" v-model=fields.exam_returned_tracking_number></b-form-input></b-col>
</b-row>
</b-container>
</div>
Expand Down