Merge branch 'master' of svn.c3d2.de:c3d2-web

This commit is contained in:
koeart 2011-09-29 12:53:44 +02:00
commit b425716964

View File

@ -2,7 +2,6 @@ body {
font-family: sans-serif; font-family: sans-serif;
margin: 0 auto; margin: 0 auto;
padding: 0; padding: 0;
width: 900px;
color: black; color: black;
background-color: white; background-color: white;
} }
@ -28,23 +27,26 @@ h1, h2, h3 {
} }
#conference-logo { #conference-logo {
float: left; float: left;
width: 140px; margin-top: 0px;
margin-top: 10px; margin-left: 0px;
}
#conference-logo img {
width: 84px;
} }
#menu { #menu {
width: 700px; width: 750px;
background-color: #65b8ff; background-color: #65b8ff;
border-bottom-right-radius: 24pt; border-bottom-right-radius: 24pt;
border-bottom-left-radius: 24pt; border-bottom-left-radius: 24pt;
padding: 0; padding: 0;
maring: 0; margin: 0;
margin-left: 150px; margin-left: 150px;
font-size: 90%; font-size: 85%;
} }
#menu ul { #menu ul {
list-style-type: none; list-style-type: none;
padding: 0.2em 0; padding: 0.2em 0 0.4em;
margin: 0 auto 1em; margin: 0 auto 0.6em;
text-align: center; text-align: center;
} }
#menu ul li { #menu ul li {
@ -59,8 +61,8 @@ ul.track {
display: none; display: none;
} }
#content { #content {
width: 800px; min-width: 800px;
margin-left: 150px; margin-left: 64px;
padding: 0; padding: 0;
} }
#content .release { #content .release {
@ -133,7 +135,7 @@ ul.track {
float: left; float: left;
padding: 2px 4px 4px 2px; padding: 2px 4px 4px 2px;
} }
#schedule, #speaker-index, #event-index { #schedule, #speaker-index, #event-index, #content > ul {
border: 12pt solid #65b8ff; border: 12pt solid #65b8ff;
background-color: #65b8ff; background-color: #65b8ff;
color: white; color: white;
@ -141,6 +143,8 @@ ul.track {
min-height: 400px; min-height: 400px;
padding: 0; padding: 0;
border-spacing: 2px; border-spacing: 2px;
margin: 0;
list-style-type: none;
} }
#schedule th, #speaker-index th, #event-index th { #schedule th, #speaker-index th, #event-index th {
color: white; color: white;