Skip to content

Commit

Permalink
Changed a few elements in the layout and adapted a new structure for …
Browse files Browse the repository at this point in the history 
…the site.
  • Loading branch information
@luiscape
luiscape committed Nov 20, 2013
1 parent bb30cc2 commit 9f22fa8
Show file tree
Hide file tree
Showing 11 changed files with 1,655 additions and 141 deletions.
95 changes: 71 additions & 24 deletions blog/wp-content/themes/elweb/footer.php
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,74 @@
<div class="row footer-row">
<div class="col-xs-12 col-sm-10 col-md-10 col-lg-8 col-sm-offset-1 col-md-offset-1 col-lg-offset-2 footer-wrapper">
<div class="col-xs-6 col-sm-3 col-md-3 col-lg-3">
<a href="<?php bloginfo('url'); ?>/"><img src="<?php bloginfo('template_directory'); ?>/img/logo.png" alt="<?php bloginfo('name');?>" height="35" width="35"></a>
<h3 class="site-name-footer">
<a href="<?php bloginfo('url'); ?>/" class="site-name-footer-link"><?php bloginfo('name'); ?></a>
</h3>
</div> <!-- .footer-logo-wrapper -->
<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 hidden-xs footer-links-wrapper">
<ul class="footer-links-list">
<?php wp_nav_menu( array('theme_location' => 'FooterNavigation', 'items_wrap'=> '%3$s', 'container'=> '')); ?>
<!-- Footer Wrapper -->
<div id="footer-wrapper">
<!-- Footer -->
<div id="footer" class="container">
<header>
<h2>Stay connected.<strong> Sign-up for our mailing list:</strong></h2>
</header>
<!-- Begin MailChimp Signup Form -->
<div id="mc_embed_signup" class="6u">
<section>
<form action="http://unocha.us2.list-manage.com/subscribe/post?u=83487eb1105d72ff2427e4bd7&amp;id=6fd988326c" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
<div class="row half">
<div class="6u">
<input type="email" value="" name="EMAIL" class="text" id="mce-EMAIL" placeholder="Email" type="text">
</div>
<div class="6u">
<input type="text" value="" name="NAME" class="text" id="mce-NAME" placeholder="Name" type="text">
</div>
</div>
<div class="row half">
<div id="mce-responses" class="12u">
<div class="response" id="mce-error-response" style="display:none"></div>
<div class="response" id="mce-success-response" style="display:none"></div>
</div> <div class="clear"><input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="button button-icon icon icon-envelope"></div>
</div>
</section>
</form>
</div>
<!--End mc_embed_signup-->
<div class="6u">
<section>
<p>(Email disclaimer should go here -- or some explanation of what they will receive and the frequency, etc. )</p>
<div class="row">
<ul class="icons 6u">
<li class="icon icon-github">
<a href="https://github.com/OCHA-DAP">@OCHA-DAP</a>
</li>
</ul>
<ul class="icons 6u">
<li class="icon icon-twitter">
<a href="http://twitter.com/humdata">@humdata</a>
</li>
<!-- Future G+ account.
<li class="icon icon-google-plus">
<a href="#">google.com/+untitled-tld</a>
</li>
-->
</ul>
</div>
</section>
</div>
</div>
</div>
<!-- Copyright -->
<div id="copyright" class="container">
<ul class="links">
<li>Copyright &copy; 2013 by the United Nations, Office for the Coordination of Humanitarian Affairs</li><br />
<li>Image credits: <a href="http://www.unocha.org">OCHA</a></li>
<li>Site layout: <a href="http://html5up.net/">HTML5 UP</a></li>
</ul>
</div> <!-- .footer-links-wrapper -->
<div class="col-xs-6 col-sm-3 col-md-3 col-lg-3 footer-creative-commons-wrapper">
<a href="<?php echo $GLOBALS['_DEFAULT_COPYRIGHT_LINK']; ?>" class="footer-link footer-creative-commons-link"><?php echo $GLOBALS['_DEFAULT_COPYRIGHT_TEXT']; ?></a>
</div> <!-- .footer-creative-commons -->
</div> <!-- .footer-wrapper -->
</div> <!-- .footer-row -->
</div> <!-- .top-container -->

<?php wp_footer(); ?>

<script src="<?php bloginfo('template_directory'); ?>/js/vendor.js"></script>
<!-- <script src="<?php bloginfo('template_directory'); ?>/js/app.js"></script> -->
<!-- <script>require('elweb');</script> -->
</div>
</div>
</body>
</html>
78 changes: 48 additions & 30 deletions blog/wp-content/themes/elweb/header.php
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
<!DOCTYPE html>
<!--

88 88
88 88
88 88
,adPPYba, 88 8b db d8 ,adPPYba, 88,dPPYba,
a8P_____88 88 `8b d88b d8' a8P_____88 88P' "8a
8PP""""""" 88 `8b d8'`8b d8' 8PP""""""" 88 d8
"8b, ,aa 88 `8bd8' `8bd8' "8b, ,aa 88b, ,a8"
`"Ybbd8"' 88 YP YP `"Ybbd8"' 8Y"Ybbd8"'


Based on 'eleb' theme and 'Strongly Typed' by HTML5. Licenses and links on https://github.com/OCHA-DAP/DAP-Blog
-->

<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" <?php language_attributes(); ?>> <![endif]-->
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" <?php language_attributes(); ?>> <![endif]-->
<!--[if IE 8]> <html class="no-js lt-ie9" <?php language_attributes(); ?>> <![endif]-->
Expand Down Expand Up @@ -69,30 +60,57 @@
<link rel="alternate" href="<?php echo $GLOBALS['_DEFAULT_RSSFEED_URL']; ?>" type="application/rss+xml" />
<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>">

