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

[ipfire-2.x.git] / html / html / themes / ipfire / include / css / style.css

diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css
index 9e14c25ac5587923acfb8b8bb51e1f24755c3a5b..0e990d68114e74e5a9478aba8b4a8b39b08e3c1b 100644 (file)
--- a/html/html/themes/ipfire/include/css/style.css
+++ b/html/html/themes/ipfire/include/css/style.css
@@ -2,7 +2,7 @@
 /* This controls the width of the fixed width layouts */
 
 .fixed {
-       width: 910px !important;
+       width: 960px !important;
 }
 
 /* Basic Stuff */
@@ -55,9 +55,10 @@ body {
        background-attachment: fixed;
 
        font-size: 9pt;
-       font-family: "trebuchet ms", helvetica, sans-serif;
+       font-family: "DejaVu Sans", Helvetica, sans-serif;
 }
 
+
 h1, h2, h3, h4, h5, h6 {
        font-size: 20px;
        font-weight: normal;
@@ -65,7 +66,7 @@ h1, h2, h3, h4, h5, h6 {
        text-align: left;
 }
 
-h2, h3, h4, h5, h6 {
+h1 {
        color: #66000F;
 }
 
@@ -114,13 +115,14 @@ iframe {
 #logo {
        height: 65px;
        margin-top: 1em;
-       background: url('/themes/ipfire-new/images/tux2.png') no-repeat;
+       background: url('../../images/tux2.png') no-repeat;
 }
 
 #logo h1 {
        color: #fff;
        font-size: 3.6em;
        font-weight: bold;
+       padding-top: 0.2em;
        padding-left: 1.7em;
 }
 
@@ -128,12 +130,13 @@ iframe {
 
 .bigbox {
        margin: 0 auto;
-       margin-top: 1em;
+       margin-top: 0.5em;
        padding: 1.5em 2em 0 2em;
-       border-radius: 8px 8px 8px 8px;
-       -webkit-border-radius: 8px 8px 8px 8px;
-       background: #fff url('/themes/ipfire-new/images/n2.gif') 0px 0px repeat-x;
+       background: #fff url('../../images/n2.gif') 0px 0px repeat-x;
        border: 1px solid black;
+
+       border-radius: 3px 3px 3px 3px;
+       -webkit-border-radius: 3px 3px 3px 3px;
 }
 
 #main_inner {
@@ -155,8 +158,6 @@ iframe {
 }
 
 #main_inner .post {
-       border-radius: 8px 8px 8px 8px;
-       -webkit-border-radius: 8px 8px 8px 8px;
        border: 1px solid silver;
        padding: 1em 2em 1em 2em;
        margin-bottom: 1em;
@@ -165,7 +166,7 @@ iframe {
 
 #main_inner .post h2 {
        border-bottom: dotted 1px #e1e1e1;
-       font-size: 1.7em;
+       font-size: 1.6em;
        margin-bottom: 1em;
 }
 
@@ -188,7 +189,7 @@ input {
 }
 
 input.button {
-       background: #ca2f2f url('/themes/ipfire-new/images/n3.gif') repeat-x;
+       background: #ca2f2f url('../../images/n3.gif') repeat-x;
        color: #fff;
        border: solid 1px #a94b4b;
        font-weight: bold;
@@ -212,16 +213,12 @@ input.text {
        margin: 0 auto;
        margin-top: 0;
        padding-top: 0;
-       border-radius: 8px 8px 8px 8px;
-       -webkit-border-radius: 8px 8px 8px 8px;
        font-weight: 600;
        height: 32px;
        border: 1px solid black;
 }
 
 #cssmenu a {
-       border-radius: 8px 8px 8px 8px;
-       -webkit-border-radius: 8px 8px 8px 8px;
        color: #111111;
        display: inline-block;
        line-height: 32px;
@@ -253,7 +250,6 @@ input.text {
 
 #cssmenu .has-sub ul li a {
        min-width: 12em;
-       border-radius: 7px 7px 7px 7px;
        background: #ffffff;
        color: grey;
        display: block;
@@ -264,111 +260,67 @@ input.text {
 
 #cssmenu .has-sub ul li:hover a {
        background: #dddddd;
-       box-shadow: inset 0  5px 1px rgba(0, 0, 0, 0.15);
-       -webkit-box-shadow: inset 0  5px 1px rgba(0, 0, 0, 0.15);
 }
 
-/* Table */
-/* when using class='bordered' after tabletag */
+/* This decorates all tables with class="tbl" */
 
 table {
        *border-collapse: collapse; /* IE7 and lower */
        border-spacing: 0;
 }
 
-.bordered th{
-       border-top: 1px solid grey;
-       border-bottom: 1px solid grey;
+.tbl th {
+       color: #000000;
+       border-top: 1px solid lightgrey;
+       border-bottom: 1px solid lightgrey;
        background: #cccccc;
+       padding-left: 0.5em;
+       padding-right: 0.5em;
 }
 
-.bordered th:first-child{
-       -moz-border-radius: 6px 0 0 0;
-       -webkit-border-radius: 6px 0 0 0;
-       border-radius: 6px 0 0 0;
-       border-left: 1px solid grey;
-       border-top: 1px solid grey;
-       border-bottom: 1px solid grey;
+.tbl th:first-child {
+       border-left: 1px solid lightgrey;
+       border-top: 1px solid lightgrey;
+       border-bottom: 1px solid lightgrey;
 }
 
-.bordered th:last-child {
-       -moz-border-radius: 0 6px 0 0;
-       -webkit-border-radius: 0 6px 0 0;
-       border-radius: 0 6px 0 0;
-       border-right: 1px solid grey;
-       border-top: 1px solid grey;
-       border-bottom: 1px solid grey;
+.tbl th:last-child {
+       border-right: 1px solid lightgrey;
+       border-top: 1px solid lightgrey;
+       border-bottom: 1px solid lightgrey;
 }
 
-.bordered th:only-child{
-       -moz-border-radius: 6px 6px 0 0;
-       -webkit-border-radius: 6px 6px 0 0;
-       border-radius: 6px 6px 0 0;
-       border: 1px solid grey;
+.tbl th:only-child {
+       border: 1px solid lightgrey;
 }
-
-.bordered tr:first-child td:first-child{
-       -moz-border-radius: 6px 0 0 0;
-       -webkit-border-radius: 6px 0 0 0;
-       border-radius: 6px 0 0 0;
-       border-left: 1px solid grey;
-       border-top: 1px solid grey;
-}
-
-.bordered tr:first-child td:last-child{
-       -moz-border-radius: 0 6px 0 0;
-       -webkit-border-radius: 0 6px 0 0;
-       border-radius: 0 6px 0 0;
-       border-top: 1px solid grey;
+.tbl td{
+       padding-left: 0.5em;
+       padding-right: 0.5em;
 }
-
-.bordered tr:first-child td:only-child{
-       -moz-border-radius: 6px 6px 0 0;
-       -webkit-border-radius: 6px 6px 0 0;
-       border-radius: 6px 6px 0 0;
-       border-left: 1px solid grey;
-       border-right: 1px solid grey;
-       border-top: 1px solid grey;
-}
-
-.bordered tr:first-child td{
-       border-top: 1px solid grey;
-}
-
-.bordered tr:last-child{
-       border-left: 1px solid grey;
-       border-right: 1px solid grey;
+.tbl tr td:first-child {
+       border-left: 1px solid lightgrey;
 }
 
-.bordered tr:last-child td:first-child {
-       -moz-border-radius: 0 0 0 6px;
-       -webkit-border-radius: 0 0 0 6px;
-       border-radius: 0 0 0 6px;
-       border-bottom: 1px solid grey;
+.tbl tr td:last-child {
+       border-right: 1px solid lightgrey;
 }
 
-.bordered tr:last-child td:last-child {
-       -moz-border-radius: 0 0 6px 0;
-       -webkit-border-radius: 0 0 6px 0;
-       border-radius: 0 0 6px 0;
-       border-bottom: 1px solid grey;
+.tbl tr:first-child td {
+       border-top: 1px solid lightgrey;
 }
 
-.bordered tr:last-child td:only-child {
-       -moz-border-radius: 0 0 6px 6px;
-       -webkit-border-radius: 0 0 6px 6px;
-       border-radius: 0 0 6px 6px;
-       border-bottom: 1px solid grey;
+.tbl tr:last-child td:only-child {
+       border-bottom: 1px solid lightgrey;
 }
 
-.bordered tr:last-child td {
-       border-bottom: 1px solid grey;
+.tbl tr:last-child td:first-child {
+       border-bottom: 1px solid lightgrey;
 }
 
-.bordered td:first-child {
-       border-left: 1px solid grey;
+.tbl tr:last-child td:last-child {
+       border-bottom: 1px solid lightgrey;
 }
 
-.bordered td:last-child {
-       border-right: 1px solid grey;
+.tbl tr:last-child td {
+       border-bottom: 1px solid lightgrey;
 }