Merge remote-tracking branch 'origin/master'

This commit is contained in:
jrivard@gmail.com 2018-11-07 04:58:17 -05:00
commit 2868f4c486
3 changed files with 41 additions and 1 deletions

View file

@ -50,6 +50,7 @@
<link rel="icon" type="image/png" href="<pwm:url url='/public/resources/favicon.png' addContext="true"/>"/>
<link rel="stylesheet" type="text/css" href="<pwm:url url='/public/resources/pwm-icons.css' addContext="true"/>"/>
<link href="<pwm:url url='/public/resources/style.css' addContext="true"/>" rel="stylesheet" type="text/css" media="screen"/>
<link href="<pwm:url url='/public/resources/style-print.css' addContext="true"/>" rel="stylesheet" type="text/css" media="print"/>
<link href="<pwm:url url="%THEME_URL%"/>" rel="stylesheet" type="text/css" media="screen"/>
<pwm:if test="<%=PwmIfTest.requestFlag%>" requestFlag="<%=PwmRequestFlag.NO_MOBILE_CSS%>" negate="true">
<link media="only screen and (max-width: 600px)" href="<pwm:url url='/public/resources/mobileStyle.css' addContext="true"/>" type="text/css" rel="stylesheet"/><%-- iphone css --%>

View file

@ -26,7 +26,7 @@
<%@ taglib uri="pwm" prefix="pwm" %>
<html lang="<pwm:value name="<%=PwmValue.localeCode%>"/>" dir="<pwm:value name="<%=PwmValue.localeDir%>"/>">
<%@ include file="/WEB-INF/jsp/fragment/header.jsp" %>
<body class="nihilo">
<body class="nihilo printable">
<div id="wrapper" class="peoplesearch-wrapper">
<jsp:include page="/WEB-INF/jsp/fragment/header-body.jsp">
<jsp:param name="pwm.PageName" value="Title_PeopleSearch"/>

View file

@ -0,0 +1,39 @@
/*
* Password Management Servlets (PWM)
* http://www.pwm-project.org
*
* Copyright (c) 2006-2009 Novell, Inc.
* Copyright (c) 2009-2018 The PWM Project
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/* Hide header and footer when printing */
body.printable #header,
body.printable #header-warning,
body.printable-page #header-warning-backdrop,
body.printable .ias-header,
body.printable #footer
{
display: none;
}
body.printable {
/* This tells Chrome and Safari to print background images and colors (even when the browser setting is turned off) */
-webkit-print-color-adjust: exact;
/* This tells Firefox to print background images and colors (even when the browser setting is turned off) */
color-adjust: exact;
}