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

Colorblind fixes #337

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Colorblind fixes #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
020e3b7
Mini updates
markhogan1001 May 13, 2020
5893621
Merge branch 'master' into colorblind
markhogan1001 May 13, 2020
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
11 changes: 4 additions & 7 deletions src/main/resources/edu/wpi/cs3733/d20/teamO/views/admin/EmployeeHandler.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
styleClass="additionalButton"
text="Delete"/>
<Label text="INSTRUCTIONS:"
style="-fx-text-fill: floralwhite">
styleClass="adminLabel">
<padding>
<Insets top="32.0"/>
</padding>
Expand All @@ -69,18 +69,15 @@
</font>
</Label>
<Label text="Add: To add an employee, click Add and fill in fields." wrapText="true"
style="-fx-text-fill: floralwhite"
styleClass="adminLabels"/>
styleClass="adminLabel"/>
<Label contentDisplay="CENTER"
text="Edit: To edit an employee, select an employee in the table. Then click Edit and update fields as necessary."
wrapText="true"
style="-fx-text-fill: floralwhite"
styleClass="adminLabels"/>
styleClass="adminLabel"/>
<Label
text="Delete: To delete an employee, select an employee in the table. Then click Delete."
wrapText="true"
style="-fx-text-fill: floralwhite"
styleClass="adminLabels"/>
styleClass="adminLabel"/>
</children>
<padding>
<Insets bottom="16.0" left="16.0" right="16.0" top="16.0"/>
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/edu/wpi/cs3733/d20/teamO/views/admin/RequestHandler.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,16 @@
<children>
<JFXTextArea centerShape="false" editable="false" prefHeight="50.0"
prefWidth="355.0"
styleClass="adminLabel"
text="%requestHandlerStep1"
wrapText="true"/>
<JFXTextArea editable="false" prefHeight="64.0" prefWidth="355.0"
text="%requestHandlerStep2"
styleClass="adminLabel"
wrapText="true"/>
<JFXTextArea editable="false" prefHeight="72.0" prefWidth="355.0"
text="%requestHandlerStep3"
styleClass="adminLabel"
wrapText="true"/>
</children>
</VBox>
Expand Down