webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-17 06:23:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen

Browse Source 
Conflicts:
	html/html/themes/ipfire/include/css/style.css
This commit is contained in:
Michael Tremer
2014-01-11 13:08:27 +01:00
parent 68e89a2f28 b5890e7369
commit 30491c6ac7
2 changed files with 62 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
html/html/themes/ipfire/include/css/style.css
View File

@@ -2,7 +2,7 @@
/* This controls the width of the fixed width layouts */
.fixed {
width: 910px !important;
width: 960px !important;
}
/* Basic Stuff */
@@ -16,64 +16,6 @@ html {
height: 100%;
}
/* This decorates all tables with class="tbl" */
table {
*border-collapse: collapse; /* IE7 and lower */
border-spacing: 0;
}
.tbl th {
color: #000000;
border-top: 1px solid grey;
border-bottom: 1px solid grey;
background: #cccccc;
}
.tbl th:first-child {
border-left: 1px solid grey;
border-top: 1px solid grey;
border-bottom: 1px solid grey;
}
.tbl th:last-child {
border-right: 1px solid grey;
border-top: 1px solid grey;
border-bottom: 1px solid grey;
}
.tbl th:only-child {
border: 1px solid grey;
}
.tbl tr td:first-child {
border-left: 1px solid grey;
}
.tbl tr td:last-child {
border-right: 1px solid grey;
}
.tbl tr:first-child td {
border-top: 1px solid grey;
}
.tbl tr:last-child td:only-child {
border-bottom: 1px solid grey;
}
.tbl tr:last-child td:first-child {
border-bottom: 1px solid grey;
}
.tbl tr:last-child td:last-child {
border-bottom: 1px solid grey;
}
.tbl tr:last-child td {
border-bottom: 1px solid grey;
}
body {
/* SVG as background image (IE9/Chrome/Safari/Opera) */
background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2ODQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMTAwJSIgeTE9IjEwMCUiIHgyPSIxMDAlIiB5Mj0iMCUiPgo8c3RvcCBzdG9wLWNvbG9yPSIjMDAwMDAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjODgwNDAwIiBvZmZzZXQ9IjU3JSIvPgo8L2xpbmVhckdyYWRpZW50Pgo8cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSJ1cmwoI2c2ODQpIiAvPgo8L3N2Zz4=);
@@ -113,7 +55,7 @@ body {
background-attachment: fixed;
font-size: 9pt;
font-family: "trebuchet ms", helvetica, sans-serif;
font-family: "DejaVu Sans", Helvetica, sans-serif;
}
@@ -180,6 +122,7 @@ iframe {
color: #fff;
font-size: 3.6em;
font-weight: bold;
padding-top: 0.2em;
padding-left: 1.7em;
}
@@ -318,3 +261,61 @@ input.text {
#cssmenu .has-sub ul li:hover a {
background: #dddddd;
}
/* This decorates all tables with class="tbl" */
table {
*border-collapse: collapse; /* IE7 and lower */
border-spacing: 0;
}
.tbl th {
color: #000000;
border-top: 1px solid lightgrey;
border-bottom: 1px solid lightgrey;
background: #cccccc;
}
.tbl th:first-child {
border-left: 1px solid lightgrey;
border-top: 1px solid lightgrey;
border-bottom: 1px solid lightgrey;
}
.tbl th:last-child {
border-right: 1px solid lightgrey;
border-top: 1px solid lightgrey;
border-bottom: 1px solid lightgrey;
}
.tbl th:only-child {
border: 1px solid lightgrey;
}
.tbl tr td:first-child {
border-left: 1px solid lightgrey;
}
.tbl tr td:last-child {
border-right: 1px solid lightgrey;
}
.tbl tr:first-child td {
border-top: 1px solid lightgrey;
}
.tbl tr:last-child td:only-child {
border-bottom: 1px solid lightgrey;
}
.tbl tr:last-child td:first-child {
border-bottom: 1px solid lightgrey;
}
.tbl tr:last-child td:last-child {
border-bottom: 1px solid lightgrey;
}
.tbl tr:last-child td {
border-bottom: 1px solid lightgrey;
}

2
html/html/themes/ipfire/include/functions.pl
View File

@@ -120,7 +120,7 @@ sub openpage {
}
print <<END;
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!DOCTYPE html>
<html>
<head>
<title>$headline - $title</title>