Merge branch 'dev'

functions.php

@@ -74,12 +74,13 @@ function enqueue_admin()
     function synergia_theme_stylesheets()
     {
         global $version, $snrg_settings;
+        $style_path = get_template_directory_uri().'/build/style';
 
         wp_register_style('Titillium', 'https://fonts.googleapis.com/css?family=Titillium+Web:400,300,700&subset=latin,latin-ext');
         wp_register_style('Titillium900', 'https://fonts.googleapis.com/css?family=Titillium+Web:900&subset=latin');
-        wp_register_style('main', get_template_directory_uri().'/build/style/main.css', array(), $version, 'all');
-        wp_register_style('github', get_template_directory_uri().'/build/style/github.css', array(), $version, 'all');
-        wp_register_style('prism', get_template_directory_uri().'/build/style/prism-okaidia.css', array(), $version, 'all');
+        wp_register_style('main', $style_path.'/main.css', array(), $version, 'all');
+        wp_register_style('github', $style_path.'/github.css', array(), $version, 'all');
+        wp_register_style('prism', $style_path.'/prism-okaidia.css', array(), $version, 'all');
         wp_enqueue_style('main');
         wp_enqueue_style('Titillium');
         // Dla rekrutacji potrzebna jest ciężka czcionka
@@ -89,7 +90,7 @@ function synergia_theme_stylesheets()
         if (is_author()) {
             wp_enqueue_style('github');
         }
-        if (is_singular('project')) {
+        if (is_singular('project') || is_single()) {
             wp_enqueue_style('prism');
         }
     }
@@ -106,19 +107,20 @@ function synergia_admin_styles() {
 
 function js() {
   global $version, $snrg_settings;
-
-    wp_register_script('underscore', get_template_directory_uri().'/build/js/underscore.min.js', '1.6.0', true);
-    wp_register_script('github.js', get_template_directory_uri().'/build/js/github.min.js', '0.1.3', true);
-    wp_register_script('prism', get_template_directory_uri().'/build/js/prism.min.js', '', true);
-    wp_register_script('main', get_template_directory_uri().'/build/js/main.min.js', array('jquery'), $version, true);
-    wp_register_script('swipe', get_template_directory_uri().'/build/js/swipe.min.js', array('jquery'), $version, true);
-    wp_register_script('blazy', get_template_directory_uri().'/build/js/blazy.min.js', array('jquery'), $version, true);
+  $js_path = get_template_directory_uri().'/build/js';
+
+    wp_register_script('underscore', $js_path.'/underscore.min.js', '1.6.0', true);
+    wp_register_script('github.js', $js_path.'/github.min.js', '0.1.3', true);
+    wp_register_script('prism', $js_path.'/prism.min.js', '', true);
+    wp_register_script('main', $js_path.'/main.min.js', array('jquery'), $version, true);
+    wp_register_script('swipe', $js_path.'/swipe.min.js', array('jquery'), $version, true);
+    wp_register_script('blazy', $js_path.'/blazy.min.js', array('jquery'), $version, true);
     // wp_register_script('cookie', get_template_directory_uri().'/build/js/js-cookie.min.js', '', true);
     if (is_author()) {
         wp_enqueue_script('underscore');
         wp_enqueue_script('github.js');
     }
-    if (is_singular('project')) {
+    if (is_singular('project') || is_single()) {
         wp_enqueue_script('prism');
     }
     // if ($snrg_settings['recruitment']) {

style.css

@@ -3,7 +3,7 @@ Theme Name: Synergia
 Author: Stanisław Dac
 Author URI: http://github.com/stsdc
 Description: Specjalnie dla Międzywydziałowego Koła Naukowego Mechatroniki "Synergia"
-Version: 1.4.3
+Version: 1.4.4
 GitHub Theme URI: https://github.com/synergia/mknm-synergia-theme
 GitHub Branch: master
 */