Merge /users/jy2wong/www/rofl/dweb

Conflicts:
	.gitignore
	.htaccess
	pub/style/style.css
	src/web.d
master
Jacob Parker 11 years ago
commit b4af704877
  1. 1
      .gitignore
  2. BIN
      pub/style/logo_black.png
  3. 50
      pub/style/style.css

1
.gitignore vendored

@ -1,2 +1,3 @@
srv/*
bin/web
.nfs*

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

@ -28,7 +28,9 @@ body {
#logo {
height: 1em;
vertical-align: middle;
border: none;
margin:0;
padding: 0;
}
/* # Header # */
@ -65,16 +67,13 @@ a:hover { text-decoration: underline; }
border-bottom: solid 2px #E2AA00;
}
.midHeader img {
border: none;
}
.headerTitle {
color: #fff;
font-size: 233%;
font-weight: bold;
margin: 0 0 0 4mm;
padding: 0.25ex 0;
padding: 0.2em 0;
height: 1em;
}
#headerSubTitle {
/*
@ -83,13 +82,15 @@ a:hover { text-decoration: underline; }
color: #fff;
font-size: 50%;
vertical-align: 0.6em;
/*
font-style: italic;
*/
vertical-align: middle;
}
.headerTitle a { color: #fff; }
.headerTitle a { color: #fff;
margin: 0;
padding: 0;}
.headerTitle a:hover { text-decoration: none; }
.subHeader {
@ -115,6 +116,9 @@ a:hover { text-decoration: underline; }
/* # Horiz-side # */
#horiz-side-bar {
width:100%;
clear: both;
border: 0;
margin: 0;
padding: 0;
}
@ -134,10 +138,11 @@ a:hover { text-decoration: underline; }
border-top: 2px solid #ccc;
}
/* about events etc. */
#horiz-side-bar ul:first-child {
background-color: transparent;
margin-top: 1em;
margin-bottom: 1em;
margin-top: 0.5em;
margin-bottom: 0.5em;
border-top: none;
padding-left: 0;
}
@ -165,19 +170,24 @@ a:hover { text-decoration: underline; }
}
#horiz-side-bar ul:first-child li a {
display: inline-block;
/*
color: #fff;
background-color: #7584E4;
*/
border-left: 0.5em solid #ccc;
border-left: 0.5em solid #ddd;
text-decoration: none;
font-weight: bold!important;
font-size: 102%;
padding: 0.25em 1ex 0.25em 2mm;
padding-left: 0.2em;
padding-left: 0.3em;
margin-right: 1em;
/* fixed width tabby things
margin-right: 0;
width: 5.5em;
*/
}
#horiz-side-bar ul:first-child li a:hover {
@ -199,7 +209,8 @@ a:hover { text-decoration: underline; }
background-color: #ddd;
}
#horiz-side-bar ul:last-child li.thisPage a {
#horiz-side-bar ul:last-child li.thisPage a,
#horiz-side-bar ul:last-child li a:hover {
background-color: #f5f5f5;
}
@ -323,27 +334,29 @@ li ul {
}
#main-copy a {
font-weight: bold;
color: #2724AE;
color: #E2AA00;
color: rgb(100,135,220);
border-bottom: 2px solid rgb(100,135,220);
text-decoration: underline;
/*
border-bottom: 1px solid rgb(100,135,220);
*/
background-color: transparent;
text-decoration: none;
}
#main-copy a:hover {
background-color: #eee;
color: #E2AA00;
/*
border-bottom: 2px solid #E2AA00;
*/
}
#main-copy h1, #main-copy h2 {
font-size: 145.5%;
font-weight: bold;
margin: 2em 0 0 0;
margin: 0;
padding: 0.5ex 0 0.5ex 0.6ex;
border-bottom: 2px solid #E2AA00;
}
@ -401,6 +414,7 @@ dd {
padding: 0.25ex;
clear: both;
border-top: solid 2px #E2AA00;
margin-bottom: 1.6em;
}
#footer .left {

Loading…
Cancel
Save