<!-- HTML5 JS + CSS -->
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta name="description" content="" />
<meta name="keywords" content="" />
<meta name="viewport" content="width=1040" />
<!-- <link href="http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600|Arvo:700" rel="stylesheet" type="text/css" /> -->
<link href='http://fonts.googleapis.com/css?family=Volkhov:400,700' rel='stylesheet' type='text/css'>
<!--[if lte IE 8]><script src="js/html5shiv.js"></script><![endif]-->
<script src="js/jquery.min.js"></script>
<script src="js/jquery.dropotron.js"></script>
<script src="js/config.js"></script>
<script src="js/skel.min.js"></script>
<script src="js/skel-panels.min.js"></script>
<noscript>
<link rel="stylesheet" href="css/skel-noscript.css" />
<link rel="stylesheet" href="css/style.css" />
<link rel="stylesheet" href="css/style-desktop.css" />
</noscript>


<?php wp_head(); ?>
</head>

<body <?php body_class(); ?>>
<body class="left-sidebar"
<!--[if lt IE 7]>
<p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
<![endif]-->

<div class="container visible-xs mobile-nav-wrapper">
<nav class="navbar navbar-default" role="navigation">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex6-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="<?php bloginfo('url'); ?>"><img src="<?php bloginfo('template_directory'); ?>/img/[email protected]" alt="<?php bloginfo('name');?>" height="50" width="50"><span class="navbar-sitename"><?php bloginfo('name'); ?></span></a>
</div> <!-- .navbar-header -->
<div class="collapse navbar-collapse navbar-ex6-collapse">
<ul class="nav navbar-nav">
<?php wp_nav_menu( array('theme_location' => 'MobileNavigation', 'items_wrap'=> '%3$s', 'container'=> '')); ?>
</ul>
</div><!-- .navbar-collapse -->
</nav> <!-- .navbar-default -->
<div class="header-wrapper">
<div id="header" class="container">

<!-- Logo -->
<h1 id="logo"><a href="#">DAP <i>Blog</i></a></h1>
<p>Blog roll for OCHA's Data & Analysis Project.</p>

<nav class="nav">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex6-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="<?php bloginfo('url'); ?>"><img src="<?php bloginfo('template_directory'); ?>/img/[email protected]" alt="<?php bloginfo('name');?>" height="50" width="50"><span class="navbar-sitename"><?php bloginfo('name'); ?></span></a>
</div> <!-- .navbar-header -->
<div class="collapse navbar-collapse navbar-ex6-collapse">
<ul class="nav navbar-nav">
<?php wp_nav_menu( array('theme_location' => 'MobileNavigation', 'items_wrap'=> '%3$s', 'container'=> '')); ?>
</ul>
</div><!-- .navbar-collapse -->
</nav> <!-- .navbar-default -->
</div>
</div> <!-- .mobile-nav-wrapper -->
1,245 changes: 1,228 additions & 17 deletions blog/wp-content/themes/elweb/style.css
100644 → 100755
View file

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions blog/wp-content/themes/elweb/style_bak.css
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions css/skel-noscript.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
/* Container */

body {
min-width: 1200px;
min-width: 940px;
}

.container {
width: 1200px;
width: 940px;
margin: 0 auto;
}

Expand All @@ -31,8 +31,8 @@

.container.big {
width: 100%;
max-width: 1500px;
min-width: 1200px;
max-width: 1000px;
min-width: 940px;
}

/* Grid */
Expand Down
9 changes: 5 additions & 4 deletions css/style-1000px.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

#main-wrapper
{
padding: 4em 0 4em 0;
padding: 2em 0 4em 0;
}

#footer-wrapper
Expand All @@ -74,17 +74,18 @@

#header
{
padding: 12em 0 7em 0;
padding: 10em 0 3em 0;
}

#header h1
{
font-size: 2.5em;
font-size: 5em;
line-height: 100%;
}

#header p
{
margin: 2em 0 0 0;
margin: 3em 0 0 0;
}

/*********************************************************************************/
Expand Down
10 changes: 5 additions & 5 deletions css/style-desktop.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{
font-size: 1.65em;
font-weight: 400;
letter-spacing: 4px;
letter-spacing: 1px;
margin: 0 0 1.5em 0;
line-height: 1.75em;
}
Expand Down Expand Up @@ -150,18 +150,18 @@

#header
{
padding: 14em 0 7em 0;
padding: 11em 0 3em 0;
}

#header h1
{
font-size: 3em;
letter-spacing: 13px;
font-size: 10em;
letter-spacing: 3px;
}

#header p
{
margin: 2.5em 0 0 0;
margin: 4em 0 0 0;
font-size: 0.85em;
letter-spacing: 3px;
}
Expand Down
4 changes: 2 additions & 2 deletions css/style-mobile.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,12 +274,12 @@

#header
{
padding: 6em 0 4em 0;
padding: 6em 0 2em 0;
}

#header h1
{
font-size: 2em;
font-size: 3em;
letter-spacing: 8px;
line-height: 1.25em;
}
Expand Down
5 changes: 2 additions & 3 deletions css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,20 +50,19 @@
h1,h2,h3,h4,h5,h6
{
font-weight: 1000;
text-transform: uppercase;
color: #888;
}

h1 a, h2 a, h3 a, h4 a, h5 a, h6 a
{
color: inherit;
/* color: inherit; */
text-decoration: none;
border: 0;
}

a
{
color: #666;
color: #0988bb;
text-decoration: none;
border-bottom: solid 1px #ddd;
-moz-transition: color 0.25s ease-in-out, border-bottom-color 0.25s ease-in-out;
Expand Down
Loading

0 comments on commit 9f22fa8

Please sign in to comment.