Skip to content
This repository has been archived by the owner on Sep 16, 2019. It is now read-only.

Add the new foundation color palette mixin #761

Merged
merged 3 commits into from
Mar 9, 2016
Merged

Add the new foundation color palette mixin #761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cccb23c
Add the new foundation color palette mixin
olefredrik Mar 9, 2016
5f7de8b
Fix WP-coding standards sniff violations
olefredrik Mar 9, 2016
561f8ef
Fix the last WP-coding sniff violation
olefredrik Mar 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions assets/scss/global/_settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,6 @@
$global-font-size: 100%;
$global-width: rem-calc(1200);
$global-lineheight: 1.5;
$primary-color: #2199e8;
$secondary-color: #777;
$success-color: #3adb76;
$warning-color: #ffae00;
$alert-color: #ec5840;
$light-gray: #e6e6e6;
$medium-gray: #cacaca;
$dark-gray: #8a8a8a;
Expand All @@ -70,6 +65,15 @@ $global-radius: 0;
$global-text-direction: ltr;
$global-flexbox: false;
$print-transparent-backgrounds: true;
$foundation-palette: (
primary: #2199e8,
secondary: #ff0000,
success: #3adb76,
warning: #ffae00,
alert: #ec5840,
);

@include add-foundation-colors;

// 2. Breakpoints
// --------------
Expand Down
2 changes: 1 addition & 1 deletion library/cleanup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ public function img_caption_shortcode( $output, $attr, $content ) {

// Create caption HTML
$output = '
<div' . $attributes .'>' .
<div' . $attributes . '>' .
do_shortcode( $content ) .
'<p class="' . $this->caption_p_class . '">' . $attr['caption'] . '</p>' .
'</div>
Expand Down
4 changes: 2 additions & 2 deletions library/entry-meta.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

if ( ! function_exists( 'foundationpress_entry_meta' ) ) :
function foundationpress_entry_meta() {
echo '<time class="updated" datetime="'. get_the_time( 'c' ) .'">'. sprintf( __( 'Posted on %s at %s.', 'foundationpress' ), get_the_date(), get_the_time() ) .'</time>';
echo '<p class="byline author">'. __( 'Written by', 'foundationpress' ) .' <a href="'. get_author_posts_url( get_the_author_meta( 'ID' ) ) .'" rel="author" class="fn">'. get_the_author() .'</a></p>';
echo '<time class="updated" datetime="' . get_the_time( 'c' ) . '">' . sprintf( __( 'Posted on %s at %s.', 'foundationpress' ), get_the_date(), get_the_time() ) . '</time>';
echo '<p class="byline author">' . __( 'Written by', 'foundationpress' ) . ' <a href="' . get_author_posts_url( get_the_author_meta( 'ID' ) ) . '" rel="author" class="fn">' . get_the_author() . '</a></p>';
}
endif;
2 changes: 1 addition & 1 deletion library/navigation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ function foundationpress_breadcrumb( $showhome = true, $separatorclass = false )
} else if ( get_query_var('paged') ) {

// Paginated archives
echo '<li class="current item-current-' . get_query_var('paged') . '">'.__('Page') . ' ' . get_query_var('paged') . '</li>';
echo '<li class="current item-current-' . get_query_var('paged') . '">' . __('Page') . ' ' . get_query_var('paged') . '</li>';

} else if ( is_search() ) {

Expand Down