Skip to content

Commit 1e264e1

Browse files
author
lillian
committed
import hacklab.to changes from prod server
1 parent 5a8e1ec commit 1e264e1

7 files changed

+150
-32
lines changed

‎archive.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
<?php endif; ?>
4949

5050
<div id="nextprevious">
51-
<div class="alignleft"><?php posts_nav_link('','','&laquo; PREVIOUS ENTRIES') ?></div>
52-
<div class="alignright"><?php posts_nav_link('','NEXT ENTRIES &raquo;','') ?></div>
51+
<div class="alignleft"><?php next_posts_link('&laquo; OLDER ENTRIES') ?></div>
52+
<div class="alignright"><?php previous_posts_link('NEWER ENTRIES &raquo;','') ?></div>
5353
<div class="cleared"></div>
5454
</div>
5555
</div> <!-- Closes contentwrapper-->

‎footer.php

+6-5
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
</div>
1111

1212
<div class="col2">
13-
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('footer_middle') ) : ?>
14-
<h3>Visit our friends!</h3><p>A few highly recommended friends...</p><ul><?php wp_list_bookmarks('title_li=&categorize=0'); ?></ul>
15-
<?php endif; ?>
13+
<!-- <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('footer_middle') ) : ?>
14+
<h3>Visit our friends!</h3><p>A few highly recommended friends...</p><ul><?php wp_list_bookmarks('title_li=&categorize=0'); ?></ul>
15+
<?php endif; ?> -->
1616
</div>
1717

1818
<div class="col3">
19-
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('footer_right') ) : ?>
19+
<!-- <?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('footer_right') ) : ?>
2020
<h3>Archives</h3><p>All entries, chronologically...</p><ul><?php wp_get_archives('type=monthly&limit=12'); ?> </ul>
21-
<?php endif; ?>
21+
<?php endif; ?> -->
2222
</div>
2323

2424
<div class="cleared"></div>
@@ -30,6 +30,7 @@
3030
<div id="footerleft">
3131
<p>Powered by <a href="http://www.wordpress.org/">WordPress</a> and <a href="http://samk.ca/freebies/" title="WordPress theme">pixeled</a>. Sweet icons by <a href="http://famfamfam.com/">famfamfam</a>. <a href="#main">Back to top &uarr;</a></p>
3232
<!-- Please don't remove my credits! I worked hard to create this theme and distribute it freely. Thanks! -->
33+
<p><a href="http://akismet.com/">Protected by Akismet</a> | <a href="http://wordpress.com/">Blog with WordPress</a></p>
3334
</div>
3435

3536
<div id="footerright">

‎friends.php

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php get_header(); ?>
2+
3+
<div id="main">
4+
5+
<div id="contentwrapper">
6+
7+
<?php BDPRSS2::output(1); ?>
8+
9+
</div> <!-- Closes contentwrapper-->
10+
11+
12+
<?php get_sidebar(); ?>
13+
<div class="cleared"></div>
14+
15+
</div><!-- Closes Main -->
16+
17+
18+
<?php get_footer(); ?>

‎header.php

+17-8
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="screen" />
1616
<link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> RSS Feed" href="<?php bloginfo('rss2_url'); ?>" />
1717
<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
18+
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico">
1819
<?php wp_head(); ?>
1920

2021
<!-- this product is released under General Public License. Please see the attached file for details. You can also find details about the license at http://www.opensource.org/licenses/gpl-license.php -->
@@ -45,7 +46,7 @@
4546

4647
<!--[if lt IE 7]>
4748
<link href="<?php bloginfo('template_url'); ?>/ie6.css" rel="stylesheet" type="text/css" />
48-
<script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE7.js" type="text/javascript"></script>
49+
<script src="https://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE7.js" type="text/javascript"></script>
4950
<![endif]-->
5051

5152

@@ -57,18 +58,24 @@
5758

5859
<div id="header">
5960

61+
<!--
6062
<div id="logo">
6163
<h1><a href="<?php echo get_option('home'); ?>"><?php bloginfo('name'); ?></a></h1>
6264
<span><?php bloginfo('description'); ?></span>
6365
</div>
64-
66+
-->
67+
<div id="logo" style="margin: 15px 0 0 0;">
68+
<a href="<?php echo get_option('home'); ?>">
69+
<img src="/wp-content/uploads/2015/05/hacklab-logo-wide-3.png" border=0 alt="Hacklab.TO">
70+
</a>
71+
</div>
6572

6673
<div id="topright">
67-
<ul>
68-
<?php wp_list_pages('depth=1&title_li=0&sort_column=menu_order'); ?>
74+
<!-- <ul>
75+
<?php wp_list_pages('depth=1&title_li=0&sort_column=menu_order'); ?>
6976
<li><a href="#searchform">search</a></li>
70-
<li><a href="#main">skip to content &darr;</a></li>
71-
</ul>
77+
<li><a href="#main">skip to content &darr;</a></li>
78+
</ul> -->
7279
</div>
7380

