Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: jtribe/base-wordpress-theme
base: 860a21a77b
...
head fork: jtribe/base-wordpress-theme
compare: 95e27136ea
  • 4 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
Commits on Feb 22, 2012
Dougal MacPherson Santity check on css 95c81ed
Dougal MacPherson Git ignore 5c506fe
Dougal MacPherson More css tidy 1b8e9e0
Dougal MacPherson Simply theme
Otherwise know as fucking around in CSSEdit
95e2713
View
3  .gitignore
@@ -0,0 +1,3 @@
+# Ignoring mac specific stuff
+.DS_Store
+*tmproj
View
69 category.php
@@ -9,53 +9,58 @@
get_header(); ?>
<section id="primary">
- <div id="content" role="main">
+ <div class="wrapper">
+
+ <div id="content" role="main">
- <?php if ( have_posts() ) : ?>
+ <?php if ( have_posts() ) : ?>
- <div id="introduction">
+ <div id="introduction">
- <header class="page-header">
- <h1 class="page-title">Our <?php single_cat_title(); ?> apps</h1>
+ <header class="page-header">
+ <h1 class="page-title">Our <?php single_cat_title(); ?> apps</h1>
- <!-- Don't show the description if we've started to paginate -->
- <?php
- if ( !is_paged() ) {
- description(category_description());
- }
- ?>
- </header>
- </div>
+ <!-- Don't show the description if we've started to paginate -->
+ <?php
+ if ( !is_paged() ) {
+ description(category_description());
+ }
+ ?>
+ </header>
+ </div>
- <?php /* Start the Loop */ ?>
- <?php while ( have_posts() ) : the_post(); ?>
+ <?php /* Start the Loop */ ?>
+ <?php while ( have_posts() ) : the_post(); ?>
- <?php
+ <?php
- /* Include the Post-Format-specific template for the content.
- * If you want to overload this in a child theme then include a file
- * called content-___.php (where ___ is the Post Format name) and that will be used instead.
- */
- get_template_part( 'content' );
- ?>
+ /* Include the Post-Format-specific template for the content.
+ * If you want to overload this in a child theme then include a file
+ * called content-___.php (where ___ is the Post Format name) and that will be used instead.
+ */
+ get_template_part( 'content' );
+ ?>
- <?php endwhile; ?>
+ <?php endwhile; ?>
- <?php pagination(); ?>
+ <?php pagination(); ?>
- <?php else : ?>
+ <?php else : ?>
- <?php
+ <?php
- // Give them the 404 page
- get_404_template();
- ?>
+ // Give them the 404 page
+ get_404_template();
+ ?>
+
+ <?php endif; ?>
+
+ </div><!-- #content -->
+ </div>
- <?php endif; ?>
+ <?php get_sidebar(); ?>
- </div><!-- #content -->
</section><!-- #primary -->
-<?php get_sidebar(); ?>
<?php get_footer(); ?>
View
360 css/toolbox.css → css/core.css
@@ -1,80 +1,52 @@
-/* =Structure
--------------------------------------------------------------- */
+body {
+ font: 12.5pt "Lucida Grande", Lucida, Verdana, sans-serif;
+ color: #000;
+ padding: 0;
+ margin: 0;
+ background-color: #fff;
+}
#page {
- display: block;
- margin: 1em;
-}
-#primary {
+ clear: both;
float: left;
- margin: 0 -240px 0 0;
+ margin: 0;
width: 100%;
}
-#content {
- margin: 0 280px 0 0;
-}
-#main .widget-area {
- float: right;
- overflow: hidden;
- width: 220px;
-}
-#colophon {
+
+#branding {
clear: both;
- display: block;
+ float: left;
width: 100%;
}
-/* Increase the size of the content area for templates without sidebars */
-.full-width #content,
-.image-attachment #content {
- margin: 0;
+#main {
+ float: left;
+ clear: both;
+ width: 100%;
}
-/* Text meant only for screen readers */
-.screen-reader-text,
-.assistive-text {
- position: absolute !important;
- clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
- clip: rect(1px, 1px, 1px, 1px);
+.wrapper {
+ display: block;
+ clear: both;
+ padding-right: 4em;
+ padding-left: 8em;
}
-/* Alignment */
-.alignleft {
- display: inline;
+#content {
float: left;
-}
-.alignright {
- display: inline;
- float: right;
-}
-.aligncenter {
- clear: both;
+ margin-right: 0;
+ width: 70%;
display: block;
- margin-left: auto;
- margin-right: auto;
}
-
-/* =Header
--------------------------------------------------------------- */
-
-#site-title {
- font-size: 2em;
- font-weight: bold;
- margin: .67em 0;
-}
-#site-description {
- font-size: 1em;
- font-weight: normal;
- margin: 0 0 1em;
+#secondary {
+ padding-top: 4em;
+ width: 20%;
+ float: right;
+ display: block;
}
-
-/* =Menu
--------------------------------------------------------------- */
-
#access {
- background: #eee;
display: block;
float: left;
margin: 0 auto 1em;
@@ -84,6 +56,7 @@
list-style: none;
margin: 0;
padding-left: 0;
+ margin-left: -1em;
}
#access li {
float: left;
@@ -126,136 +99,41 @@
}
-/* =Content
--------------------------------------------------------------- */
-
-.sticky {
-}
-.entry-meta {
- clear: both;
- display: block;
-}
-.single-author .entry-meta .byline {
- display: none;
-}
-#content nav {
- display: block;
- overflow: hidden;
-}
-#content nav .nav-previous {
- float: left;
- width: 50%;
-}
-#content nav .nav-next {
- float: right;
- text-align: right;
- width: 50%;
-}
-#content #nav-above {
- display: none;
-}
-.paged #content #nav-above,
-.single #content #nav-above {
- display: block;
-}
-#nav-below {
- margin: 1em 0 0;
-}
-.page-link {
- clear: both;
- margin: 0 0 1em;
-}
-.page .edit-link {
- clear: both;
- display: block;
-}
-
-/* 404 page */
-.error404 .widget {
- float: left;
- width: 33%;
-}
-.error404 .widget .widgettitle,
-.error404 .widget ul {
- margin-right: 1em;
-}
-.error404 .widget_tag_cloud {
- clear: both;
- float: none;
- width: 100%;
-}
-
-/* Notices */
-.post .notice,
-.error404 #searchform {
- display: block;
- padding: 1em;
+/* Text meant only for screen readers */
+.screen-reader-text,
+.assistive-text {
+ position: absolute !important;
+ clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
+ clip: rect(1px, 1px, 1px, 1px);
}
-/* Image Attachments */
-.image-attachment div.entry-meta {
- float: left;
-}
-.image-attachment nav {
- float: right;
- margin: 0 0 1em 0;
-}
-.image-attachment .entry-content {
- clear: both;
+#site-title {
+ font-size: 2em;
+ font-weight: bold;
+ margin: .67em 0;
}
-.image-attachment .entry-content .entry-attachment {
- background: #eee;
+#site-description {
+ font-size: 1em;
+ font-weight: normal;
margin: 0 0 1em;
- padding: 1em;
- text-align: center;
-}
-.image-attachment .entry-content .attachment {
- display: block;
- margin: 0 auto;
- text-align: center;
}
-/* Aside Posts */
-.format-aside .entry-header {
- display: none;
-}
-.single .format-aside .entry-header {
- display: block;
-}
-.format-aside .entry-content,
-.format-aside .entry-summary {
- padding-top: 1em;
-}
-.single .format-aside .entry-content,
-.single .format-aside .entry-summary {
- padding-top: 0;
+#branding #searchform {
+ position: absolute;
+ top: 4em;
+ right: 4em;
}
-/* Gallery Posts */
-.format-gallery .gallery-thumb {
- float: left;
- margin: 0 1em 0 0;
+#branding #searchform input {
+ margin: 0;
+ padding: 1em;
}
-/* Image Posts */
-.format-image .entry-header {
+#branding #searchform #searchsubmit {
display: none;
}
-.single .format-image .entry-header {
- display: block;
-}
-.format-image .entry-content,
-.format-image .entry-summary {
- padding-top: 1em;
-}
-.single .format-image .entry-content,
-.single .format-image .entry-summary {
- padding-top: 0;
-}
-/* =Images
--------------------------------------------------------------- */
a img {
border: none;
@@ -263,6 +141,13 @@ a img {
p img {
margin-bottom: 0.5em; /* a small bottom margin prevents content floating under images */
}
+
+.hero-img img {
+ float: left;
+ margin-right: 20px;
+ margin-bottom: 20px;
+}
+
/*
Resize images to fit the main content area.
- Applies only to images uploaded via WordPress by targeting size-* classes.
@@ -284,6 +169,8 @@ img.alignleft {
img.alignright {
margin-left: 1em;
}
+
+
.wp-caption {
padding: .5em;
text-align: center;
@@ -301,8 +188,45 @@ img.alignright {
}
-/* =Forms
--------------------------------------------------------------- */
+
+article {
+ display: block;
+ float: left;
+}
+
+article .entry-meta {
+ display: block;
+ float: left;
+ clear: both;
+ padding-bottom: 1em;
+}
+
+article .entry-meta ul {
+ display: block;
+ float: left;
+ clear: both;
+ padding: 0;
+ margin: 0;
+}
+
+article .entry-meta li {
+ padding: 0;
+ margin: 0;
+ display: inline;
+}
+
+.pagination {
+ display: block;
+ margin-top: 1em;
+ float: left;
+ margin-bottom: 1em;
+}
+
+.pagination a {
+ float: left;
+ margin-right: 20px;
+ display: block;
+}
#searchform label {
display: none;
@@ -318,54 +242,82 @@ input#s {
textarea {
width: 80%;
}
-
-/* Class for labelling required form items */
.required {
color: #cc0033;
}
-
-/* =Comments
--------------------------------------------------------------- */
-
-article.comment {
+.widget {
display: block;
}
-#respond input[type=text] {
- display: block;
- width: 60%;
+.widget-area .widget_search {
+ overflow: hidden;
}
-#respond textarea {
- display: block;
- margin: 0 0 1em;
- width: 80%;
+.widget-area .widget_search input {
+ float: left;
}
-#respond .form-allowed-tags {
+
+#colophon {
+ padding: 1em 0 0;
+ border-top: 3px solid rgba(201,201,201,0.22);
+ padding-bottom: 4em;
+ display: block;
+ float: left;
clear: both;
- width: 80%;
+ width: 100%;
+ size: 70%;
}
-#respond .form-allowed-tags code {
- display: block;
+
+#colophon aside {
+ float: left;
}
+#colophon aside h1.widget-title {
+ margin-top: 0;
+}
-/* =Widgets
--------------------------------------------------------------- */
+#colophon ul, footer#colophon ul li {
+ padding: 0;
+ display: block;
+}
-.widget {
+#colophon li a {
+ text-decoration: none;
+ padding-top: 0.25em;
+ padding-bottom: 0.25em;
display: block;
+ float: left;
}
-.widget-area .widget_search {
- overflow: hidden;
+
+#secondary menu {
+ margin: 0;
+ display: block;
+ padding: 0;
}
-.widget-area .widget_search input {
+
+#secondary menu li {
+ display: block;
+ color: #808284;
+ clear: both;
+}
+
+#secondary menu a {
+ text-decoration: none;
+ padding-top: 0.25em;
+ padding-bottom: 0.25em;
+ display: block;
float: left;
}
+#secondary menu ul.children {
+ padding-left: 1em;
+ margin: 0;
+}
+
+#secondary menu li.current_page_item > a, #secondary menu li.current-cat > a {
+ color: #ff2521;
+}
-/* =Footer
--------------------------------------------------------------- */
+#secondary menu li .count {
+ display: none;
+}
-#colophon {
- padding: 1em 0 0;
-}
View
274 css/jtribe.css
@@ -10,13 +10,18 @@
/* @group html base */
+body {
+ color: #000;
+ font-size: 15px;
+}
+
a {
- color: #39508a;
+ color: #0b89c9;
text-decoration: none;
}
a:visited {
- color: #45547a;
+ color: #00a4c2;
}
a:active {
@@ -31,268 +36,3 @@ a:hover {
/* @end */
-/* @group pagination */
-
-.pagination {
- display: block;
- margin-top: 1em;
- float: left;
- margin-bottom: 1em;
-}
-
-.pagination a {
- float: left;
- margin-right: 20px;
- display: block;
-}
-
-
-
-/* @end */
-
-/* @group top menu */
-
-#access {
- display: inline;
- margin: 0 auto 1em -1em;
- background-color: transparent;
-}
-#access ul {
- list-style: none;
- margin: 0;
- padding-left: 0;
-}
-#access li {
- position: relative;
-}
-#access a {
- display: block;
- line-height: 2em;
- padding: 0 1em;
- text-decoration: none;
- color: #fff;
-}
-#access ul ul {
- box-shadow: 0 3px 3px rgba(0,0,0,0.2);
- -moz-box-shadow: 0 3px 3px rgba(0,0,0,0.2);
- -webkit-box-shadow: 0 3px 3px rgba(0,0,0,0.2);
- display: none;
- float: left;
- position: absolute;
- top: 2em;
- left: 0;
- z-index: 99999;
-}
-#access ul ul ul {
- left: 100%;
- top: 0;
-}
-#access ul ul a {
- line-height: 1em;
- padding: .5em .5em .5em 1em;
- width: 10em;
- height: auto;
-}
-#access li:hover > a,
-#access ul ul :hover > a {
-}
-#access ul ul a:hover {
-}
-#access ul li:hover > ul {
- display: block;
-}
-
-nav#access .section-heading {
- display: none;
-}
-
-#menu-main li.current_page_item > a {
- color: #c00;
-}
-
-#menu-main li.current-page-ancestor > a {
- color: #c00;
-}
-
-
-
-/* @end */
-
-/* @group side menu */
-
-#secondary menu {
- margin: 0;
- display: block;
- padding: 0;
-}
-
-#secondary menu li {
- display: block;
- color: #808284;
- clear: both;
-}
-
-#secondary menu a {
- text-decoration: none;
- padding-top: 5px;
- padding-bottom: 5px;
- display: block;
- float: left;
-}
-
-#secondary menu ul.children {
- padding-left: 20px;
- margin: 0;
-}
-
-#secondary menu li.current_page_item > a, #secondary menu li.current-cat > a {
- color: #ff2521;
-}
-
-#secondary menu li .count {
- float: left;
- font-style: italic;
- padding-top: 5px;
- padding-bottom: 5px;
- padding-left: 5px;
-}
-
-
-
-
-/* @end */
-
-/* @group search */
-
-#branding #searchform {
- width: 220px;
- position: absolute;
- top: 4em;
- right: 4em;
-}
-
-#branding #searchform input {
- margin: 0;
- padding: 20px;
-}
-
-#branding #searchform #searchsubmit {
- width: 100px;
- display: none;
-}
-
-
-
-/* @end */
-
-/* @group footer */
-
-footer#colophon {
- border-top: 3px solid rgba(201,201,201,0.22);
- padding-bottom: 4em;
- display: block;
- float: left;
- clear: both;
- width: 100%;
-}
-
-footer#colophon a {
- color: #515151;
-}
-
-footer#colophon aside {
- width: 45%;
- float: left;
- margin-right: 5%;
-}
-
-footer#colophon aside h1.widget-title {
- margin-top: 0;
-}
-
-footer#colophon ul, footer#colophon ul li {
- padding: 0;
- display: block;
-}
-
-
-
-/* @end */
-
-/* @group articles */
-
-article {
- display: block;
- float: left;
-}
-
-.hero-img img {
- float: left;
- margin-right: 20px;
- margin-bottom: 20px;
-}
-
-/* @group tags */
-
-.tags a {
-
-}
-
-
-
-/* @end */
-
-
-
-/* @end */
-
-body {
- font: 12.5pt "Lucida Grande", Lucida, Verdana, sans-serif;
- color: #fff;
- padding: 0;
- margin: 0;
- background-color: #818181;
-}
-
-#page {
- clear: both;
- float: left;
- margin: 0;
- width: 100%;
-}
-
-#branding {
- clear: both;
- background-color: #262626;
- float: left;
- width: 100%;
-}
-
-#main {
- float: left;
- clear: both;
- width: 100%;
- background-color: #fff;
- padding-top: 2em;
- padding-bottom: 2em;
- color: #2e3851;
-}
-
-.wrapper {
- display: block;
- clear: both;
- padding-right: 4em;
- padding-left: 4em;
-}
-
-#content {
- float: left;
- margin-right: 0;
- width: 70%;
-}
-
-#secondary {
- padding-top: 4em;
- width: 220px;
-}
-
View
28 css/timeline.css
@@ -11,24 +11,23 @@
}
#timeline .year {
- margin-bottom: 20px;
+ margin-bottom: 1em;
}
#timeline .year h2 {
+
+ width: 4em;
display: block;
- margin-left: -10%;
- margin-bottom: 5px;
- border-bottom: 2px solid rgba(201,201,201,0.5);
- width: 110%;
- padding-top: 5px;
- padding-bottom: 5px;
- font-weight: normal;
- font-style: normal;
+ margin-left: -5em;
+ padding-top: 0;
+ float: left;
+ height: 0;
+ margin-top: 0;
+ text-align: right;
}
#timeline .app {
- margin-bottom: 5px;
- border-bottom: 1px solid rgba(201,201,201,0.5);
+ margin-bottom: 1em;
}
#timeline .app h3.name {
@@ -38,9 +37,6 @@
margin: 0 10px 0 0;
}
-#timeline .app .client {
- font-style: italic;
-}
#timeline .app p {
margin: 0;
@@ -52,6 +48,6 @@
}
#timeline .apps .tags a {
- padding-left: 5px;
- padding-right: 5px;
+ padding-left: 0.5em;
+ padding-right: 0.5em;
}
View
3  style.css
@@ -8,7 +8,8 @@ Version: 0.0.7
Template: toolbox
*/
-@import url('css/toolbox.css');
+/*@import url('css/toolbox.css');*/
+@import url('css/core.css');
@import url('css/jtribe.css');
@import url('css/timeline.css');

No commit comments for this range

Something went wrong with that request. Please try again.