Skip to content

Commit

Permalink
Removed hard-coded images, and replaced with CSS style names.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jalbr74
jalbr74 committed Dec 16, 2015
1 parent 9bc8c64 commit 45517a8
Show file tree
Hide file tree
Showing 3 changed files with 110 additions and 66 deletions.
4 changes: 1 addition & 3 deletions src/main/webapp/WEB-INF/jsp/fragment/header-warnings.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,7 @@
</div>
<div id="panel-header-healthData" class="header-warning-row header-warning-healthData"></div>
<div class="header-warning-row header-warning-version"><%=PwmConstants.PWM_APP_NAME_VERSION%></div>
<div id="button-closeHeader" title="<pwm:display key="Button_Hide"/>">
<img src="../public/resources/close_40.png">
</div>
<div id="button-closeHeader" title="<pwm:display key="Button_Hide"/>"></div>
</div>
<div id="button-openHeader" title="<pwm:display key="Button_Show"/>">
<span class="pwm-icon pwm-icon-chevron-circle-left"></span>
Expand Down
20 changes: 10 additions & 10 deletions src/main/webapp/private/index.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<a id="button_ChangePassword" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.ChangePassword.servletUrl()%>'/>" style="font-weight: normal;">
<div class="tile">
<div class="tile-content">
<div class="tile-image"><img src="../public/resources/password_50b.png" /></div>
<div class="tile-image password-image"></div>
<div class="tile-title"><pwm:display key="Title_ChangePassword"/></div>
<div class="tile-subtitle"><pwm:display key="Long_Title_ChangePassword"/></div>
</div>
Expand All @@ -52,7 +52,7 @@
<a href="<pwm:url addContext="true" url='<%=PwmServletDefinition.PeopleSearch.servletUrl()%>'/>" style="font-weight: normal;">
<div class="tile">
<div class="tile-content">
<div class="tile-image"><img src="../public/resources/search_50b.png" /></div>
<div class="tile-image search-image"></div>
<div class="tile-title"><pwm:display key="Title_PeopleSearch"/></div>
<div class="tile-subtitle"><pwm:display key="Long_Title_PeopleSearch"/></div>
</div>
Expand All @@ -66,7 +66,7 @@
<a id="button_SetupResponses" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.SetupResponses.servletUrl()%>'/>" style="font-weight: normal;">
<div class="tile">
<div class="tile-content">
<div class="tile-image"><img src="../public/resources/security_50b.png" /></div>
<div class="tile-image security-image"></div>
<div class="tile-title"><pwm:display key="Title_SetupResponses"/></div>
<div class="tile-subtitle"><pwm:display key="Long_Title_SetupResponses"/></div>
</div>
Expand All @@ -80,7 +80,7 @@
<a id="button_SetupOtpSecret" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.SetupOtp.servletUrl()%>'/>" style="font-weight: normal;">
<div class="tile">
<div class="tile-content">
<div class="tile-image"><img src="../public/resources/mobile_50b.png" /></div>
<div class="tile-image mobile-image"></div>
<div class="tile-title"><pwm:display key="Title_SetupOtpSecret"/></div>
<div class="tile-subtitle"><pwm:display key="Long_Title_SetupOtpSecret"/></div>
</div>
Expand All @@ -94,7 +94,7 @@
<a id="button_UpdateProfile" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.UpdateProfile.servletUrl()%>'/>" style="font-weight: normal;">
<div class="tile">
<div class="tile-content">
<div class="tile-image"><img src="../public/resources/profile_50b.png" /></div>
<div class="tile-image profile-image"></div>
<div class="tile-title"><pwm:display key="Title_UpdateProfile"/></div>
<div class="tile-subtitle"><pwm:display key="Long_Title_UpdateProfile"/></div>
</div>
Expand All @@ -107,7 +107,7 @@
<a id="button_Shortcuts" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.Shortcuts.servletUrl()%>'/>" style="font-weight: normal;">
<div class="tile">
<div class="tile-content">
<div class="tile-image"><img src="../public/resources/shortcut_50b.png" /></div>
<div class="tile-image shortcut-image"></div>
<div class="tile-title"><pwm:display key="Title_Shortcuts"/></div>
<div class="tile-subtitle"><pwm:display key="Long_Title_Shortcuts"/></div>
</div>
Expand All @@ -119,7 +119,7 @@
<a id="button_UserInformation" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.AccountInformation.servletUrl()%>'/>" style="font-weight: normal;">
<div class="tile">
<div class="tile-content">
<div class="tile-image"><img src="../public/resources/user_50b.png" /></div>
<div class="tile-image user-image"></div>
<div class="tile-title"><pwm:display key="Title_UserInformation"/></div>
<div class="tile-subtitle"><pwm:display key="Long_Title_UserInformation"/></div>
</div>
Expand All @@ -132,7 +132,7 @@
<a id="button_helpdesk" href="<pwm:url addContext="true" url='<%=PwmServletDefinition.Helpdesk.servletUrl()%>'/>" style="font-weight: normal;">
<div class="tile">
<div class="tile-content">
<div class="tile-image"><img src="../public/resources/support_50b.png" /></div>
<div class="tile-image support-image"></div>
<div class="tile-title"><pwm:display key="Title_Helpdesk"/></div>
<div class="tile-subtitle"><pwm:display key="Long_Title_Helpdesk"/></div>
</div>
Expand All @@ -146,7 +146,7 @@
<a id="button_GuestRegistration" href="<pwm:url url='<%=PwmServletDefinition.GuestRegistration.servletUrl()%>' addContext="true"/>" style="font-weight: normal;">
<div class="tile">
<div class="tile-content">
<div class="tile-image"><img src="../public/resources/guest_50b.png" /></div>
<div class="tile-image guest-image"></div>
<div class="tile-title"><pwm:display key="Title_GuestRegistration"/></div>
<div class="tile-subtitle"><pwm:display key="Long_Title_GuestRegistration"/></div>
</div>
Expand All @@ -160,7 +160,7 @@
<a id="button_Admin" href="<pwm:url url='<%=PwmServletDefinition.Admin.servletUrl()%>' addContext="true"/> " style="font-weight: normal;">
<div class="tile">
<div class="tile-content">
<div class="tile-image"><img src="../public/resources/admin_50b.png" /></div>
<div class="tile-image admin-image"></div>
<div class="tile-title"><pwm:display key="Title_Admin"/></div>
<div class="tile-subtitle"><pwm:display key="Long_Title_Admin"/></div>
</div>
Expand Down
152 changes: 99 additions & 53 deletions src/main/webapp/public/resources/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,55 +258,101 @@ input[type=password]::-ms-reveal{display: none;}

