Permalink
Browse files

Lots of template updates

  • Loading branch information...
Jonathan Bennett
Jonathan Bennett committed Apr 23, 2012
1 parent 12a710c commit 271c00b873ebdbc734167e57bc358227c2ab0875
@@ -4,7 +4,9 @@ body {
font-size: 0.75em;
/* 12 */
line-height: 1.5em;
- /* 18/12 */ }
+ /* 18/12 */
+ overflow-x: hidden;
+ overflow-y: scroll; }
body, select, input, textarea {
color: #072e67;
@@ -16,9 +18,6 @@ h1, h2, h3, h4, h5, h6 {
color: #e7a300;
margin-top: 0; }
-body.home h1 {
- color: #0f2546; }
-
h1 .word1, h2 .word1, h3 .word1,
h4 .word1, h5 .word1, h6 .word1 {
color: #0f2546; }
@@ -28,10 +27,13 @@ h1 {
padding-bottom: .611111111em;
border-bottom: 1px solid #edeae1;
margin-bottom: .555555556em; }
+ body.home h1 {
+ color: #0f2546;
+ border-bottom: none;
+ margin-bottom: 0; }
a, a:active, a:visited {
color: #e7a300;
text-decoration: none; }
-
-a:hover {
- text-decoration: underline; }
+ a:hover, a:active:hover, a:visited:hover {
+ text-decoration: underline; }
@@ -26,14 +26,17 @@
margin-bottom: 29px; }
#component {
- width: 590px;
- margin-right: 45px;
+ width: 623px;
+ margin-right: 12px;
float: left; }
#sidebar {
width: 305px;
float: left; }
+#bottom {
+ clear: both; }
+
#footer > div {
padding: 10px 0;
border-bottom: 1px solid #081325; }
@@ -6,10 +6,10 @@
.module.bordered > div {
background: url(../images/module-top.png) top no-repeat;
padding-top: 7px; }
- .module.bordered > div > div > div {
- background: url(../images/module-center.png) top repeat-y;
- padding: 12px 25px;
- position: relative; }
+ .module.bordered > div > div {
+ background: url(../images/module-center.png) top repeat-y;
+ padding: 12px 25px;
+ position: relative; }
.module.bordered h3 {
font-size: 1.5em;
/* 18/12 */
@@ -26,12 +26,12 @@
bottom: -24px;
right: 25px; }
+.module.underline {
+ border-bottom: 1px solid #edeae1; }
+
/* @group sidebar */
#sidebar .module {
- border-bottom: 1px solid #edeae1;
margin: 18px 0; }
- body.home #sidebar .module {
- border-bottom: none; }
/* @group bottom */
#bottom .module {
@@ -0,0 +1,34 @@
+.mod_slideshow.continuous {
+ margin: -10px 0 -20px; }
+ .mod_slideshow.continuous .slide {
+ border-radius: 5px;
+ overflow: hidden; }
+ .mod_slideshow.continuous .slide .description {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ color: #fff;
+ border-radius: 0 0 5px 5px;
+ background: url(../images/mod_slideshow/description-bottom.png) bottom repeat-x;
+ opacity: 0;
+ -webkit-transition: all 0.2s linear;
+ -moz-transition: all 0.2s linear;
+ -o-transition: all 0.2s linear;
+ -ms-transition: all 0.2s linear;
+ transition: all 0.2s linear; }
+ .mod_slideshow.continuous .slide .description > div {
+ padding: 12px 34px; }
+ .mod_slideshow.continuous .slide .description h2 .word1 {
+ color: #e7a300; }
+ .mod_slideshow.continuous .slide img {
+ border-radius: 5px; }
+ .mod_slideshow.continuous .slide.active .description {
+ opacity: 1; }
+ .mod_slideshow.continuous .overlay1 {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 30px;
+ background: url(../images/mod_slideshow/slideshow-top.png) top no-repeat; }
@@ -6,6 +6,7 @@
@import url("layout.css");
@import url("modules.css");
@import url("menu.css");
+@import url("slideshow.css");
@import url("styles.css");
@import url("content.css");

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -35,7 +35,7 @@
<jdoc:include type="head" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta name="viewport" content="width=960px, initial-scale=1.0">
<link rel="shortcut icon" href="/templates/<?= $this->template ?>/resources/favicon.ico">
<link rel="apple-touch-icon" href="/templates/<?= $this->template ?>/resources/apple-touch-icon.png">
@@ -65,6 +65,10 @@
<jdoc:include type="modules" name="header" style="rounded" />
</div></div></div>
+ <div id="masthead"><div>
+ <jdoc:include type="modules" name="masthead" style="rounded" />
+ </div></div>
+
<div id="body"><div><div><div class="container">
<div id="component"><jdoc:include type="component" /></div>
<div id="sidebar"><jdoc:include type="modules" name="sidebar" style="rounded" /></div>
@@ -5,6 +5,8 @@ body {
background: $colors-blue;
font-size: 0.75em; /* 12 */
line-height: 1.5em; /* 18/12 */
+ overflow-x: hidden;
+ overflow-y: scroll;
}
body, select, input, textarea {
@@ -19,8 +21,6 @@ h1, h2, h3, h4, h5, h6 {
margin-top: 0;
}
-body.home h1 { color: $colors-blue; }
-
h1 .word1, h2 .word1, h3 .word1,
h4 .word1, h5 .word1, h6 .word1 { color: $colors-blue; }
@@ -29,10 +29,20 @@ h1 {
padding-bottom: .611111111em;
border-bottom: 1px solid #edeae1;
margin-bottom: .555555556em;
+
+ body.home & {
+ color: $colors-blue;
+ border-bottom: none;
+ margin-bottom: 0;
+ }
}
+
+
a, a:active, a:visited {
color: $colors-gold;
text-decoration: none;
+
+ &:hover { text-decoration: underline; }
}
-a:hover { text-decoration: underline; }
+
@@ -9,7 +9,6 @@
position: relative;
}
-
#header {
background: $colors-darkblue url(../images/header-background.jpg) top center no-repeat;
> div { background: url(../images/header-bar.jpg) repeat-x top; }
@@ -34,8 +33,8 @@
}
#component {
- width: 590px;
- margin-right: 45px;
+ width: 623px;
+ margin-right: 12px;
float: left;
}
@@ -44,6 +43,10 @@
float: left;
}
+#bottom {
+ clear: both;
+}
+
#footer > div {
padding: 10px 0;
border-bottom: 1px solid #081325;
Oops, something went wrong.

0 comments on commit 271c00b

Please sign in to comment.