Skip to content

GitLab

Commit ed2af196 authored by Michael Iseard's avatar Michael Iseard
Browse files

Design changes

parent f2fd0c3c
Expand all Hide whitespace changes
Inline Side-by-side
app/Controllers/App.php
View file @ ed2af196
......@@ -18,39 +18,28 @@ class App extends Controller
if ($home = get_option('page_for_posts', true)) {
return get_the_title($home);
}
return __('Latest Posts', 'sage');
return __('Latest Posts', 'kudos-website');
}
if (is_archive()) {
return get_the_archive_title();
}
if (is_search()) {
return sprintf(__('Search Results for %s', 'sage'), get_search_query());
return sprintf(__('Search Results for %s', 'kudos-website'), get_search_query());
}
if (is_404()) {
return __('Not Found', 'sage');
return __('Not Found', 'kudos-website');
}
return get_the_title();
}
public static function logos($size)
{
if(is_front_page()) {
switch($size) {
case 'small':
return asset_path('images/logo-light.svg');
break;
case 'full':
return asset_path('images/logo-light-full.svg');
break;
}
}
switch($size) {
case 'small':
return asset_path('images/logo-dark.svg');
return asset_path('images/logo-light.svg');
break;
case 'full':
return asset_path('images/logo-dark-full.svg');
return asset_path('images/logo-light-full.svg');
break;
}
......
app/carbon.php
View file @ ed2af196
......@@ -8,11 +8,11 @@ use Carbon_Fields\Block;
add_action( 'carbon_fields_register_fields', 'we_theme_options' );
function we_theme_options() {
Container::make_post_meta('review_rating', __('Rating', 'wisselenergie'))
Container::make_post_meta('review_rating', __('Rating', 'kudos-website'))
->set_context('side')
->where( 'post_type', '=', 'reviews' )
->add_fields([
Field::make( 'radio', 'review_stars', __( 'Choose Number of Stars', 'wisselenergie' ) )
Field::make( 'radio', 'review_stars', __( 'Choose Number of Stars', 'kudos-website' ) )
->set_options( [
'1' => 1,
'2' => 2,
......@@ -21,28 +21,28 @@ function we_theme_options() {
'5' => 5,
])
->set_default_value(5),
Field::make('checkbox', 'show_reviewer_name', __('Show reviewer\'s name', 'wisselenergie'))
Field::make('checkbox', 'show_reviewer_name', __('Show reviewer\'s name', 'kudos-website'))
->set_default_value(true)
])
;
// Add second options page under 'Basic Options'
Container::make( 'theme_options', __( 'Site Options' ) )
->add_tab(__('Homepage', 'wisselenergie'), [
Field::make( 'media_gallery', 'intro_gallery', __( 'Gallery', 'wisselenergie' ) ),
Field::make( 'rich_text', 'intro_text', __( 'Intro Text', 'wisselenergie' ) )
->add_tab(__('Homepage', 'kudos-website'), [
Field::make( 'media_gallery', 'intro_gallery', __( 'Gallery', 'kudos-website' ) ),
Field::make( 'rich_text', 'intro_text', __( 'Intro Text', 'kudos-website' ) )
])
->add_tab(__('Site news', 'wisselenergie'), [
Field::make('checkbox', 'show_site_news', __('Show Site News', 'wisselenergie'))
->add_tab(__('Site news', 'kudos-website'), [
Field::make('checkbox', 'show_site_news', __('Show Site News', 'kudos-website'))
->set_default_value(false)
->set_help_text(__('Shows a custom notification at the top of the home page', 'wisselenergie')),
Field::make('checkbox', 'site_news_all_pages', __('Show on all pages', 'wisselenergie'))
->set_help_text(__('Shows a custom notification at the top of the home page', 'kudos-website')),
Field::make('checkbox', 'site_news_all_pages', __('Show on all pages', 'kudos-website'))
->set_default_value(false)
->set_help_text(__('When disabled only shows on home page', 'wisselenergie')),
Field::make('rich_text', 'site_news', __('Site News', 'wisselenergie'))
->set_help_text(__('When disabled only shows on home page', 'kudos-website')),
Field::make('rich_text', 'site_news', __('Site News', 'kudos-website'))
])
->add_tab(__('Household values', 'wisselenergie'), [
Field::make( 'complex', 'household_values', __('Household Values', 'wisselenergie') )
->add_tab(__('Household values', 'kudos-website'), [
Field::make( 'complex', 'household_values', __('Household Values', 'kudos-website') )
->add_fields( 'household_number', [
Field::make( 'text', 'title' )
->set_width(50),
......@@ -52,11 +52,11 @@ function we_theme_options() {
])
// Email tab
->add_tab('Email', array(
// Field::make( 'separator', 'crb_separator', __( 'Separator' , 'wisselenergie') ),
Field::make( 'checkbox', 'we_use_smtp', __( 'Enable SMTP', 'wisselenergie' ) )
// Field::make( 'separator', 'crb_separator', __( 'Separator' , 'kudos-website') ),
Field::make( 'checkbox', 'we_use_smtp', __( 'Enable SMTP', 'kudos-website' ) )
->set_help_text( 'Enable use of external SMTP server.' )
->set_option_value( 'yes' ),
Field::make( 'text', 'we_smtp_host', __( 'SMTP host', 'wisselenergie' ) )
Field::make( 'text', 'we_smtp_host', __( 'SMTP host', 'kudos-website' ) )
->set_conditional_logic( array(
array(
'field' => 'we_use_smtp',
......@@ -65,7 +65,7 @@ function we_theme_options() {
) )
->set_width('50%')
->set_required(),
Field::make( 'text', 'we_smtp_port', __( 'Port number', 'wisselenergie' ) )
Field::make( 'text', 'we_smtp_port', __( 'Port number', 'kudos-website' ) )
->set_conditional_logic( array(
array(
'field' => 'we_use_smtp',
......@@ -75,7 +75,7 @@ function we_theme_options() {
->set_width('50%')
->set_attribute( 'type', 'number' )
->set_required(),
Field::make( 'radio', 'we_security_protocol', __( 'Security protocol', 'wisselenergie' ) )
Field::make( 'radio', 'we_security_protocol', __( 'Security protocol', 'kudos-website' ) )
->set_conditional_logic( array(
array(
'field' => 'we_use_smtp',
......@@ -87,7 +87,7 @@ function we_theme_options() {
'ssl' => 'SSL',
'tls' => 'TLS'
) ),
Field::make( 'text', 'we_smtp_user', __( 'SMTP username', 'wisselenergie' ) )
Field::make( 'text', 'we_smtp_user', __( 'SMTP username', 'kudos-website' ) )
->set_conditional_logic( array(
array(
'field' => 'we_use_smtp',
......@@ -96,7 +96,7 @@ function we_theme_options() {
) )
->set_help_text( 'The username to login to your mail server.' )
->set_required(),
Field::make( 'text', 'we_smtp_password', __( 'SMTP password', 'wisselenergie' ) )
Field::make( 'text', 'we_smtp_password', __( 'SMTP password', 'kudos-website' ) )
->set_conditional_logic( array(
array(
'field' => 'we_use_smtp',
......@@ -106,7 +106,7 @@ function we_theme_options() {
->set_attribute( 'type', 'password' )
->set_help_text( 'The password to login to your mail server.' )
->set_required(),
Field::make( 'text', 'we_from_email', __( 'From email', 'wisselenergie' ) )
Field::make( 'text', 'we_from_email', __( 'From email', 'kudos-website' ) )
->set_conditional_logic( array(
array(
'field' => 'we_use_smtp',
......@@ -115,7 +115,7 @@ function we_theme_options() {
) )
->set_help_text( 'Email address that messages will appear from.' )
->set_required(),
Field::make( 'text', 'we_from_name', __( 'From name', 'wisselenergie' ) )
Field::make( 'text', 'we_from_name', __( 'From name', 'kudos-website' ) )
->set_conditional_logic( array(
array(
'field' => 'we_use_smtp',
......@@ -123,21 +123,27 @@ function we_theme_options() {
)
) )
->set_help_text( 'This text will be used in the \'FROM\' field.' ),
) );
) )
;
// CTA tab
->add_tab('CTA', [
Field::make( 'text', 'cta_label', __( 'CTA Label', 'kudos-website' ) )
->set_required(),
Field::make( 'text', 'cta_link', __( 'CTA Link', 'kudos-website' ) )
->set_required()
]);
Block::make( 'WE Savings Calculator' )
->add_fields( [
Field::make( 'text', 'text', __('Display text, use {{ number }} for house type and {{ saving }} for savings', 'wisselenergie') )
Field::make( 'text', 'text', __('Display text, use {{ number }} for house type and {{ saving }} for savings', 'kudos-website') )
->set_default_value('Eeen gemiddeld {{ number }} bespaart tot {{ saving }} per jaar!'),
Field::make( 'color', 'background_color', __( 'Background Color', 'wisselenergie' ) )
Field::make( 'color', 'background_color', __( 'Background Color', 'kudos-website' ) )
->set_default_value('#ffba08')
] )
->set_description( __( 'Adds an interactive widget fpr calculating energy savings.', 'wisselenergie' ) )
->set_description( __( 'Adds an interactive widget fpr calculating energy savings.', 'kudos-website' ) )
->set_category( 'widgets' )
->set_icon( 'admin-users' )
->set_keywords( [ __( 'widget', 'wisselenergie' ) ] )
->set_keywords( [ __( 'widget', 'kudos-website' ) ] )
->set_render_callback( function ( $fields ) {
$values_array = carbon_get_theme_option('household_values');
$total_values = count($values_array);
......@@ -176,13 +182,13 @@ function we_theme_options() {
Block::make( 'WE Reviews' )
->add_fields( [
Field::make( 'color', 'background_color', __( 'Background Color', 'wisselenergie' ) )
Field::make( 'color', 'background_color', __( 'Background Color', 'kudos-website' ) )
->set_default_value('#09814A')
] )
->set_description( __( 'Adds a widget showing random reviews.', 'wisselenergie' ) )
->set_description( __( 'Adds a widget showing random reviews.', 'kudos-website' ) )
->set_category( 'widgets' )
->set_icon( 'admin-comments' )
->set_keywords( [ __( 'widget', 'wisselenergie' ) ] )
->set_keywords( [ __( 'widget', 'kudos-website' ) ] )
->set_render_callback( function ( $fields ) {
$color = $fields['background_color'];
$args = [
......
resources/assets/config.json
View file @ ed2af196
......@@ -8,7 +8,7 @@
"./scripts/customizer.js"
]
},
"publicPath": "/wp-content/themes/wisselenergie-theme",
"publicPath": "/wp-content/themes/kudos-theme",
"devUrl": "http://wp.wisselenergie.test",
"proxyUrl": "http://localhost:3000",
"cacheBusting": "[name]_[hash:8]",
......
resources/assets/images/logo-dark-full.svg deleted 100644 → 0
View file @ f2fd0c3c
This diff is collapsed.
resources/assets/images/logo-dark.png
View replaced file @ f2fd0c3c View file @ ed2af196
resources/assets/images/logo-dark.png

2.82 KB | W: | H:

resources/assets/images/logo-dark.png

2.22 KB | W: | H:

resources/assets/images/logo-dark.png
resources/assets/images/logo-dark.png
resources/assets/images/logo-dark.png
resources/assets/images/logo-dark.png
  • 2-up
  • Swipe
  • Onion skin
resources/assets/images/logo-dark.svg
View file @ ed2af196
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 489 721" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<g transform="matrix(1,0,0,1,-155.831,-39.9265)">
<g transform="matrix(35.4393,0,0,35.4393,155.831,39.9819)">
<path d="M0,20.319C3.189,17.539 3.412,13.92 2.613,10.227C2.103,7.865 2.813,6.625 4.8,5.488C7.566,3.905 13.975,-0.092 13.775,0C12.293,0.822 11.514,3.192 11.57,4.905C11.596,5.697 11.726,6.494 11.787,7.291C12.022,10.36 11.225,12.725 8.26,14.408C5.332,16.07 2.74,18.324 0,20.319" style="fill:rgb(16,30,61);fill-rule:nonzero;"/>
<svg width="100%" height="100%" viewBox="0 0 555 449" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<g transform="matrix(1,0,0,1,-555.044,-949.822)">
<g transform="matrix(1,0,0,1,65.846,-80.2309)">
<g transform="matrix(0.493087,0,0,0.493087,348.386,386.091)">
<g transform="matrix(1.83443,0,0,1.12707,-264.155,-165.956)">
<rect x="299.673" y="1305.98" width="144.226" height="806.766"/>
</g>
<g transform="matrix(6.15451e-17,0.985509,-0.985509,6.15451e-17,2725.15,672.414)">
<path d="M1104.21,1467.33C1201.33,1305.98 1395.58,1305.98 1492.7,1386.66C1589.82,1467.33 1589.82,1628.69 1492.7,1790.04C1424.71,1911.06 1249.89,2032.07 1104.21,2112.75C958.528,2032.07 783.71,1911.06 715.724,1790.04C618.602,1628.69 618.602,1467.33 715.724,1386.66C812.846,1305.98 1007.09,1305.98 1104.21,1467.33Z"/>
</g>
</g>
</g>
</g>
</svg>
resources/assets/images/logo-light-full.svg deleted 100644 → 0
View file @ f2fd0c3c
This diff is collapsed.
resources/assets/images/logo-light.svg
View file @ ed2af196
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 800 800" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<g transform="matrix(35.4393,0,0,35.4393,155.831,39.9819)">
<path d="M0,20.319C3.189,17.539 3.412,13.92 2.613,10.227C2.103,7.865 2.813,6.625 4.8,5.488C7.566,3.905 13.975,-0.092 13.775,0C12.293,0.822 11.514,3.192 11.57,4.905C11.596,5.697 11.726,6.494 11.787,7.291C12.022,10.36 11.225,12.725 8.26,14.408C5.332,16.07 2.74,18.324 0,20.319" style="fill:white;fill-rule:nonzero;"/>
</g>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" clip-rule="evenodd" viewBox="0 0 555 449">
<defs/>
<path fill="#2ec4b6" d="M0-.003h130.458v448.355H.001z"/>
<path fill="#ff9f1c" d="M489.887 224.178c78.407 47.195 78.407 141.59 39.201 188.784-39.2 47.194-117.612 47.194-196.019 0-58.809-33.04-117.612-117.992-156.818-188.784 39.206-70.793 98.01-155.744 156.818-188.781 78.407-47.196 156.818-47.196 196.02 0 39.205 47.195 39.205 141.587-39.202 188.781z"/>
</svg>
\ No newline at end of file
resources/assets/images/logo-white.svg 0 → 100644
View file @ ed2af196
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 555 449" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<g transform="matrix(1,0,0,1,-555.044,-949.822)">
<g transform="matrix(1,0,0,1,65.846,-80.2309)">
<g transform="matrix(0.493087,0,0,0.493087,348.386,386.091)">
<g transform="matrix(1.83443,0,0,1.12707,-264.155,-165.956)">
<rect x="299.673" y="1305.98" width="144.226" height="806.766" style="fill:white;"/>
</g>
<g transform="matrix(6.15451e-17,0.985509,-0.985509,6.15451e-17,2725.15,672.414)">
<path d="M1104.21,1467.33C1201.33,1305.98 1395.58,1305.98 1492.7,1386.66C1589.82,1467.33 1589.82,1628.69 1492.7,1790.04C1424.71,1911.06 1249.89,2032.07 1104.21,2112.75C958.528,2032.07 783.71,1911.06 715.724,1790.04C618.602,1628.69 618.602,1467.33 715.724,1386.66C812.846,1305.98 1007.09,1305.98 1104.21,1467.33Z" style="fill:white;"/>
</g>
</g>
</g>
</g>
</svg>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment