Project

General

Profile

« Previous | Next » 

Revision 8627

Changed some of the font and stlyes of the metacat docs for easier reading and fixed a big where the metacat admin "configure" buttons were not working

View differences:

lib/admin/admin.css
44 44
     -webkit-background-size: cover;
45 45
	 -moz-background-size: cover;
46 46
	 -o-background-size: cover;
47
	 font: 400 1em/1.2em Source Sans Pro, Arial, sans-serif;
47
	 font-weight: 400;
48
	 font-size: 1em;
49
	 line-height: 1.2em;
50
	 font-family: "Helvetica", "Source Sans Pro", sans-serif;
51
	 overflow-x: hidden;
48 52
}
49 53

  
50
h1{
51
	font: 400 3em/3em "Oswald", Arial, sans-serif;
52
	-webkit-margin-before: 0.2em;
53
	-webkit-margin-after: 0.2em;
54
	display: block;
55
	clear: both;
56
}
57 54

  
58
h2 {
59
	font: 400 2.5em/2.5em "Oswald", Arial, sans-serif;
60
	-webkit-margin-before: 0.2em;
61
	-webkit-margin-after: 0.2em;
62
	display: block;
63
	clear: both;
64
}
65 55

  
66
h3 {
67
	font: 400 1.5em/1.5em "Oswald", Arial, sans-serif;
68
	-webkit-margin-before: 0.2em;
69
	-webkit-margin-after: 0.2em;
70
	display: block;
71
	clear: both;
72
	margin-top: 20px;
73
}
74

  
56
	h3 {
57
		font-size: 1.2em;
58
		line-height: 2em;
59
		display: block;
60
		clear: both;
61
		margin: 0px;
62
	}
63
	
64
	h2{
65
		font-size: 2em;
66
		line-height: 2.1em;
67
		font-weight: 400;
68
		display: block;
69
		clear: both;
70
		margin: 0px;
71
	}
72
	
73
	h1{
74
		font-size: 2.5em;
75
		line-height: 2.8em;
76
		display: inline-block;
77
		clear: both;
78
		margin: 0px;
79
	}
80
	
81
	h1 > a, 
82
	h2 > a,
83
	h3 > a,
84
	h4 > a{
85
		color: #333333;
86
	}
87
	
