Skip to content

Commit

Permalink
page template
Browse files Browse the repository at this point in the history 
Newly modified page template.
  • Loading branch information
harrybaa authored and harrybaa committed Aug 31, 2015
1 parent 385a40b commit 9899b48
Show file tree
Hide file tree
Showing 9 changed files with 84 additions and 19 deletions.
2 changes: 1 addition & 1 deletion wp-content/themes/PASA/css/header.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion wp-content/themes/PASA/css/header.css.map
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 12 additions & 6 deletions wp-content/themes/PASA/css/header.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
width: 100%;
margin: 0 auto;
background: #092F44;
// background-image: url("../images/ucmercedLogo.png");
// background-position: 75% 75%;
// background-repeat: no-repeat;
background-image: url("../images/ucm.png");
background-position: 20% 0%;
background-repeat: no-repeat;
}

/** --logo banner-- **/
Expand All @@ -29,7 +29,7 @@
color: #e2e2e2;
.logo{
width: 200px;
height: 60px;
height: 68px;
margin: 30px 0;
font-size: 60px;
line-height: 60px;
Expand Down Expand Up @@ -63,17 +63,23 @@
box-shadow: 0 0 3px #585858;
.nav-item{
float: left;
width: 16%;
width: 20%;
line-height: 50px;
font-family: 'Open Sans', sans-serif;
text-align: center;
&:not(:first-child){
border-left: 1px solid #d3d3d3;
}
&:hover{
background: #6D5B2A;
color: #d3d3d3;
}
a{
color: #fff;
font-size: 18px;
transition: color 0.5s;
-webkit-transition: all 0.5s;
&:hover{
color: #d3d3d3;
}
}
/**logo**/
Expand Down
4 changes: 2 additions & 2 deletions wp-content/themes/PASA/header.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,13 @@
<h1 class="h1"><a class="navbar-brand logo" href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home">PASA</a></h1>
</div>
--> <ul class="nav-menu">
<!-- deleted on 8.30 -->
<!--<li class="nav-item"><a class="logo" href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home">PASA</a></li>-->
<li class="nav-item"><a id="" href="<?php echo esc_url( home_url( '/' ) ); ?>/?page_id=5">About</a></li>
<!--<li class="nav-item"><a id="" href="<?php echo esc_url( home_url( '/' ) ); ?>/?page_id=5">About</a></li>-->
<li class="nav-item"><a id="" href="<?php echo esc_url( home_url( '/' ) ); ?>/?page_id=12">People</a></li>
<li class="nav-item"><a id="" href="<?php echo esc_url( home_url( '/' ) ); ?>/?page_id=17">Research</a></li>
<li class="nav-item"><a id="" href="<?php echo esc_url( home_url( '/' ) ); ?>/?page_id=15">Publications</a></li>
<li class="nav-item"><a id="" href="<?php echo esc_url( home_url( '/' ) ); ?>/?page_id=15">Prospective Students</a></li>
<!-- deleted on 8.30 -->
<!--<li class="nav-item"><a id="" href="<?php echo esc_url( home_url( '/' ) ); ?>/?page_id=20">Teaching</a></li>-->
<li class="nav-item"><a id="" href="<?php echo esc_url( home_url( '/' ) ); ?>/?page_id=8">Contact Us</a></li>
</ul>
Expand Down
Binary file added wp-content/themes/PASA/images/ucm.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion wp-content/themes/PASA/overrideStyle.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion wp-content/themes/PASA/overrideStyle.css.map
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 41 additions & 1 deletion wp-content/themes/PASA/overrideStyle.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
max-width: 970px;
min-height: 600px;
margin: 0 auto;
background: #fff;
background: #f1f1f1;
box-shadow: 0 0 15px #464646;
}

Expand Down Expand Up @@ -72,6 +72,46 @@ footer{
}
}

/** --style for page template-- **/
.page_wrapper{
position: relative;
padding: 30px 0 50px 0;
width: 100%;
max-width: 940px;
font-size: 16px;
overflow: hidden;
.left-cont{
float: left;
padding: 10px 20px;
width: 70%;
min-width: 400px;
background: #fff;
border: 1px solid #aaa;
border-radius: 3px;
box-shadow: 0 0 3px #aaa;
}
.right-cont{
float: right;
padding: 10px;
width: 25%;
.r-c-wrapper{
min-height: 100px;
margin-bottom: 30px;
&:first-child{
border-bottom: 1px solid #aaa;
}
.r-c-headwrap{
font-size: 22px;
font-weight: bold;
line-height: 32px;
}
}
}
&::after{
clear: both;
}
}




Expand Down
31 changes: 25 additions & 6 deletions wp-content/themes/PASA/page.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,38 @@
<div class="content-area">
<div class="container main_content_wrap">
<div class="page_wrapper">


<!-- left -->
<div class="left-cont">

<section id="site-main" class="site-main content-part" >
<?php while ( have_posts() ) : the_post(); ?>
<?php get_template_part( 'content', 'page' ); ?>
<?php while ( have_posts() ) : the_post(); ?>
<?php get_template_part( 'content', 'page' ); ?>
<?php
//If comments are open or we have at least one comment, load up the comment template
if ( comments_open() || '0' != get_comments_number() )
comments_template();
?>
<?php endwhile; // end of the loop. ?>
?>
<?php endwhile; // end of the loop. ?>
</section>
<?php get_sidebar(); ?>
<div class="clear"></div>

</div>
<!-- end of left -->

<!-- right -->
<div class="right-cont">
<div class="r-c-news r-c-wrapper">
<div class="r-c-headwrap">Recent News</div>
<p>Coming soon..</p>
</div>
<div class="r-c-pablication r-c-wrapper">
<div class="r-c-headwrap">Recent Publications</div>
<p>Coming soon..</p>
</div>
</div>
<!-- end of right -->

</div><!--end .page_wrapper-->
</div>
</div>
Expand Down

0 comments on commit 9899b48

Please sign in to comment.