/* tile styles */
#centerbody.tile-centerbody {
position: relative;
background-color: transparent;
border: 0;
padding: 25px;
margin-top: 0;
min-width: 150px;
box-shadow: none;
}
position: relative;
background-color: transparent;
border: 0;
padding: 25px;
margin-top: 0;
min-width: 150px;
box-shadow: none;
}

.tile {
position: relative;
float: left;
background: #fff;
border: 1px solid #f6f9f8;
border-radius: 2px;
margin-right: 5px;
margin-bottom: 5px;
text-align: center;
padding: 10px;
width: 140px;
height: 170px;
overflow: hidden;
z-index: 600;
}
.tile:hover {
background: #fff;
border: 1px solid #808080;
cursor: pointer;
}
.tile-image {
height: 50px;
margin-bottom: 5px;
}
.tile-title {
color: #434c50;
font-size: 16px;
line-height: 18px;
max-height: 34px;
overflow: hidden;
margin-bottom: 2px;
text-overflow: ellipsis;
}
.tile-subtitle {
font-size: 12px;
font-weight: normal;
line-height: 14px;
color: #808080;
overflow: hidden;
height: 70px;
}
position: relative;
float: left;
background: #fff;
border: 1px solid #f6f9f8;
border-radius: 2px;
margin-right: 5px;
margin-bottom: 5px;
text-align: center;
padding: 10px;
width: 140px;
height: 170px;
overflow: hidden;
z-index: 600;
}

.tile:hover {
background: #fff;
border: 1px solid #808080;
cursor: pointer;
}

.tile-image {
background: transparent none no-repeat scroll center center;
height: 50px;
margin-bottom: 5px;
}

.tile-image.password-image {
background-image: url("password_50b.png");
}

.tile-image.search-image {
background-image: url("search_50b.png");
}

.tile-image.security-image {
background-image: url("security_50b.png");
}

.tile-image.mobile-image {
background-image: url("mobile_50b.png");
}

.tile-image.profile-image {
background-image: url("profile_50b.png");
}

.tile-image.shortcut-image {
background-image: url("shortcut_50b.png");
}

.tile-image.user-image {
background-image: url("user_50b.png");
}

.tile-image.support-image {
background-image: url("support_50b.png");
}

.tile-image.guest-image {
background-image: url("guest_50b.png");
}

.tile-image .admin-image {
background-image: url("admin_50b.png");
}

.tile-title {
color: #434c50;
font-size: 16px;
line-height: 18px;
max-height: 34px;
overflow: hidden;
margin-bottom: 2px;
text-overflow: ellipsis;
}

.tile-subtitle {
font-size: 12px;
font-weight: normal;
line-height: 14px;
color: #808080;
overflow: hidden;
height: 70px;
}

/* all forms use a buttonbar div containing the action buttons */
.buttonbar {
Expand Down Expand Up @@ -664,14 +710,14 @@ select {
#button-openHeader span {font-size: 16px;}

#button-closeHeader {
background: transparent url("close_40.png") no-repeat scroll 0 0 / cover ;
cursor: pointer;
height: 20px;
position: absolute;
top: 5px;
right: 5px;
cursor: pointer
top: 5px;
width: 20px;
}
#button-closeHeader img {
width: 20px;
}

.footnote {
font-style: italic;
Expand Down

0 comments on commit 45517a8

Please sign in to comment.