75 88
input {
76 89
	padding-left: 4px;
77 90
	width: 400px;
......
90 103
	height: 2em;
91 104
}
92 105

  
93
input[type="submit"] {
94
	width: 100px;
106
input[type="submit"],
107
input[type="button"] {
108
	min-width: 100px;
95 109
	margin-right: 5px;
96 110
	margin-top: 20px;
97 111
	cursor: pointer;
112
	background-color: #555;
113
	color: #FFF;
98 114
}
99 115

  
100 116
input[type="radio"] {
......
158 174
.footer li > a,
159 175
.header li > a{
160 176
	color: #FFFFFF;
161
	font: 400 2em/2em Oswald, Arial;
177
	font: 400 1.5em/1.5em Oswald, Arial;
162 178
	text-transform: uppercase;
163 179
}
164 180

  
......
168 184
	text-decoration: none;
169 185
}
170 186

  
171
.document{
172
	position: relative;
173
	margin-top: 20px;
174
	padding-bottom: 10px;
175
	min-height: 800px;
176
}
177

  
178 187
.header{
179 188
	height: 100px;
180 189
	margin: 10px;
......
213 222
	top: -5px;
214 223
}
215 224

  
216
.button, input[type="submit"], input[type="button"] {
217
	width: 100px;
218
	margin: 20px 5px 10px 0px;
219
	font: 400 1.2em/1.5em Oswald, Arial;
220
	cursor: pointer;
221
	height: 1.7em;
222
}
223 225

  
224 226

  
225 227
.checkradio-label-inline {
......
343 345
	background: none;
344 346
}
345 347

  
346
.configure-link {
348
.configure-link a{
347 349
	background: rgba(255, 255, 255, 0.7);
348 350
	border-radius: 10px;
349 351
	-moz-border-radius: 10px;
350 352
	-webkit-border-radius: 10px;
351 353
	color: #333333;
354
	width: 207px;
355
	display: block;
356
	text-align: center;
357
	padding-top: 5px;
358
	padding-bottom: 5px;
352 359
}
353 360

  
354
.configure-link.inactive{
355
	background: none;
356
}
357 361

  
358
.configure-link.inactive:hover{
359
	background: none;
360
	cursor: default;
361
	color: #333333;
362
}
363

  
364 362
.configure-link > i,
365 363
.configure-link > a{
366 364
	color: inherit;
367 365
	vertical-align: middle;
368 366
}
369 367

  
370
.configure-link:hover,
371
.configure-link:hover > a,
372
.configure-link:hover > i{
373
	background: rgba(255, 255, 255, 1);
374
	color: #166194;
375
	text-decoration: none;
376
	cursor: pointer;
377
}
378

  
379 368
.hiding-section {
380 369
	display: none;
381 370
	width: 100%;
lib/admin/metacat-configuration.jsp
69 69
	        <tr>
70 70
	        <td class="configured-tag"><i class="icon-ok"></i> configured </td>
71 71
			<td class="property-title"> Metacat Global Properties </td> 
72
			<td class="configure-link"> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=properties">Reconfigure Now</a> </td>
72
			<td class="configure-link"><a href="<%= request.getContextPath() %>/admin?configureType=properties"> <i class="icon-cogs"></i>Reconfigure Now</a> </td>
73 73
	        </tr>
74 74
	<%
75 75
		} else {
......
77 77
	        <tr>
78 78
	 		<td class="unconfigured-tag">unconfigured </td>  
79 79
	 		<td class="property-title"> Metacat Global Properties </td>
80
			<td class="configure-link"> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=properties">Configure Now</a> </td>			
80
			<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=properties"><i class="icon-cogs"></i> Configure Now</a> </td>			
81 81
	    	</tr>
82 82
	<%
83 83
		}
......
87 87
	        <tr>
88 88
	        <td class="configured-tag"><i class="icon-ok"></i>configured </td>
89 89
			<td class="property-title"> Authentication Configuration </td> 
90
			<td class="configure-link"> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=auth">Reconfigure Now</a> </td>
90
			<td class="configure-link"><a href="<%= request.getContextPath() %>/admin?configureType=auth"><i class="icon-cogs"></i>Reconfigure Now</a> </td>
91 91
	        </tr>
92 92
	<%
93 93
		} else {
......
95 95
	        <tr>
96 96
	 		<td class=unconfigured-tag>unconfigured</td>  
97 97
	 		<td class=property-title> Authentication Configuration </td>
98
			<td class=configure-link> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=auth">Configure Now</a> </td>			
98
			<td class=configure-link><a href="<%= request.getContextPath() %>/admin?configureType=auth"><i class="icon-cogs"></i>Configure Now</a> </td>			
99 99
	    	</tr>
100 100
	<%
101 101
		}
......
105 105
	        <tr>
106 106
	        <td class="configured-tag"><i class="icon-ok"></i>configured</td>
107 107
			<td class="property-title"> Skins Specific Properties </td> 
108
			<td class="configure-link"> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=skins">Reconfigure Now</a> </td>
108
			<td class="configure-link"><a href="<%= request.getContextPath() %>/admin?configureType=skins"><i class="icon-cogs"></i>Reconfigure Now</a> </td>
109 109
	        </tr>
110 110
	<%
111 111
		} else {
......
113 113
	        <tr>
114 114
	 		<td class="unconfigured-tag">unconfigured </td>  
115 115
	 		<td class="property-title"> Skins Specific Properties </td>
116
			<td class="configure-link"> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=skins">Configure Now</a> </td>			
116
			<td class="configure-link"><a href="<%= request.getContextPath() %>/admin?configureType=skins"><i class="icon-cogs"></i>Configure Now</a> </td>			
117 117
	    	</tr>
118 118
	<%
119 119
		}  