7481
</div> <!-- Closes header -->
@@ -78,8 +85,10 @@
7885
<div id="catnav">
7986
<div id="toprss"><a href="feed:<?php bloginfo('rss2_url'); ?>"><img src="<?php bloginfo('template_directory'); ?>/images/rss-trans.png" alt="<?php bloginfo('name'); ?>" width="65" height="24" /></a></div> <!-- Closes toprss -->
8087
<ul id="nav">
81-
<li><a href="<?php echo get_option('home'); ?>">Home</a></li>
82-
<?php wp_list_categories('sort_column=name&title_li=&depth=2'); ?>
88+
<li><a href="<?php echo get_option('home'); ?>">Home</a></li>
89+
<?php wp_list_pages('depth=1&title_li=0&sort_column=menu_order'); ?>
90+
<!-- <?php wp_list_categories('sort_column=name&title_li=&depth=2'); ?> -->
91+
<li class="page_item"><a href="https://knowledge.hacklab.to/wiki/">Public Wiki</a></li>
8392
</ul>
8493
</div> <!-- Closes catnav -->
8594

‎index.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
<?php endif; ?>
3030

3131
<div id="nextprevious">
32-
<div class="alignleft"><?php posts_nav_link('','','&laquo; PREVIOUS ENTRIES') ?></div>
33-
<div class="alignright"><?php posts_nav_link('','NEXT ENTRIES &raquo;','') ?></div>
32+
<div class="alignleft"><?php next_posts_link('&laquo; OLDER ENTRIES') ?></div>
33+
<div class="alignright"><?php previous_posts_link('NEWER ENTRIES &raquo;','') ?></div>
3434
<div class="cleared"></div>
3535
</div>
3636
</div> <!-- Closes contentwrapper-->

‎sidebar.php

+19-3
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,28 @@
3535
<ul>
3636
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('sidebar_left') ) : ?>
3737

38-
<li>
38+
<!-- <li>
3939
<div class="sidebarbox">
4040
<h2>Categories</h2>
4141
<ul>
4242
<?php wp_list_categories('show_count=0&title_li='); ?>
4343
</ul>
4444
</div>
45-
</li>
45+
</li> -->
46+
<li>
47+
<div class="sidebarbox">
48+
<h2>Meta</h2>
49+
<ul>
50+
<?php wp_register(); ?>
51+
<li><?php wp_loginout(); ?></li>
52+
<li><a href="http://validator.w3.org/check/referer" title="This page validates
53+
as XHTML 1.0 Transitional">Valid <abbr title="eXtensible HyperText Markup Langu
54+
age">XHTML</abbr></a></li>
55+
<?php wp_meta(); ?>
56+
</ul>
57+
</div>
58+
</li>
59+
4660

4761
<?php endif; ?>
4862
</ul>
@@ -54,6 +68,7 @@
5468
<ul>
5569
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('sidebar_right') ) : ?>
5670

71+
<!--
5772
<li>
5873
<div class="sidebarbox">
5974
<h2>Meta</h2>
@@ -65,6 +80,7 @@
6580
</ul>
6681
</div>
6782
</li>
83+
-->
6884

6985
<?php endif; ?>
7086
</ul>
@@ -73,4 +89,4 @@
7389

7490

7591
<div class="cleared"></div>
76-
</div> <!-- Closes Sidebars -->
92+
</div> <!-- Closes Sidebars -->

‎style.css

+86-12
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,18 @@ Released under the <a href="http://www.opensource.org/licenses/gpl-license.php">
1111
.
1212
*/
1313

14+
@font-face {
15+
font-family: 'impact';
16+
src: url('/fonts/impact-webfont.eot');
17+
src: url('/fonts/impact-webfont.eot?#iefix') format('embedded-opentype'),
18+
url('/fonts/impact-webfont.woff2') format('woff2'),
19+
url('/fonts/impact-webfont.woff') format('woff'),
20+
url('/fonts/impact-webfont.ttf') format('truetype'),
21+
url('/fonts/impact-webfont.svg#impactregular') format('svg');
22+
font-weight: normal;
23+
font-style: normal;
24+
25+
}
1426
/* Defaults */
1527

1628
* {
@@ -53,12 +65,12 @@ p {
5365
}
5466

5567
a {
56-
color: #6598b8;
68+
color: #30a7df;
5769
text-decoration: none;
5870
}
5971

6072
a:hover {
61-
color: #222;
73+
color: #ff7a04;
6274
text-decoration: underline;
6375
}
6476

@@ -148,7 +160,7 @@ body {
148160
text-decoration: none;
149161
}
150162
#header h1 a:hover {
151-
color: #eee;
163+
color: #ff7a04;
152164
text-decoration: none;
153165
}
154166
#header span {
@@ -196,7 +208,7 @@ body {
196208
}
197209

