Subversion Repositories pub

Compare Revisions

Ignore whitespace Rev 240 → Rev 239

/wp-theme-cazuela-remixed/branches/03/comments.php
File deleted
/wp-theme-cazuela-remixed/branches/03/upstream-templates/.htaccess
File deleted
/wp-theme-cazuela-remixed/branches/03/upstream-templates/comments.php
File deleted
/wp-theme-cazuela-remixed/branches/03/upstream-templates/header.php
File deleted
\ No newline at end of file
/wp-theme-cazuela-remixed/branches/03/upstream-templates/footer.php
File deleted
\ No newline at end of file
/wp-theme-cazuela-remixed/branches/03/header.php
File deleted
/wp-theme-cazuela-remixed/branches/03/screenshot.png
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
## -1 +0,0 ##
-*
\ No newline at end of property
Index: branches/03/footer.php
===================================================================
--- branches/03/footer.php (revision 240)
+++ branches/03/footer.php (nonexistent)
@@ -1,57 +0,0 @@
-<?php
-/**
- * The template for displaying the footer.
- *
- * Contains the closing of the id=main div and all content after
- *
- * @package Cazuela
- * @since Cazuela 1.0
- */
-?>
-
- </div><!-- .inner -->
- </div><!-- #main .site-main -->
-
- <?php
- // Before Footer theme hook callback
- thsp_hook_before_footer();
- ?>
-
- <footer id="colophon" class="site-footer" role="contentinfo">
- <?php if ( is_active_sidebar( 'footer-widget-area' ) ) : ?>
- <div class="inner clearfix">
- <section id="footer-widget-area" class="<?php echo thsp_count_widgets( 'footer-widget-area' ); ?>">
- <?php dynamic_sidebar( 'footer-widget-area' ); ?>
- </section><!-- #footer-widgets -->
- </div><!-- .inner -->
- <?php endif; ?>
-
- <div id="footer-nav" class="inner clearfix">
- <?php
- // Footer menu
- wp_nav_menu( array(
- 'theme_location' => 'footer',
- 'container' => 'nav',
- 'container_class' => 'footer-navigation',
- 'fallback_cb' => ''
- ) );
- ?>
-
- <div id="footer-credits">
- Customized
- <a href="<?php echo esc_url( __( 'http://thematosoup.com/themes/cazuela/', 'cazuela' ) ); ?>" title="<?php esc_attr_e( 'Cazuela &mdash; free, responsive WordPress theme', 'cazuela' ); ?>" rel="nofollow"><?php echo __( 'Cazuela theme', 'cazuela' ); ?></a> powered by <a href="<?php echo esc_url( __( 'http://wordpress.org/', 'cazuela' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'cazuela' ); ?>"><?php _e( 'WordPress', 'cazuela' ); ?></a>
- </div><!-- #footer-credits -->
- </div><!-- #footer-nav -->
-
- <?php
- // Before Footer theme hook callback
- thsp_hook_after_footer();
- ?>
- </footer><!-- #colophon .site-footer -->
-
-</div><!-- #page .hfeed .site -->
-
-<?php wp_footer(); ?>
-
-</body>
-</html>
Index: branches/03/images
===================================================================
--- branches/03/images (revision 240)
+++ branches/03/images (nonexistent)
/branches/03/images
Property changes:
Deleted: svn:ignore
## -1 +0,0 ##
-favicon.ico
Index: branches/03/style.css
===================================================================
--- branches/03/style.css (revision 240)
+++ branches/03/style.css (nonexistent)
@@ -1,55 +0,0 @@
-/*
- Theme Name: Cazuela Remixed
- Theme URI: http://outlyer.net/
- Description: Modified version of Cazuela for use at outlyer.net
- Author: Toni Corvera
- Author URI: http://corvera.eu
- Template: cazuela
- Version: 2
-*/
-
-/* =Imports styles from the parent theme
--------------------------------------------------------------- */
-@import url('../cazuela/style.css');
-
-/* =Theme customization starts here
--------------------------------------------------------------- */
-
-/* Special class: Avoid hyphenation */
-.nohyphens {
- -webkit-hyphens: none;
- -moz-hyphens: none;
- -ms-hyphens: none;
- hyphens: none;
-}
-
-/* Layout: Content - Primary Sidebar */
-.layout-cp .content-area {
- float: left;
- margin: 0 -30% 0 0;
- width: 100%;
-}
-.layout-cp #content {
- margin: 0 30% 0 0;
-}
-.layout-cp #secondary {
- float: right;
- width: 26%;
-}
-
-img.wp-smiley {
- display: inline;
-}
-
-pre {
- font-size: 13px;
- font-size: 1.3rem;
- line-height: 1.3;
- margin-bottom: 1.3em;
- padding: 1.3em;
- border: 1px solid #ddd;
-}
-
-#footer-credits {
- font-size: 0.8em;
-}
Index: branches/03
===================================================================
--- branches/03 (revision 240)
+++ branches/03 (nonexistent)
/branches/03
Property changes:
Deleted: svn:mergeinfo
## -0,2 +0,0 ##
Reverse-merged /wp-theme-cazuela-remixed/branches/02+1.0.3:r234-236
Reverse-merged /wp-theme-cazuela-remixed/branches/02:r77-230