......
137 137
		if (propsConfigured != null && propsConfigured) {
138 138
	%>
139 139
	        	
140
			<td class="configure-link"> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=database">Configure Now</a> </td>			
140
			<td class="configure-link"><a href="<%= request.getContextPath() %>/admin?configureType=database"><i class="icon-cogs"></i> Configure Now</a> </td>			
141 141
	        	
142 142
	<%
143 143
				        		} else {
......
155 155
	    	<tr>
156 156
	    	<td class="configured-tag"><i class="icon-ok"></i> configured </td>
157 157
	    	<td class="property-title"> Geoserver Configuration </td> 
158
			<td class="configure-link"> <i class="icon-cogs"></i> <a href="<%= request.getContextPath() %>/admin?configureType=geoserver">Reconfigure Now</a> </td>   		
158
			<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=geoserver"><i class="icon-cogs"></i> Reconfigure Now</a> </td>   		
159 159
	    	</tr>
160 160
	<%
161 161
		} else if (geoserverConfigured != null && geoserverConfigured.equals(PropertyService.BYPASSED)){
......
167 167
			if (propsConfigured != null && propsConfigured) {
168 168
	%>
169 169
	        	
170
			<td class="configure-link"> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=geoserver">Reconfigure Now</a> </td>			       	
170
			<td class="configure-link"><a href="<%= request.getContextPath() %>/admin?configureType=geoserver"><i class="icon-cogs"></i>Reconfigure Now</a> </td>			       	
171 171
	<%
172 172
			} else {
173 173
	%> 
......
186 186
			if (propsConfigured != null && propsConfigured) {
187 187
	%>
188 188
	        	
189
			<td class="configure-link"> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=geoserver">Configure Now</a> </td>			
189
			<td class="configure-link"><a href="<%= request.getContextPath() %>/admin?configureType=geoserver"><i class="icon-cogs"></i> Configure Now</a> </td>			
190 190
	        	
191 191
	<%
192 192
			} else {
......
207 207
	    	<tr>
208 208
	    	<td class="configured-tag"><i class="icon-ok"></i> configured</td>
209 209
	    	<td class="property-title"> Dataone Configuration </td> 
210
			<td class="configure-link"> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=dataone">Reconfigure Now</a> </td>   		
210
			<td class="configure-link"><a href="<%= request.getContextPath() %>/admin?configureType=dataone"><i class="icon-cogs"></i>Reconfigure Now</a> </td>   		
211 211
	    	</tr>
212 212
	<%
213 213
		} else if (dataoneConfigured != null && dataoneConfigured.equals(PropertyService.BYPASSED)){
......
219 219
			if (propsConfigured != null && propsConfigured) {
220 220
	%>
221 221
	        	
222
			<td class="configure-link"> <i class="icon-cogs"></i> <a href="<%= request.getContextPath() %>/admin?configureType=dataone">Reconfigure Now</a> </td>			       	
222
			<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=dataone"><i class="icon-cogs"></i> Reconfigure Now</a> </td>			       	
223 223
	<%
224 224
			} else {
225 225
	%> 
......
238 238
			if (propsConfigured != null && propsConfigured) {
239 239
	%>
240 240
	        	
241
			<td class="configure-link"> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=dataone">Configure Now</a> </td>			
241
			<td class="configure-link"><a href="<%= request.getContextPath() %>/admin?configureType=dataone"> <i class="icon-cogs"></i> Configure Now</a> </td>			
242 242
	        	
243 243
	<%
244 244
			} else {
......
260 260
		if (propsConfigured != null && propsConfigured) {
261 261
	%>
262 262
	        	
263
		<td class="configure-link"> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=replication">Reconfigure Now</a> </td>			
263
		<td class="configure-link"><a href="<%= request.getContextPath() %>/admin?configureType=replication"> <i class="icon-cogs"></i> Reconfigure Now</a> </td>			
264 264
	        	
265 265
	<%
266 266
		} else {
docs/user/metacat/source/themes/metacatui/static/metacatui.css
123 123

  
124 124

  
125 125

  
126

  
127 126
/* DOCUMENT / MAIN CONTENT AREA
128 127
------------------------------------------------------*/
129 128
.document{
130
	background: rgba(255, 255, 255, 0.8);
129
	background: rgba(244, 244, 244, 0.9);
131 130
	margin: 20px auto;
132
	padding: 20px 30px;
133
	width: 1170px;
131
	padding: 5px 2%;
132
	width: 85%;
134 133
	padding-bottom: 360px;
135
	border-radius: 20px;
136
	-webkit-border-radius: 20px;
137
	-moz-border-radius: 20px;
134
			border-radius: 10px;
135
	   -moz-border-radius: 10px;
136
	-webkit-border-radius: 10px;
138 137
}
139 138

  
140 139
/* Permalink icons */
......
150 149
	color: #166194;
151 150
}
152 151

  
152
h1 a{
153
	color: #333;
154
	font-weight: 400;
155
	display: inline-block;
156
}
157
h2 a{
158
	color: #333;
159
	font-weight: 400;
160
	display: inline-block;
161
}
153 162

  
163
h3 a{
164
	color: #333;
165
	font-weight: 400;
166
	display: inline-block;
167
}
168

  
169
h4 a{
170
	color: #333;
171
	font-weight: 500;
172
	display: inline-block;
173
}
154 174
/* SIDEBAR
155 175
---------------------------------------------------- */
156 176
.sidebar{
......
165 185
}
166 186

  
167 187
.sidebar .sidebar-title{
168
	font: 300 24px/24px Oswald;
188
	font-size: 1.2em;
169 189
	margin-top: 0;
170 190
}
171 191

  
......
209 229
    }
210 230
    
211 231
    body {
212
      color: #333333;
213
      font: 400 15px/20px "Source Sans Pro", "Helvetica Nueue", "Helvetica", "sans serif";
214
      background: #FFFFFF;
232
      background: #166194;
215 233
      background: url(bg.jpg) no-repeat center center fixed;
216
      -webkit-background-size: cover;
217
	  -moz-background-size: cover;
218
	  -o-background-size: cover;
219
	  background-size: cover;
234
      background-size: cover;
220 235
    }
221 236
    
222 237
/* TABLES 
......
251 266
/* TAG STYLING
252 267
-------------------------------------------------------- */
253 268
    
254
	h3 {
255
		font: 400 24.5px/40px "Source Sans Pro", Arial, sans-serif;
256
	}
257 269
	
258
	h2{
259
		font: 400 27.5px/40px "Oswald", Arial, sans-serif;
260
	}
261
	
262
	h1{
263
		font: 400 32px/40px "Oswald" sans-serif;
264
	}
265
	
266
	h1 > a, 
267
	h2 > a,
268
	h3 > a,
269
	h4 > a{
270
		color: #333333;
271
	}
272
	
273 270
    
274 271
    article, aside, figure, footer, header, hgroup, menu, nav, section { 
275 272
      display:block;   
......
312 309
    li{
313 310
    	margin-left: 10px;
314 311
    }
315
    
316
    select{
317
    	font: 300 16px/16px "Oswald" Arial sans-serif;
318
    }
319
    
320
   dt{
321
   		font: 300 18px/40px Oswald;
322
   }
323 312

  
324 313

  
325 314

  
326 315

  
316

  
327 317
/* HIGHLIGHTING
328 318
 -----------------------------------------------*/
329 319
  .highlight{
......
384 374
 
385 375
 
386 376
 .topic{
387
 	background: rgba(255,255,255,0.5);
377
 	background: #FFF;
388 378
 	padding: 20px;
389
 	border-radius: 20px;
390
 	-webkit-border-radius: 20px;
391
 	-moz-border-radius: 20px;
379
 	border-radius: 5px;
380
 	-webkit-border-radius: 5px;
381
 	-moz-border-radius: 5px;
392 382
 	margin-bottom: 20px;
393 383
 }
394 384
 
395 385
 .topic-title{
396
 	font: 300 24px/24px Oswald;
386
 	font-size: 1.7em;
397 387
	margin-top: 0;
398 388
 }
399 389
 
390
 .topic ul{
391
 	list-style: none;
392
 }
393
 
394
 .topic > ul > li > a{
395
 	font-weight: 500;
396
 }
397
 
400 398
 #license pre{
401 399
 	width: 700px;
402 400
 	margin: 0 auto;
......
435 433
 	font-weight: 400;
436 434
 }
437 435
 
436
  
437
.toctree-wrapper ul{
438
	list-style: none;
439
}
440
.toctree-l1 {
441
	margin-bottom: 20px;
442
}
443
.toctree-l1 > a{
444
	font-weight: 500;
445
}
446
.first ul{
447
	list-style: none;
448
}
438 449
 

Also available in: Unified diff