198210
#nav li a:hover {
199-
color: #6598b8;
211+
color: #30a7df;
200212
text-decoration: none;
201213
display: block;
202214
}
@@ -291,7 +303,7 @@ body {
291303
}
292304
.topPost h2.topTitle a:hover {
293305
text-decoration: none;
294-
color: #abd1ea;
306+
color: #ff7a04;
295307
}
296308
.topPost p.topMeta {
297309
padding: 0;
@@ -317,7 +329,7 @@ body {
317329
}
318330
.topPost div.topContent a:hover {
319331
text-decoration: underline;
320-
color: #ff9933;
332+
color: #ff7a04;
321333
}
322334

323335
.topPost div.topContent ul, .topPost div.topContent ol {
@@ -329,12 +341,12 @@ body {
329341
.topPost span.topComments, .topPost span.topMore, .topPost span.topTags {
330342
font-size: 9pt;
331343
font-style: italic;
332-
background: url(images/bg-trans.png) repeat;
344+
/* background: url(images/bg-trans.png) repeat; */
333345
padding: 8px 10px;
334346
margin-right: 5px;
335347
line-height: 27pt;
336348
color: #fff;
337-
border: 1px solid #111;
349+
/* border: 1px solid #111; */
338350
}
339351
.topPost span.linkpages {
340352
font-size: 9pt;
@@ -346,7 +358,7 @@ body {
346358
color: #ddd;
347359
}
348360
.topPost span.topComments:hover, .topPost span.topMore:hover, .topPost span.topTags:hover {
349-
background: #040404;
361+
/* background: #040404; */
350362
}
351363
.topPost span.topComments a {
352364
color: #fff;
@@ -482,7 +494,7 @@ textarea#comment {
482494
margin: 0;
483495
}
484496
#extrastuff a {color:#222; font-size:0.8em;}
485-
#extrastuff a:hover {color:#6598b8; text-decoration:none;}
497+
#extrastuff a:hover {color:#ff7a04; text-decoration:none;}
486498
#extrastuff #rssleft {float:left; width:250px;}
487499
#extrastuff #trackright {float:right; width:180px; text-align:right;}
488500

@@ -511,10 +523,10 @@ textarea#comment {
511523
}
512524
#main #welcome a {
513525
text-decoration: underline;
514-
color: #ff9933;
526+
color: #30a7df;
515527
}
516528
#main #welcome a:hover {
517-
color: #6598b8;
529+
color: #ff7a04;
518530
}
519531
#main #welcome form {
520532
margin: -5px 0 0 0;
@@ -605,6 +617,7 @@ textarea#comment {
605617

606618
#sidebars a {
607619
display: inline;
620+
text-decoration: underline;
608621
color: #eee;
609622
}
610623
#sidebars a:hover {
@@ -791,5 +804,66 @@ img.aligncenter {
791804
color: #111;
792805
}
793806

807+
/* after this is the code Gabriel wrote up */
808+
809+
body {
810+
line-height: 1.5em; /* give the text some space to breathe! */
811+
font-family: Verdana, Tahoma, sans-serif; /* Trebuchet isn't really the best font choice for long passages of text */
812+
font-size: 11px;
813+
}
814+
.topPost, .topPost div.topContent, p {font-size: 1em} /* reset font sizes */
815+
.topPost div.topContent {line-height: 1.75em}
816+
div#sidebars * {font-size: 1em !important}
817+
div#sidebars { font-size: 0.9em !important; }
818+
#sidebars h2, #main #welcome h2 {
819+
color: #ff7a04;
820+
letter-spacing: 0;
821+
text-transform: uppercase;
822+
font-weight: bold;
823+
}
824+
.topPost {
825+
padding-bottom: 2.5em;
826+
border-bottom: 1px solid #333;
827+
margin-bottom: 0.5em;
828+
}
829+
#main #welcome p {
830+
font-family: "Helvetica Neue", "DejaVu Sans", Arial, Helvetica, sans-serif;
831+
font-size: 1.2em !important;
832+
line-height: 1.6em;
833+
letter-spacing: 0;
834+
}
835+
.topPost h2.topTitle {margin:0.5em 0 0.25em;}
836+
.topPost h2.topTitle a {
837+
font-weight: light;
838+
font-family: Impact;
839+
opacity: 0.99;
840+
-webkit-font-smoothing: antialiased;
841+
-moz-osx-font-smoothing: grayscale;
842+
letter-spacing: 1px;
843+
line-height: 1em;
844+
text-transform: uppercase;
845+
font-size: 18pt;
846+
color: #30a7df;
847+
text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.7);
848+
}
849+
.topPost h2.topTitle a:hover {
850+
color: #ff7a04;
851+
}
852+
853+
div#header div#logo * {
854+
font-weight: bold;
855+
line-height: 1em;
856+
}
857+
div#header div#logo h1 { font-size: 3em; font-family: "Courier New", Courier, monospace;}
858+
div#header div#logo h1 a { font-size: 1em; }
859+
div#logo span {
860+
font-family: "Bitstream Vera Mono", Monaco, "DejaVu Mono", "Andale Mono", "liberation mono", "Courier New", monospace;
861+
font-weight: bold;
862+
font-size: 8pt;
863+
color: #00F000;
864+
display:block;
865+
text-transform: lowercase;
866+
margin-top: -0.15em;
867+
}
794868

795869

0 commit comments

Comments
 (0)