Skip to content

Toggles buttons same size, all large buttons same size, help text boxes #172

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

Merged
aperdec merged 1 commit into from
Nov 28, 2016
Merged

Toggles buttons same size, all large buttons same size, help text boxes #172

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
3 changes: 2 additions & 1 deletion WebContent/WEB-INF/jsps/addSignOff.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@
margin: 2%
}
#acc2 {
padding: 21px 26px;
font-size: 16px;
line-height: normal;
border-radius: 8px;
color:white;
width: 170px;
height: 70px;
}
</style>

Expand Down
6 changes: 3 additions & 3 deletions WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,16 @@
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->

<td>
<td style="text-align: center;">
<c:choose>
<c:when test="${deficiency.status}">
<c:url value="/workOrderCompleteDeficiency/${deficiency.id}/${deficiency.homeEnrollmentNumber}/${deficiency.constructionPersonnel}" var="completeUrl" />
<a href="${completeUrl}" class="btn btn-success pull-right">Complete</a>
<a href="${completeUrl}" id="toggleBtnID" class="btn btn-success">Complete</a>

</c:when>
<c:otherwise>
<c:url value="/workOrderCompleteDeficiency/${deficiency.id}/${deficiency.homeEnrollmentNumber}/${deficiency.constructionPersonnel}" var="completeUrl" />
<a href="${completeUrl}" class="btn btn-warning pull-right">Incompleted</a>
<a href="${completeUrl}" id="toggleBtnID" class="btn btn-warning">Incomplete</a>
</c:otherwise>
</c:choose>

Expand Down
4 changes: 3 additions & 1 deletion WebContent/WEB-INF/jsps/displayUnitInfo.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@
border-radius: 15px;
}
#acc2 {
padding: 21px 26px;
font-size: 16px;
line-height: normal;
border-radius: 8px;
color:white;
width: 170px;
height: 70px;
}

#nextBtn {
padding: 24px 34px;
font-size: 16px;
Expand Down
8 changes: 4 additions & 4 deletions WebContent/WEB-INF/jsps/help.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<style>
#feedbackDiv {
width: 50%;
width: 90%;
}

#contactTable {
Expand Down Expand Up @@ -151,19 +151,19 @@ table td {
<div style="margin: 2%">
<legend>Submit a Question or Feedback</legend>
<div id="feedbackDiv" class="form-group">
<div class="col-lg-7 control-label">
<div class="col-lg-10 control-label">
<input type="text" class="form-control" placeholder="Subject">
</div>
<br>
<br>
<div class="col-xs-7 control-label">
<div class="col-lg-10 control-label">
<textarea rows="9" maxlength="350" class="form-control pull-left"
placeholder="Short entry (350 character limit)">
</textarea>
</div>
<br>
<br>
<div class="col-lg-7 control-label">
<div class="col-lg-7 control-label" style="margin:1%">
<address> <form id="reset" >
<a
href="mailto:exampleAbode@exampleAbode.com? subject=Feedback&body=Message"
Expand Down
11 changes: 8 additions & 3 deletions WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@
font-size: 16px;
line-height: normal;
border-radius: 8px;
}

#toggleBtnID{
width:120;

}
</style>

Expand Down Expand Up @@ -81,16 +86,16 @@
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->

<td>
<td style="text-align: center;">
<c:choose>
<c:when test="${unitDeficiency.status}">
<c:url value="/workOrderCompleteDeficiencyUnit/${unitDeficiency.id}/${unitDeficiency.homeEnrollmentNumber}" var="completeUrl" />
<a href="${completeUrl}" class="btn btn-success pull-right">Complete</a>
<a href="${completeUrl}" class="btn btn-success" id="toggleBtnID">Complete</a>

</c:when>
<c:otherwise>
<c:url value="/workOrderCompleteDeficiencyUnit/${unitDeficiency.id}/${unitDeficiency.homeEnrollmentNumber}" var="completeUrl" />
<a href="${completeUrl}" class="btn btn-warning pull-right">Incompleted</a>
<a href="${completeUrl}" class="btn btn-warning" id="toggleBtnID">Incomplete</a>
</c:otherwise>
</c:choose>
</td>
Expand Down
10 changes: 9 additions & 1 deletion WebContent/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,17 @@
Extra Large Button CSS
*/
.btn-xl {
padding: 18px 28px;
padding-top: 18px 28px;
font-size: 22px;
border-radius: 8px;

}

#toggleBtnID{
width:120px;

}

.no-link {
color:inherit;
text-decoration:none;
Expand Down Expand Up @@ -44,6 +50,8 @@ Extra Large Button CSS
font-size: 16px;
line-height: normal;
border-radius: 8px;
width: 170px;
height: 70px;
}

#btnXlg2 {
Expand Down