Project

General

Profile

« Previous | Next » 

Revision 8240

Pull the external stylesheets in by <link> rather than @import for faster page load

View differences:

lib/admin/admin.css
117 117
	margin-top: 10px;
118 118
}
119 119

  
120
table{
121
	background: none;
122
}
120 123

  
121 124

  
125

  
122 126
/* NAVIGATION AND HEADER AND FOOTER
123 127
------------------------------------- */
124 128
.footer{
......
200 204
	font-size: 0.8em;
201 205
	margin-top: 5px;
202 206
	clear: both;
203
	height: 2em;
207
	min-height: 2em;
204 208
}
205 209

  
206 210
.button, input[type="submit"], input[type="button"] {
......
304 308
.configuration-table{
305 309
	border-collapse: separate;
306 310
	border-spacing: 6px;
311
	background: none;
307 312
}
308 313

  
309 314
.configure-link {
lib/admin/skins-configuration.jsp
38 38
<head>
39 39

  
40 40
<title>Skins Configuration</title>
41
<link rel="stylesheet" type="text/css" 
42
        href="<%= request.getContextPath() %>/admin/admin.css"></link>
43
<script language="JavaScript" type="text/JavaScript" src="<%= request.getContextPath() %>/admin/admin.js"></script>
44

  
41
<%@ include file="./head-section.jsp"%>
45 42
</head>
46 43
<body>
47 44
<%@ include file="./header-section.jsp"%>
lib/admin/admin-login.jsp
35 35
<head>
36 36

  
37 37
<title>Database Install/Upgrade Utility</title>
38
<link rel="stylesheet" type="text/css" 
39
        href="<%= request.getContextPath() %>/admin/admin.css"></link>
40
<script language="JavaScript" type="text/JavaScript" src="<%= request.getContextPath() %>/admin/admin.js"></script>
38
<%@ include file="./head-section.jsp"%>
41 39

  
42 40
</head>
43 41
<body>
lib/admin/replication-configuration-include.jsp
30 30
<head>
31 31

  
32 32
<title>Replication Configuration</title>
33
<link rel="stylesheet" type="text/css"
34
	href="<%=request.getContextPath()%>/admin/admin.css"></link>
35
<script language="JavaScript" type="text/JavaScript"
36
	src="<%=request.getContextPath()%>/admin/admin.js"></script>
37

  
33
<%@ include file="./head-section.jsp"%>
38 34
</head>
39 35
<body>
40 36
<%@ include file="./header-section.jsp"%>
lib/admin/properties-configuration.jsp
32 32
<head>
33 33

  
34 34
<title>Metacat Properties Configuration</title>
35
<link rel="stylesheet" type="text/css" 
36
        href="<%= request.getContextPath() %>/admin/admin.css"></link>
37
<script language="JavaScript" type="text/JavaScript" src="<%= request.getContextPath() %>/admin/admin.js"></script>
38

  
35
<%@ include file="./head-section.jsp"%>
39 36
</head>
40 37
<body>
41 38
<%@ include file="./header-section.jsp"%> 
lib/admin/head-section.jsp
1
<%@ page language="java" %>
2
<% 
3
/**
4
 *  '$RCSfile$'
5
 *    Copyright: 2008 Regents of the University of California and the
6
 *               National Center for Ecological Analysis and Synthesis
7
 *  For Details: http://www.nceas.ucsb.edu/
8
 *
9
 *   '$Author: daigle $'
10
 *     '$Date: 2008-07-06 21:25:34 -0700 (Sun, 06 Jul 2008) $'
11
 * '$Revision: 4080 $'
12
 * 
13
 * This program is free software; you can redistribute it and/or modify
14
 * it under the terms of the GNU General Public License as published by
15
 * the Free Software Foundation; either version 2 of the License, or
16
 * (at your option) any later version.
17
 *
18
 * This program is distributed in the hope that it will be useful,
19
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
20
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
21
 * GNU General Public License for more details.
22
 *
23
 * You should have received a copy of the GNU General Public License
24
 * along with this program; if not, write to the Free Software
25
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
26
 */
27
%>
28

  
29
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.no-icons.min.css" type="text/css" />
30
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" type="text/css" />
31
<script language="JavaScript" type="text/JavaScript"
32
	src="<%= request.getContextPath() %>/admin/admin.js"></script>
33
<link rel="stylesheet" type="text/css"
34
	href="<%= request.getContextPath() %>/admin/admin.css"></link>
35
	
0 36

  
lib/admin/auth-configuration.jsp
31 31
<head>
32 32

  
33 33
<title>Authentication Configuration</title>
34
<link rel="stylesheet" type="text/css" 
35
        href="<%= request.getContextPath() %>/admin/admin.css"></link>
36
<script language="JavaScript" type="text/JavaScript" src="<%= request.getContextPath() %>/admin/admin.js"></script>
34
<%@ include file="./head-section.jsp"%>
37 35

  
38 36
<SCRIPT LANGUAGE="JavaScript" TYPE="TEXT/JAVASCRIPT">
39 37
<!--
lib/admin/geoserver-configuration.jsp
32 32
<head>
33 33

  
34 34
<title>Geoserver Configuration</title>
35
<link rel="stylesheet" type="text/css" 
36
        href="<%= request.getContextPath() %>/admin/admin.css"></link>
37
<script language="JavaScript" type="text/JavaScript" src="<%= request.getContextPath() %>/admin/admin.js"></script>
38

  
35
<%@ include file="./head-section.jsp"%>
39 36
</head>
40 37
<body>
41 38
<%@ include file="./header-section.jsp"%>
lib/admin/database-configuration.jsp
39 39
<head>
40 40

  
41 41
<title>Database Install/Upgrade Utility</title>
42
<link rel="stylesheet" type="text/css" 
43
        href="<%= request.getContextPath() %>/admin/admin.css"></link>
44
<script language="JavaScript" type="text/JavaScript" src="<%= request.getContextPath() %>/admin/admin.js"></script>
45

  
42
<%@ include file="./head-section.jsp"%>
46 43
</head>
47 44
<body>
48 45
<%@ include file="./header-section.jsp"%>
lib/admin/organization-configuration.jsp
37 37
<head>
38 38

  
39 39
<title>Organization Configuration</title>
40
<link rel="stylesheet" type="text/css" 
41
        href="<%= request.getContextPath() %>/admin/admin.css"></link>
42
<script language="JavaScript" type="text/JavaScript" src="<%= request.getContextPath() %>/admin/admin.js"></script>
43

  
40
<%@ include file="./head-section.jsp"%>
44 41
</head>
45 42
<body>
46 43
<div class="document">
lib/admin/backup-configuration.jsp
32 32
<head>
33 33

  
34 34
<title>Backup Directory Configuration</title>
35
<link rel="stylesheet" type="text/css"
36
	href="<%= request.getContextPath() %>/admin/admin.css"></link>
37
<script language="JavaScript" type="text/JavaScript"
38
	src="<%= request.getContextPath() %>/admin/admin.js"></script>
39

  
35
<%@ include file="./head-section.jsp"%>
40 36
</head>
41 37
<body>
42 38
	<img src="<%= request.getContextPath() %>/metacat-logo-white.png"
lib/admin/replication-configuration.jsp
32 32
<head>
33 33

  
34 34
<title>Replication Configuration</title>
35
<link rel="stylesheet" type="text/css" 
36
        href="<%= request.getContextPath() %>/admin/admin.css"></link>
37
<script language="JavaScript" type="text/JavaScript" src="<%= request.getContextPath() %>/admin/admin.js"></script>
38

  
35
<%@ include file="./head-section.jsp"%>
39 36
</head>
40 37

  
41 38
<FRAMESET ROWS="*,150"  FRAMEBORDER=0 BORDER=0>
lib/admin/dataone-configuration.jsp
32 32
<head>
33 33

  
34 34
<title>DataONE Configuration</title>
35
<link rel="stylesheet" type="text/css" 
36
        href="<%= request.getContextPath() %>/admin/admin.css"></link>
37
<script language="JavaScript" type="text/JavaScript" src="<%= request.getContextPath() %>/admin/admin.js"></script>
38

  
35
<%@ include file="./head-section.jsp"%>
39 36
</head>
40 37
<body>
41 38
<%@ include file="./header-section.jsp"%>
docs/user/metacat/source/themes/metacatui/layout.html
119 119
      {%- set titlesuffix = "" %}
120 120
    {%- endif %}
121 121
    <title>{{ title|striptags }}{{ titlesuffix }}</title>
122
    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.no-icons.min.css" type="text/css" />
123
    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" type="text/css" />
122 124
    <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
123 125
    <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
124 126
    {%- if not embedded %}
docs/user/metacat/source/themes/metacatui/static/metacatui.css
15 15
Bold 700
16 16
*/
17 17

  
18
/*Importing external stylesheets */
19
@import url('//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.no-icons.min.css');
20
@import url('//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css');
21

  
22

  
23 18
/* BANNER/HEADER CSS
24 19
---------------------------------------------------- */
25 20
.banner{
......
88 83
.related > ul input[type="submit"]{	/*"Go" button on navigation search bar */
89 84
	position: relative;
90 85
	left: -30px;
91
	top: 2px;
86
	top: 0px;
92 87
	height: 27px;
93 88
	background: none;
94 89
	border-radius: 0 4px 4px 0;
......
163 158
	margin: 20px 0px 30px 20px;
164 159
	background: rgba(255,255,255, 0.5);
165 160
	border-radius: 20px;
166
	padding: 20px;
161
	padding: 10px;
167 162
	max-width:60%;
168 163
}
169 164

  
......
312 307
    	margin: 0px;
313 308
    }
314 309
    
310
    li{
311
    	margin-left: 10px;
312
    }
313
    
315 314
    select{
316 315
    	font: 300 16px/16px "Oswald" Arial sans-serif;
317 316
    }

Also available in: Unified diff