Merge pull request #13 from Rumperuu/fix/experience-page-styling
Fix ‘Experience’ page styling
This commit is contained in:
commit
60fe2b6e6f
4 changed files with 133 additions and 127 deletions
|
@ -1,20 +1,17 @@
|
||||||
<?php
|
<?php
|
||||||
/*
|
/*
|
||||||
* Template Name: Experience by Companies
|
* Template Name: Experience by Companies
|
||||||
*/
|
* /
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* The template for displaying all items, indexed by organisation.
|
||||||
*
|
*
|
||||||
*
|
* @package Omphaloskepsis
|
||||||
* The template for displaying all single posts and attachments
|
* @since Omphaloskepsis 1.0
|
||||||
*
|
|
||||||
* @package WordPress
|
|
||||||
* @subpackage Twenty_Sixteen
|
|
||||||
* @since Twenty Sixteen 1.0
|
|
||||||
*/
|
*/
|
||||||
get_header(); ?>
|
get_header(); ?>
|
||||||
|
|
||||||
<div id="experience-wrapper" class="content-area col-10 col-m-12">
|
<main id="experience-wrapper" class="content-area col-10 col-m-12">
|
||||||
<!--Page Title & Details-->
|
<!--Page Title & Details-->
|
||||||
<header class="post-header-title">
|
<header class="post-header-title">
|
||||||
<h1 style="margin-bottom: 20px;" id="page-title">Experience.</h1>
|
<h1 style="margin-bottom: 20px;" id="page-title">Experience.</h1>
|
||||||
|
@ -26,7 +23,7 @@ get_header(); ?>
|
||||||
<?php the_content(); ?>
|
<?php the_content(); ?>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div style="width: 70%; margin: auto; margin-top: 20px; border: 2px dashed #020202; padding: 20px; border-radius: 25px;" class="entry-content tile" id="settings">
|
<div class="entry-content tile" id="settings">
|
||||||
<h3 style="margin-bottom: 14px;" class="subheading">Settings</h3>
|
<h3 style="margin-bottom: 14px;" class="subheading">Settings</h3>
|
||||||
<form action="/experience-by-companies" id="settings" method="GET">
|
<form action="/experience-by-companies" id="settings" method="GET">
|
||||||
<input class="checkbox" type="checkbox" id="toplevel" value="toplevel" checked="checked">
|
<input class="checkbox" type="checkbox" id="toplevel" value="toplevel" checked="checked">
|
||||||
|
@ -136,6 +133,6 @@ get_header(); ?>
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
</div>
|
</main>
|
||||||
|
|
||||||
<?php get_footer(); ?>
|
<?php get_footer(); ?>
|
||||||
|
|
|
@ -4,22 +4,21 @@
|
||||||
* /
|
* /
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The template for displaying all single posts and attachments
|
* The template for displaying all roles in a timeline.
|
||||||
*
|
*
|
||||||
* @package WordPress
|
* @package Omphaloskepsis
|
||||||
* @subpackage Twenty_Sixteen
|
* @since Omphaloskepsis 1.0
|
||||||
* @since Twenty Sixteen 1.0
|
|
||||||
*/
|
*/
|
||||||
get_header(); ?>
|
get_header(); ?>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
function withinDates( $jSDate, $jEDate ) {
|
function withinDates( $jSDate, $jEDate ) {
|
||||||
$endYear = date( 'Y' );
|
$endYear = date( 'Y' );
|
||||||
$endDate = $endYear . '-12-31';
|
$endDate = $endYear . '-12-31';
|
||||||
$startDate = ( $endYear - 2 ) . '-01-01';
|
$startDate = ( $endYear - 2 ) . '-01-01';
|
||||||
$jEDate = ( ! $jEDate ) ? date( 'Y-m-d' ) : ( ( $jEDate > $endDate ) ? $endDate : $jEDate );
|
$jEDate = ( ! $jEDate ) ? date( 'Y-m-d' ) : ( ( $jEDate > $endDate ) ? $endDate : $jEDate );
|
||||||
return ( ( ( strtotime( $jSDate ) < strtotime( $endDate ) ) && ( strtotime( $jSDate ) > strtotime( $startDate ) ) ) && ( strtotime( $jEDate ) > strtotime( $startDate ) ) );
|
return ( ( ( strtotime( $jSDate ) < strtotime( $endDate ) ) && ( strtotime( $jSDate ) > strtotime( $startDate ) ) ) && ( strtotime( $jEDate ) > strtotime( $startDate ) ) );
|
||||||
}
|
}
|
||||||
$args = array(
|
$args = array(
|
||||||
'post_type' => array(
|
'post_type' => array(
|
||||||
'job',
|
'job',
|
||||||
|
@ -27,9 +26,9 @@ function withinDates( $jSDate, $jEDate ) {
|
||||||
'posts_per_page' => -1,
|
'posts_per_page' => -1,
|
||||||
);
|
);
|
||||||
$loop = new WP_Query( $args );
|
$loop = new WP_Query( $args );
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<div id="experience-wrapper" class="content-area col-10 col-m-12">
|
<main id="experience-wrapper" class="content-area col-10 col-m-12">
|
||||||
<header class="post-header-title">
|
<header class="post-header-title">
|
||||||
<h1 id="page-title">Experience</h1>
|
<h1 id="page-title">Experience</h1>
|
||||||
<h2 id="page-subtitle">or, a brief history of Ben</h2>
|
<h2 id="page-subtitle">or, a brief history of Ben</h2>
|
||||||
|
@ -41,7 +40,7 @@ function withinDates( $jSDate, $jEDate ) {
|
||||||
<?php the_content(); ?>
|
<?php the_content(); ?>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div style="width: 70%; margin: auto; margin-top: 20px; border: 2px dashed #020202; padding: 20px; border-radius: 25px;" class="entry-content tile" id="settings">
|
<div class="entry-content tile" id="settings">
|
||||||
<h3 style="margin-bottom: 14px;" class="subheading">Settings</h3>
|
<h3 style="margin-bottom: 14px;" class="subheading">Settings</h3>
|
||||||
<form action="/experience-timeline" id="settings" method="GET">
|
<form action="/experience-timeline" id="settings" method="GET">
|
||||||
<input class="checkbox" type="checkbox" id="separate" value="separate" checked="checked">
|
<input class="checkbox" type="checkbox" id="separate" value="separate" checked="checked">
|
||||||
|
@ -140,6 +139,6 @@ function withinDates( $jSDate, $jEDate ) {
|
||||||
</section>
|
</section>
|
||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</main>
|
||||||
<?php // get_sidebar(); ?>
|
<?php // get_sidebar(); ?>
|
||||||
<?php get_footer(); ?>
|
<?php get_footer(); ?>
|
||||||
|
|
12
style.css
12
style.css
|
@ -1167,11 +1167,21 @@ a:hover, a:focus {
|
||||||
|
|
||||||
#experience-wrapper {
|
#experience-wrapper {
|
||||||
grid-area: page-container;
|
grid-area: page-container;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.entry-content.tile#settings {
|
||||||
|
width: 70%;
|
||||||
|
margin: auto;
|
||||||
|
margin-top: 1em;
|
||||||
|
border: 2px dashed #020202;
|
||||||
|
padding: 1em;
|
||||||
|
border-radius: 25px;
|
||||||
|
margin-bottom: 1em;
|
||||||
}
|
}
|
||||||
|
|
||||||
#organisations-grid {
|
#organisations-grid {
|
||||||
border-spacing: 1em;
|
border-spacing: 1em;
|
||||||
margin-top: 1em;
|
|
||||||
margin-bottom: 1em;
|
margin-bottom: 1em;
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue