From 285d2ea3ea6c6b6a3a8d19e91a059768cc11f7ee Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 10:50:47 +0200 Subject: [PATCH 01/35] Fixes #998 --- inc/summary.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/inc/summary.php b/inc/summary.php index 8b82196e..6ebb3286 100644 --- a/inc/summary.php +++ b/inc/summary.php @@ -38,6 +38,7 @@ function hashed_heading($content) { $el->setAttribute('id', sanitize_title($name)); $el->setAttribute('class', 'summary-item'); + $header = $dom->createElement('h4'); $link = $dom->createElement('a'); $link->setAttribute('href', '#' . sanitize_title($name)); $link->setAttribute("title", $name); @@ -52,7 +53,8 @@ function hashed_heading($content) { */ $el->nodeValue = htmlspecialchars($name); - $el->appendChild($link); + $header->appendChild($link); + $el->appendChild($header); } From f2b399c7bb777c2029822ada2c3f78fee81112d6 Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 11:00:43 +0200 Subject: [PATCH 02/35] Fixes #998 --- inc/summary.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/inc/summary.php b/inc/summary.php index 6ebb3286..dfa27794 100644 --- a/inc/summary.php +++ b/inc/summary.php @@ -39,7 +39,7 @@ function hashed_heading($content) { $el->setAttribute('id', sanitize_title($name)); $el->setAttribute('class', 'summary-item'); $header = $dom->createElement('h4'); - $link = $dom->createElement('a'); + $link = $header->createElement('a'); $link->setAttribute('href', '#' . sanitize_title($name)); $link->setAttribute("title", $name); //$link->nodeValue = htmlspecialchars($name); @@ -53,7 +53,6 @@ function hashed_heading($content) { */ $el->nodeValue = htmlspecialchars($name); - $header->appendChild($link); $el->appendChild($header); } From 42955c3b2741fbb8e11a12bacd7b2f3fd609fb20 Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 11:01:20 +0200 Subject: [PATCH 03/35] Fixes #998 --- inc/summary.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/inc/summary.php b/inc/summary.php index dfa27794..8b82196e 100644 --- a/inc/summary.php +++ b/inc/summary.php @@ -38,8 +38,7 @@ function hashed_heading($content) { $el->setAttribute('id', sanitize_title($name)); $el->setAttribute('class', 'summary-item'); - $header = $dom->createElement('h4'); - $link = $header->createElement('a'); + $link = $dom->createElement('a'); $link->setAttribute('href', '#' . sanitize_title($name)); $link->setAttribute("title", $name); //$link->nodeValue = htmlspecialchars($name); @@ -53,7 +52,7 @@ function hashed_heading($content) { */ $el->nodeValue = htmlspecialchars($name); - $el->appendChild($header); + $el->appendChild($link); } From dd15b5c94c44b6afef473f3c68a60e394af7d388 Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 11:02:18 +0200 Subject: [PATCH 04/35] test --- inc/summary.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/summary.php b/inc/summary.php index 8b82196e..01b1f918 100644 --- a/inc/summary.php +++ b/inc/summary.php @@ -38,7 +38,7 @@ function hashed_heading($content) { $el->setAttribute('id', sanitize_title($name)); $el->setAttribute('class', 'summary-item'); - $link = $dom->createElement('a'); + $link = $dom->createElement('h4'); $link->setAttribute('href', '#' . sanitize_title($name)); $link->setAttribute("title", $name); //$link->nodeValue = htmlspecialchars($name); From 4f26fe4bf73b74bf7ca1e59b90c0f0e0c7ac22d0 Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 11:05:25 +0200 Subject: [PATCH 05/35] Fixes #998 --- inc/utils/content.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/utils/content.php b/inc/utils/content.php index b9f3c4c8..4fdfe00a 100644 --- a/inc/utils/content.php +++ b/inc/utils/content.php @@ -170,9 +170,9 @@ function print_category_by_post_type( $category, $post_type ="post", $current_ca $included_posttype = '?post_type='.$post_type; endif; if($post_type == "map-layer" && is_page(array("map-explorer", "maps")) ){ - $cat_name = ''; + $cat_name = '

'; $cat_name .= $category->name; - $cat_name .= ""; + $cat_name .= "

"; $count_layer_items = 0; $args_get_post = array( 'post_type' => $post_type, @@ -216,7 +216,7 @@ function print_category_by_post_type( $category, $post_type ="post", $current_ca } //$query_get_post->have_posts }else { echo ""; - echo ''; + echo '

'; if ($current_cat == $category->slug){ // if page of the topic exists echo ""; echo $category->name; @@ -224,7 +224,7 @@ function print_category_by_post_type( $category, $post_type ="post", $current_ca }else{ echo $category->name; } - echo ""; + echo "

"; echo ""; } } From 68cc7d6190758305ef1389857908837248c09edb Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 17:19:42 +0200 Subject: [PATCH 06/35] Fixes #998 --- inc/summary.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/summary.php b/inc/summary.php index 01b1f918..8b82196e 100644 --- a/inc/summary.php +++ b/inc/summary.php @@ -38,7 +38,7 @@ function hashed_heading($content) { $el->setAttribute('id', sanitize_title($name)); $el->setAttribute('class', 'summary-item'); - $link = $dom->createElement('h4'); + $link = $dom->createElement('a'); $link->setAttribute('href', '#' . sanitize_title($name)); $link->setAttribute("title", $name); //$link->nodeValue = htmlspecialchars($name); From c1c6644dc064cb8b3ec54ac3b3d0838b7480b88d Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 17:20:42 +0200 Subject: [PATCH 07/35] increased version number --- style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/style.css b/style.css index 073b3363..48bd36cc 100644 --- a/style.css +++ b/style.css @@ -5,7 +5,7 @@ Author: Open Development Mekong Author URI: http://github.com/OpenDevelopmentMekong Description: Open Development Mekong's wordpress theme. Based on JEO child theme Template: jeo -Version: 2.2.55 +Version: 2.2.56 License: GNU General Public License v3 or later License URI: http://www.gnu.org/licenses/gpl-3.0.html */ From 47d99dc85b854d3a0a08a471193b89990a237651 Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 17:21:38 +0200 Subject: [PATCH 08/35] Fixes #998 --- inc/widgets/odm-taxonomy-widget.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/widgets/odm-taxonomy-widget.php b/inc/widgets/odm-taxonomy-widget.php index 75f1d586..f97a8e87 100644 --- a/inc/widgets/odm-taxonomy-widget.php +++ b/inc/widgets/odm-taxonomy-widget.php @@ -49,7 +49,7 @@ public function print_category_linked_to_topic($category, $current_page_slug ="" echo ""; if ($get_post_id){ // if page of the topic exists $hyperlink_color = " class='".odm_country_manager()->get_current_country()."-color'"; - echo ''; + echo '

'; }else{ $hyperlink_color = ""; } @@ -65,7 +65,7 @@ public function print_category_linked_to_topic($category, $current_page_slug ="" echo ""; } if ($get_post_id) - echo ""; + echo "

"; echo ""; } From daae5f7642db86e1bcfcce4cb6ad61e8815fd362 Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 17:26:32 +0200 Subject: [PATCH 09/35] Fixes #998 --- inc/utils/content.php | 22 +++++++++++----------- inc/widgets/odm-taxonomy-widget.php | 10 +++++----- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/inc/utils/content.php b/inc/utils/content.php index 4fdfe00a..f138f945 100644 --- a/inc/utils/content.php +++ b/inc/utils/content.php @@ -170,9 +170,9 @@ function print_category_by_post_type( $category, $post_type ="post", $current_ca $included_posttype = '?post_type='.$post_type; endif; if($post_type == "map-layer" && is_page(array("map-explorer", "maps")) ){ - $cat_name = '

'; + $cat_name = ''; $cat_name .= $category->name; - $cat_name .= "

"; + $cat_name .= ""; $count_layer_items = 0; $args_get_post = array( 'post_type' => $post_type, @@ -216,7 +216,7 @@ function print_category_by_post_type( $category, $post_type ="post", $current_ca } //$query_get_post->have_posts }else { echo ""; - echo '

'; + echo ''; if ($current_cat == $category->slug){ // if page of the topic exists echo ""; echo $category->name; @@ -224,7 +224,7 @@ function print_category_by_post_type( $category, $post_type ="post", $current_ca }else{ echo $category->name; } - echo "

"; + echo ""; echo ""; } } @@ -390,8 +390,8 @@ function echo_post_meta($the_post, $show_elements = array('date','categories','t } endif; ?> - + ID,array('fields' => 'all_with_object_id')); if (isset($max_num_topics) && $max_num_topics > 0): $category_list = array_splice($category_list,0,$max_num_topics); @@ -402,7 +402,7 @@ function echo_post_meta($the_post, $show_elements = array('date','categories','t name ?> - - + 0): $tag_list = array_splice($tag_list,0,$max_num_tags); @@ -424,7 +424,7 @@ function echo_post_meta($the_post, $show_elements = array('date','categories','t name ?> - + endif; ?> get_current_country()."-color'"; echo '

'; }else{ - $hyperlink_color = ""; - } + $hyperlink_color = ""; + } $in_category = in_category( $category->term_id ); if ($in_category){ echo ""; @@ -65,7 +65,7 @@ public function print_category_linked_to_topic($category, $current_page_slug ="" echo ""; } if ($get_post_id) - echo "

"; + echo "

"; echo ""; } @@ -83,7 +83,7 @@ public function print_category_linked_to_category( $category, $current_page_slug // add link if contetns categorized by this topic exist if ($category_has_contents): $hyperlink_color = " class='".odm_country_manager()->get_current_country()."-color'"; - echo ''; + echo '

'; else: $hyperlink_color = ""; endif; @@ -102,7 +102,7 @@ public function print_category_linked_to_category( $category, $current_page_slug } if ($category_has_contents) - echo ""; + echo "

"; echo ""; From 13a94d0d2adaaffd9d36ba01b7b5b932fa27bc48 Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 17:34:26 +0200 Subject: [PATCH 10/35] Fixes #998 --- inc/widgets/odm-taxonomy-widget.php | 50 +++++++++++++---------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/inc/widgets/odm-taxonomy-widget.php b/inc/widgets/odm-taxonomy-widget.php index 161b4dd7..77a6a4c7 100644 --- a/inc/widgets/odm-taxonomy-widget.php +++ b/inc/widgets/odm-taxonomy-widget.php @@ -47,25 +47,25 @@ public function print_category_linked_to_topic($category, $current_page_slug ="" } } echo ""; - if ($get_post_id){ // if page of the topic exists - $hyperlink_color = " class='".odm_country_manager()->get_current_country()."-color'"; - echo '

'; - }else{ - $hyperlink_color = ""; - } + if ($get_post_id): // if page of the topic exists + echo '

'; + endif; + $in_category = in_category( $category->term_id ); - if ($in_category){ - echo ""; - $hyperlink_color = " class='".odm_country_manager()->get_current_country()."-color'"; - }else { - $hyperlink_color = ""; - } - echo $category->name; - if ($in_category){ + if ($in_category): + echo ""; + endif; + + echo $category->name; + + if ($in_category): echo ""; - } - if ($get_post_id) + endif; + + if ($get_post_id): echo "

"; + endif; + echo ""; } @@ -82,27 +82,23 @@ public function print_category_linked_to_category( $category, $current_page_slug // add link if contetns categorized by this topic exist if ($category_has_contents): - $hyperlink_color = " class='".odm_country_manager()->get_current_country()."-color'"; - echo '

'; - else: - $hyperlink_color = ""; + echo '

'; endif; $in_category = in_category( $category->term_id ); if ($in_category): echo ""; - $hyperlink_color = " class='".odm_country_manager()->get_current_country()."-color'"; - else: - $hyperlink_color = ""; endif; + echo $category->name; - if ($in_category){ - echo ""; - } + if ($in_category): + echo ""; + endif; - if ($category_has_contents) + if ($category_has_contents): echo "

"; + endif; echo ""; From 956df901abbd3eddb596f25187e52bda670e0883 Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 17:37:04 +0200 Subject: [PATCH 11/35] Fixes #998 --- less/_sidebar-widget.less | 1 + less/cambodia.less | 1 + less/laos.less | 3 ++- less/myanmar.less | 1 + less/thailand.less | 3 ++- less/vietnam.less | 1 + 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/less/_sidebar-widget.less b/less/_sidebar-widget.less index dcb4300d..c61ed689 100644 --- a/less/_sidebar-widget.less +++ b/less/_sidebar-widget.less @@ -169,6 +169,7 @@ span.nochildimage-mekong { display: inline-block; padding-left: 20px; + font-size: @font-size-h5; } span.plusimage-mekong { background: url("../../img/expand-mekong.png") no-repeat 0 8px!important; diff --git a/less/cambodia.less b/less/cambodia.less index 3d445448..c9d24392 100644 --- a/less/cambodia.less +++ b/less/cambodia.less @@ -98,6 +98,7 @@ html#map-embed #embed-header { display: inline-block; background: url("../../img/no-child-kh.png") no-repeat 0 8px!important; padding-left: 20px; + font-size: @font-size-h5; } } } diff --git a/less/laos.less b/less/laos.less index 279d838c..5213f766 100644 --- a/less/laos.less +++ b/less/laos.less @@ -8,7 +8,7 @@ @laos-bright: #D61E2A; @laos-bgcolor: #3b2226; @laos-menu-color: #583A43; - + #laos-bgcolor, .laos-bgcolor{ background: @laos-bright !important } @@ -67,6 +67,7 @@ html#map-embed #embed-header { display: inline-block; background: url("../../img/no-child-lo.png") no-repeat 0 8px!important; padding-left: 20px; + font-size: @font-size-h5; } } } diff --git a/less/myanmar.less b/less/myanmar.less index 0d3ddf1f..9d153c0f 100644 --- a/less/myanmar.less +++ b/less/myanmar.less @@ -100,6 +100,7 @@ h1, h2, h3, h4, h5, h6, p, a, li, td, th, div, input { display: inline-block; background: url("../../img/no-child-my.png") no-repeat 0 8px!important; padding-left: 20px; + font-size: @font-size-h5; } } } diff --git a/less/thailand.less b/less/thailand.less index da5861e1..ad7388db 100644 --- a/less/thailand.less +++ b/less/thailand.less @@ -8,7 +8,7 @@ @thailand-bright: #F7904D; @thailand-bgcolor: #64161d; @thailand-menu-color: #772028; - + #thailand-bgcolor, .thailand-bgcolor{ background: @thailand-bright !important } @@ -73,6 +73,7 @@ display: inline-block; background: url("../../img/no-child-th.png") no-repeat 0 8px!important; padding-left: 20px; + font-size: @font-size-h5; } } } diff --git a/less/vietnam.less b/less/vietnam.less index d1475baa..288550fa 100644 --- a/less/vietnam.less +++ b/less/vietnam.less @@ -73,6 +73,7 @@ display: inline-block; background: url("../../img/no-child-vn.png") no-repeat 0 8px!important; padding-left: 20px; + font-size: @font-size-h5; } } } From 29f1d6ba09cf7948500ff41e12249f44a6cfd75b Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 17:38:56 +0200 Subject: [PATCH 12/35] Fixes #998 --- less/cambodia.less | 1 + less/laos.less | 1 + less/myanmar.less | 1 + less/thailand.less | 1 + less/vietnam.less | 1 + 5 files changed, 5 insertions(+) diff --git a/less/cambodia.less b/less/cambodia.less index c9d24392..d57c947c 100644 --- a/less/cambodia.less +++ b/less/cambodia.less @@ -3,6 +3,7 @@ @import url(https://fonts.googleapis.com/css?family=Suwannaphum); @import "_country-mixin.less"; +@import "_variables.less"; @cambodia-text-color: #00A600; @cambodia-bright: #97D320; diff --git a/less/laos.less b/less/laos.less index 5213f766..359c24fe 100644 --- a/less/laos.less +++ b/less/laos.less @@ -2,6 +2,7 @@ // to be converted to dist/css/laos.css @import "_country-mixin.less"; +@import "_variables.less"; /* Color */ @laos-text-color: #D61E2A; diff --git a/less/myanmar.less b/less/myanmar.less index 9d153c0f..1623a6b4 100644 --- a/less/myanmar.less +++ b/less/myanmar.less @@ -2,6 +2,7 @@ // to be converted to dist/css/myanmar.css @import "_country-mixin.less"; +@import "_variables.less"; @import url('https://mmwebfonts.comquas.com/fonts/?font=myanmar3'); diff --git a/less/thailand.less b/less/thailand.less index ad7388db..0f005b3b 100644 --- a/less/thailand.less +++ b/less/thailand.less @@ -2,6 +2,7 @@ // to be converted to dist/css/thailand.css @import "_country-mixin.less"; +@import "_variables.less"; /* Color */ @thailand-text-color: #E25D13; diff --git a/less/vietnam.less b/less/vietnam.less index 288550fa..4a5ae822 100644 --- a/less/vietnam.less +++ b/less/vietnam.less @@ -2,6 +2,7 @@ // to be converted to dist/css/vietnam.css @import "_country-mixin.less"; +@import "_variables.less"; /* Color */ @vietnam-text-color: #A89B04; From 2049f6e3bf222ff9634cdb8f6c5ce74b28ec485f Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 17:40:27 +0200 Subject: [PATCH 13/35] Fixes #998 --- less/cambodia.less | 2 +- less/laos.less | 2 +- less/myanmar.less | 2 +- less/thailand.less | 2 +- less/vietnam.less | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/less/cambodia.less b/less/cambodia.less index d57c947c..c65da0bb 100644 --- a/less/cambodia.less +++ b/less/cambodia.less @@ -99,7 +99,7 @@ html#map-embed #embed-header { display: inline-block; background: url("../../img/no-child-kh.png") no-repeat 0 8px!important; padding-left: 20px; - font-size: @font-size-h5; + font-size: @font-size-h6; } } } diff --git a/less/laos.less b/less/laos.less index 359c24fe..e2f40951 100644 --- a/less/laos.less +++ b/less/laos.less @@ -68,7 +68,7 @@ html#map-embed #embed-header { display: inline-block; background: url("../../img/no-child-lo.png") no-repeat 0 8px!important; padding-left: 20px; - font-size: @font-size-h5; + font-size: @font-size-h6; } } } diff --git a/less/myanmar.less b/less/myanmar.less index 1623a6b4..0260f5a3 100644 --- a/less/myanmar.less +++ b/less/myanmar.less @@ -101,7 +101,7 @@ h1, h2, h3, h4, h5, h6, p, a, li, td, th, div, input { display: inline-block; background: url("../../img/no-child-my.png") no-repeat 0 8px!important; padding-left: 20px; - font-size: @font-size-h5; + font-size: @font-size-h6; } } } diff --git a/less/thailand.less b/less/thailand.less index 0f005b3b..ce96f09a 100644 --- a/less/thailand.less +++ b/less/thailand.less @@ -74,7 +74,7 @@ display: inline-block; background: url("../../img/no-child-th.png") no-repeat 0 8px!important; padding-left: 20px; - font-size: @font-size-h5; + font-size: @font-size-h6; } } } diff --git a/less/vietnam.less b/less/vietnam.less index 4a5ae822..0893c8d4 100644 --- a/less/vietnam.less +++ b/less/vietnam.less @@ -74,7 +74,7 @@ display: inline-block; background: url("../../img/no-child-vn.png") no-repeat 0 8px!important; padding-left: 20px; - font-size: @font-size-h5; + font-size: @font-size-h6; } } } From c939f363c17de7c3bea4dfb9ad7f9ccefeb9eabc Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 17:43:56 +0200 Subject: [PATCH 14/35] Fixes #998 --- less/cambodia.less | 1 - less/laos.less | 1 - less/myanmar.less | 1 - less/thailand.less | 1 - less/vietnam.less | 1 - 5 files changed, 5 deletions(-) diff --git a/less/cambodia.less b/less/cambodia.less index c65da0bb..ed886fb1 100644 --- a/less/cambodia.less +++ b/less/cambodia.less @@ -99,7 +99,6 @@ html#map-embed #embed-header { display: inline-block; background: url("../../img/no-child-kh.png") no-repeat 0 8px!important; padding-left: 20px; - font-size: @font-size-h6; } } } diff --git a/less/laos.less b/less/laos.less index e2f40951..efe1ea65 100644 --- a/less/laos.less +++ b/less/laos.less @@ -68,7 +68,6 @@ html#map-embed #embed-header { display: inline-block; background: url("../../img/no-child-lo.png") no-repeat 0 8px!important; padding-left: 20px; - font-size: @font-size-h6; } } } diff --git a/less/myanmar.less b/less/myanmar.less index 0260f5a3..fbc91921 100644 --- a/less/myanmar.less +++ b/less/myanmar.less @@ -101,7 +101,6 @@ h1, h2, h3, h4, h5, h6, p, a, li, td, th, div, input { display: inline-block; background: url("../../img/no-child-my.png") no-repeat 0 8px!important; padding-left: 20px; - font-size: @font-size-h6; } } } diff --git a/less/thailand.less b/less/thailand.less index ce96f09a..f49c9b7f 100644 --- a/less/thailand.less +++ b/less/thailand.less @@ -74,7 +74,6 @@ display: inline-block; background: url("../../img/no-child-th.png") no-repeat 0 8px!important; padding-left: 20px; - font-size: @font-size-h6; } } } diff --git a/less/vietnam.less b/less/vietnam.less index 0893c8d4..fb6907d3 100644 --- a/less/vietnam.less +++ b/less/vietnam.less @@ -74,7 +74,6 @@ display: inline-block; background: url("../../img/no-child-vn.png") no-repeat 0 8px!important; padding-left: 20px; - font-size: @font-size-h6; } } } From 341302d6ab7f0df6b99e1db3637643fd3a6a05c3 Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 17:45:54 +0200 Subject: [PATCH 15/35] Fixes #998 --- less/_sidebar-widget.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/less/_sidebar-widget.less b/less/_sidebar-widget.less index c61ed689..bd8349a0 100644 --- a/less/_sidebar-widget.less +++ b/less/_sidebar-widget.less @@ -169,7 +169,7 @@ span.nochildimage-mekong { display: inline-block; padding-left: 20px; - font-size: @font-size-h5; + font-size: @font-size-h6; } span.plusimage-mekong { background: url("../../img/expand-mekong.png") no-repeat 0 8px!important; From e22a14277047ebf02348eaeca957563d4b64a63b Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 17:49:26 +0200 Subject: [PATCH 16/35] Fixes #998 --- less/laos.less | 15 +++++++++------ less/myanmar.less | 15 +++++++++------ less/thailand.less | 15 +++++++++------ less/vietnam.less | 15 +++++++++------ 4 files changed, 36 insertions(+), 24 deletions(-) diff --git a/less/laos.less b/less/laos.less index efe1ea65..8449bb11 100644 --- a/less/laos.less +++ b/less/laos.less @@ -54,20 +54,23 @@ html#map-embed #embed-header { } ul li { + + span.plusimage-laos, + span.minusimage-laos, + span.nochildimage-laos { + display: inline-block; + padding-left: 20px; + font-size: @font-size-h6; + } + span.plusimage-laos { - display: inline-block; background: url("../../img/expand-lo.png") no-repeat 0 8px!important; - padding-left: 20px; } span.minusimage-laos { - display: inline-block; background: url("../../img/collapse-lo.png") no-repeat 0 8px!important; - padding-left: 20px; } span.nochildimage-laos { - display: inline-block; background: url("../../img/no-child-lo.png") no-repeat 0 8px!important; - padding-left: 20px; } } } diff --git a/less/myanmar.less b/less/myanmar.less index fbc91921..3b47576d 100644 --- a/less/myanmar.less +++ b/less/myanmar.less @@ -87,20 +87,23 @@ h1, h2, h3, h4, h5, h6, p, a, li, td, th, div, input { } ul li { + + span.plusimage-myanmar, + span.minusimage-myanmar, + span.nochildimage-myanmar { + display: inline-block; + padding-left: 20px; + font-size: @font-size-h6; + } + span.plusimage-myanmar { - display: inline-block; background: url("../../img/expand-my.png") no-repeat 0 8px!important; - padding-left: 20px; } span.minusimage-myanmar { - display: inline-block; background: url("../../img/collapse-my.png") no-repeat 0 8px!important; - padding-left: 20px; } span.nochildimage-myanmar { - display: inline-block; background: url("../../img/no-child-my.png") no-repeat 0 8px!important; - padding-left: 20px; } } } diff --git a/less/thailand.less b/less/thailand.less index f49c9b7f..124732d2 100644 --- a/less/thailand.less +++ b/less/thailand.less @@ -60,20 +60,23 @@ } ul li { + + span.plusimage-thailand, + span.minusimage-thailand, + span.nochildimage-thailand { + display: inline-block; + padding-left: 20px; + font-size: @font-size-h6; + } + span.plusimage-thailand { - display: inline-block; background: url("../../img/expand-th.png") no-repeat 0 8px!important; - padding-left: 20px; } span.minusimage-thailand { - display: inline-block; background: url("../../img/collapse-th.png") no-repeat 0 8px!important; - padding-left: 20px; } span.nochildimage-thailand { - display: inline-block; background: url("../../img/no-child-th.png") no-repeat 0 8px!important; - padding-left: 20px; } } } diff --git a/less/vietnam.less b/less/vietnam.less index fb6907d3..0f58053d 100644 --- a/less/vietnam.less +++ b/less/vietnam.less @@ -60,20 +60,23 @@ } ul li { + + span.plusimage-vietnam, + span.minusimage-vietnam, + span.nochildimage-vietnam { + display: inline-block; + padding-left: 20px; + font-size: @font-size-h6; + } + span.plusimage-vietnam { - display: inline-block; background: url("../../img/expand-vn.png") no-repeat 0 8px!important; - padding-left: 20px; } span.minusimage-vietnam { - display: inline-block; background: url("../../img/collapse-vn.png") no-repeat 0 8px!important; - padding-left: 20px; } span.nochildimage-vietnam { - display: inline-block; background: url("../../img/no-child-vn.png") no-repeat 0 8px!important; - padding-left: 20px; } } } From 24d258e2c2e193dafc33adfd70553c9f0b9068a1 Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 17:50:45 +0200 Subject: [PATCH 17/35] Fixes #998 --- less/cambodia.less | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/less/cambodia.less b/less/cambodia.less index ed886fb1..8788e0d3 100644 --- a/less/cambodia.less +++ b/less/cambodia.less @@ -85,20 +85,23 @@ html#map-embed #embed-header { } ul li { + + span.plusimage-cambodia, + span.minusimage-cambodia, + span.nochildimage-cambodia { + display: inline-block; + padding-left: 20px; + font-size: @font-size-h6; + } + span.plusimage-cambodia { - display: inline-block; background: url("../../img/expand-kh.png") no-repeat 0 8px!important; - padding-left: 20px; } span.minusimage-cambodia { - display: inline-block; background: url("../../img/collapse-kh.png") no-repeat 0 8px!important; - padding-left: 20px; } span.nochildimage-cambodia { - display: inline-block; background: url("../../img/no-child-kh.png") no-repeat 0 8px!important; - padding-left: 20px; } } } From f33f8a8c176b4d640ab49ea911b23f5f09560e4a Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 17:55:28 +0200 Subject: [PATCH 18/35] Fixes #998 --- less/_sidebar-widget.less | 5 +++++ lib/js/summary.js | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/less/_sidebar-widget.less b/less/_sidebar-widget.less index bd8349a0..58731538 100644 --- a/less/_sidebar-widget.less +++ b/less/_sidebar-widget.less @@ -343,3 +343,8 @@ ul.odm_taxonomy_widget_ul span:hover{ } } } + +.summary-item{ + font-weight: bolder; + font-size: @font-size-h4; +} diff --git a/lib/js/summary.js b/lib/js/summary.js index 5de8b5fb..ff03bf9a 100644 --- a/lib/js/summary.js +++ b/lib/js/summary.js @@ -23,15 +23,15 @@ hItems.each(function() { if($(this).is('.summary-item')) { var item = $('
  • ').addClass($(this).attr('id') + ' ' + $(this).attr('class')); - var clone = $(this).find('a').clone(); - clone.text($(this).find('a').attr('title')); + var clone = $(this).find('a').clone(); + clone.text($(this).find('a').attr('title')); item.append(clone); container.find('ol').append(item); } }); }else{ // odm $('#content .odm-summary').parent('li').hide(); - } + } } -})(jQuery); \ No newline at end of file +})(jQuery); From 340cb21aa68ba2766e4943a3543224dc46749f28 Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 17:56:34 +0200 Subject: [PATCH 19/35] Fixes #998 --- less/_sidebar-widget.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/less/_sidebar-widget.less b/less/_sidebar-widget.less index 58731538..c790cd61 100644 --- a/less/_sidebar-widget.less +++ b/less/_sidebar-widget.less @@ -344,7 +344,7 @@ ul.odm_taxonomy_widget_ul span:hover{ } } -.summary-item{ +.summary-item a{ font-weight: bolder; font-size: @font-size-h4; } From d595b6713fbcf1bbeed81fee052f3c8bc6cec992 Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 17:57:34 +0200 Subject: [PATCH 20/35] Fixes #998 --- less/_sidebar-widget.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/less/_sidebar-widget.less b/less/_sidebar-widget.less index c790cd61..bee8896c 100644 --- a/less/_sidebar-widget.less +++ b/less/_sidebar-widget.less @@ -346,5 +346,5 @@ ul.odm_taxonomy_widget_ul span:hover{ .summary-item a{ font-weight: bolder; - font-size: @font-size-h4; + font-size: @font-size-h5; } From 927c706535df5d37b9635b9bf28fde5033ec581b Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 18:13:08 +0200 Subject: [PATCH 21/35] Fixes #998 --- less/_sidebar-widget.less | 2 +- less/_typography.less | 31 +++++++++++++++++++++++++++---- less/cambodia.less | 6 +----- less/laos.less | 2 +- less/myanmar.less | 2 +- less/thailand.less | 2 +- less/vietnam.less | 2 +- 7 files changed, 33 insertions(+), 14 deletions(-) diff --git a/less/_sidebar-widget.less b/less/_sidebar-widget.less index bee8896c..c790cd61 100644 --- a/less/_sidebar-widget.less +++ b/less/_sidebar-widget.less @@ -346,5 +346,5 @@ ul.odm_taxonomy_widget_ul span:hover{ .summary-item a{ font-weight: bolder; - font-size: @font-size-h5; + font-size: @font-size-h4; } diff --git a/less/_typography.less b/less/_typography.less index 982b51d5..a8a14452 100644 --- a/less/_typography.less +++ b/less/_typography.less @@ -17,22 +17,47 @@ h1, h2, h3, h4, h5, h6 { h1 { font-size: @font-size-h1; line-height: @title-line-height; + + a{ + font-size: @font-size-h1; + text-decoration: none; + } } h2 { font-size: @font-size-h2; line-height: @title-line-height; + + a{ + font-size: @font-size-h2; + text-decoration: none; + } } h3 { font-size: @font-size-h3; line-height: @subtitle-line-height; + + a{ + font-size: @font-size-h3; + text-decoration: none; + } } h4 { font-size: @font-size-h4; line-height: @subtitle-line-height; + + a{ + font-size: @font-size-h4; + text-decoration: none; + } } h5 { font-size: @font-size-h5; line-height: @subtitle-line-height; + + a{ + font-size: @font-size-h5; + text-decoration: none; + } } p { @@ -73,11 +98,9 @@ td, li { .excerpt { font-weight: light; } -h5 a { - text-decoration: none; -} + h2 em { - font-weight: normal; + font-weight: normal; } sup{ diff --git a/less/cambodia.less b/less/cambodia.less index 8788e0d3..994f447a 100644 --- a/less/cambodia.less +++ b/less/cambodia.less @@ -10,10 +10,6 @@ @cambodia-bgcolor: #06323D; @cambodia-menu-color: #12414e; -body{ - font: 14px/24px "Open Sans","Helvetica","Arial",sans-serif; -} - .km{ font-family: 'Suwannaphum', "Open Sans","Helvetica","Arial",sans-serif; } @@ -91,7 +87,7 @@ html#map-embed #embed-header { span.nochildimage-cambodia { display: inline-block; padding-left: 20px; - font-size: @font-size-h6; + font-size: @font-size-h4; } span.plusimage-cambodia { diff --git a/less/laos.less b/less/laos.less index 8449bb11..c3a74ecd 100644 --- a/less/laos.less +++ b/less/laos.less @@ -60,7 +60,7 @@ html#map-embed #embed-header { span.nochildimage-laos { display: inline-block; padding-left: 20px; - font-size: @font-size-h6; + font-size: @font-size-h4; } span.plusimage-laos { diff --git a/less/myanmar.less b/less/myanmar.less index 3b47576d..d8955c28 100644 --- a/less/myanmar.less +++ b/less/myanmar.less @@ -93,7 +93,7 @@ h1, h2, h3, h4, h5, h6, p, a, li, td, th, div, input { span.nochildimage-myanmar { display: inline-block; padding-left: 20px; - font-size: @font-size-h6; + font-size: @font-size-h4; } span.plusimage-myanmar { diff --git a/less/thailand.less b/less/thailand.less index 124732d2..6c244771 100644 --- a/less/thailand.less +++ b/less/thailand.less @@ -66,7 +66,7 @@ span.nochildimage-thailand { display: inline-block; padding-left: 20px; - font-size: @font-size-h6; + font-size: @font-size-h4; } span.plusimage-thailand { diff --git a/less/vietnam.less b/less/vietnam.less index 0f58053d..80d02800 100644 --- a/less/vietnam.less +++ b/less/vietnam.less @@ -66,7 +66,7 @@ span.nochildimage-vietnam { display: inline-block; padding-left: 20px; - font-size: @font-size-h6; + font-size: @font-size-h4; } span.plusimage-vietnam { From ad263a75b2b877361a2cc3ae838c6dad75477807 Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 18:21:31 +0200 Subject: [PATCH 22/35] Fixes #998 --- less/_wpckan.less | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/less/_wpckan.less b/less/_wpckan.less index 4161021b..37882c88 100644 --- a/less/_wpckan.less +++ b/less/_wpckan.less @@ -10,12 +10,6 @@ margin-bottom: @small-padd; } - .wpckan_dataset_title a, .wpckan_dataset_title_translated a{ - font-family: @title-font; - font-size: @font-size-h5; - text-decoration: none; - } - ul { margin-left: 0px !important; @@ -29,6 +23,7 @@ } .wpckan_dataset_detail{ + h1, .wpckan_dataset_title{ margin-bottom: 0; } From 6c51ba9526e9a67286b1d2e41092b1603b57667b Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 18:27:33 +0200 Subject: [PATCH 23/35] Fixes #998 --- .../post-grid-single-4-cols-caption-below.php | 2 +- less/_layout.less | 18 ++---------------- less/_sidebar-widget.less | 7 ------- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/inc/templates/post-grid-single-4-cols-caption-below.php b/inc/templates/post-grid-single-4-cols-caption-below.php index 4522570d..8c092170 100644 --- a/inc/templates/post-grid-single-4-cols-caption-below.php +++ b/inc/templates/post-grid-single-4-cols-caption-below.php @@ -9,7 +9,7 @@ $extra_classes = isset($params["extra_classes"]) ? $params["extra_classes"] : null; ?> -
    "> +
    ">
    diff --git a/less/_layout.less b/less/_layout.less index 213adbc5..800c5825 100644 --- a/less/_layout.less +++ b/less/_layout.less @@ -66,7 +66,6 @@ body{ .item-title { font-family: @title-font !important; - font-size: @font-size-h3; display: inline-block; color: @white !important; position: relative; @@ -210,23 +209,18 @@ body{ display: flex; clear: both; - .post-grid-item-caption-bolow { + .post-grid-item-caption-below { min-height: 200px; max-width: 20%; height: auto; flex:1; background: @mekong-dark; - /* &:nth-child(4n+1) { - clear: left; - }*/ - .grid-content-wrapper { padding: 1px 1px 10px 1px; .item-title { font-family: @title-font !important; - font-size: @font-size-h3; display: inline-block; color: @white !important; padding: @xsmall-padd @small-padd; @@ -235,10 +229,6 @@ body{ .post-grid-item-list { padding: 0; - .item-title { - font-size: @font-size-h4 !important; - } - li { margin-bottom: 6px; } @@ -299,7 +289,7 @@ body{ display: table-cell; vertical-align: top; float: left; - + img{ max-width: 80px; max-height: 80px; @@ -335,10 +325,6 @@ body{ .highlighted{ - .item-title { - font-size: @font-size-h2 !important; - } - .post-excerpt { font-size: @font-size-h3 !important; //.text-ellipsis(6, @font-size-h5); diff --git a/less/_sidebar-widget.less b/less/_sidebar-widget.less index c790cd61..37a26108 100644 --- a/less/_sidebar-widget.less +++ b/less/_sidebar-widget.less @@ -124,16 +124,9 @@ color: @mekong-dark; } - .item-title { - font-size: @base-font-size !important; - } li a { - font-family: @title-font; - text-decoration: none; - color: @mekong-text-color; &:hover { - text-decoration:none; color: @mekong-dark; } From 3eef87f0659d2fc4134095a4deb8a31c98ff4ea8 Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 18:27:50 +0200 Subject: [PATCH 24/35] Fixes #998 --- less/_typography.less | 4 ---- 1 file changed, 4 deletions(-) diff --git a/less/_typography.less b/less/_typography.less index a8a14452..8b453641 100644 --- a/less/_typography.less +++ b/less/_typography.less @@ -1,7 +1,6 @@ @import url(_open_sans.less); @import url(_droid_sans.less); - body { font-family: @primary-font; color: @primary-color; @@ -88,8 +87,6 @@ a strong:hover{ color: @mekong-dark; } - - td, li { font-family: @primary-font; font-size: @base-font-size; @@ -98,7 +95,6 @@ td, li { .excerpt { font-weight: light; } - h2 em { font-weight: normal; } From 9d2adaec92359b26453da69759a4cc326ed16bff Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 18:33:57 +0200 Subject: [PATCH 25/35] Fixes #998 --- inc/widgets/odm-taxonomy-widget.php | 22 ++-------------------- less/_sidebar-widget.less | 19 +++++-------------- 2 files changed, 7 insertions(+), 34 deletions(-) diff --git a/inc/widgets/odm-taxonomy-widget.php b/inc/widgets/odm-taxonomy-widget.php index 77a6a4c7..a32a3a85 100644 --- a/inc/widgets/odm-taxonomy-widget.php +++ b/inc/widgets/odm-taxonomy-widget.php @@ -48,20 +48,11 @@ public function print_category_linked_to_topic($category, $current_page_slug ="" } echo ""; if ($get_post_id): // if page of the topic exists - echo '

    '; - endif; - - $in_category = in_category( $category->term_id ); - if ($in_category): - echo ""; + echo '

    '; endif; echo $category->name; - if ($in_category): - echo ""; - endif; - if ($get_post_id): echo "

    "; endif; @@ -82,20 +73,11 @@ public function print_category_linked_to_category( $category, $current_page_slug // add link if contetns categorized by this topic exist if ($category_has_contents): - echo '

    '; + echo '

    '; endif; - $in_category = in_category( $category->term_id ); - if ($in_category): - echo ""; - endif; - echo $category->name; - if ($in_category): - echo ""; - endif; - if ($category_has_contents): echo "

    "; endif; diff --git a/less/_sidebar-widget.less b/less/_sidebar-widget.less index 37a26108..caf37e95 100644 --- a/less/_sidebar-widget.less +++ b/less/_sidebar-widget.less @@ -39,15 +39,6 @@ } } - .odm-summary ol li a { - text-decoration: none; - color: #333; - &:hover { - color: #4683d2; /*6393D2, 2774da;*/ - text-decoration: underline; - } - } - .wpckan_dataset_list > ul > li { margin: 0 0 10px !important; padding: 0 !important; @@ -193,6 +184,11 @@ list-style-position: inside; } + .summary-item a{ + font-weight: bolder; + font-size: @font-size-h4; + } + li { list-style: none !important; list-style-type: none !important; @@ -336,8 +332,3 @@ ul.odm_taxonomy_widget_ul span:hover{ } } } - -.summary-item a{ - font-weight: bolder; - font-size: @font-size-h4; -} From fdf6c97d922fba9fea65db50530574b248958147 Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 18:36:53 +0200 Subject: [PATCH 26/35] Fixes #998 --- inc/templates/post-grid-single-1-cols.php | 10 ++++---- inc/templates/post-grid-single-2-cols.php | 24 ++++++++++--------- .../post-grid-single-4-cols-caption-below.php | 22 +++++++++-------- inc/templates/post-grid-single-4-cols.php | 24 ++++++++++--------- inc/templates/post-link-single-1-cols.php | 4 ++-- inc/templates/post-list-single-1-cols.php | 18 +++++++------- inc/templates/post-list-single-2-cols.php | 17 +++++++------ inc/templates/post-list-single-4-cols.php | 16 ++++++------- 8 files changed, 71 insertions(+), 64 deletions(-) diff --git a/inc/templates/post-grid-single-1-cols.php b/inc/templates/post-grid-single-1-cols.php index d0e747d6..6203a9da 100644 --- a/inc/templates/post-grid-single-1-cols.php +++ b/inc/templates/post-grid-single-1-cols.php @@ -11,13 +11,14 @@ ?>
    "> -
    +
    - + dataset_link) ? $post->dataset_link : get_permalink($post->ID); $title = apply_filters('translate_text', $post->post_title, odm_language_manager()->get_current_language()); ?> - +
    + ID); ?> @@ -25,7 +26,8 @@ - + +
    "> -
    +
    - + dataset_link) ? $post->dataset_link : get_permalink($post->ID); $title = apply_filters('translate_text', $post->post_title, odm_language_manager()->get_current_language()); ?> - - ID); ?> - - - - +
    + + ID); ?> + + + + +
    get_current_country(); ?>-bgdarkcolor">
    -
    +
    dataset_link) ? $post->dataset_link : get_permalink($post->ID); $title = apply_filters('translate_text', $post->post_title, odm_language_manager()->get_current_language()); ?> - - ID); ?> - - - - +
    + + ID); ?> + + + + +
    description) && $post->description != "") :?>
    diff --git a/inc/templates/post-grid-single-4-cols.php b/inc/templates/post-grid-single-4-cols.php index 2850d2a2..60f82953 100644 --- a/inc/templates/post-grid-single-4-cols.php +++ b/inc/templates/post-grid-single-4-cols.php @@ -11,20 +11,22 @@ ?>
    "> -
    -
    +
    +
    dataset_link) ? $post->dataset_link : get_permalink($post->ID); $title = apply_filters('translate_text', $post->post_title, odm_language_manager()->get_current_language()); ?> - - ID); ?> - - - - +
    + + ID); ?> + + + + +

    -

    +

    post_title, odm_language_manager()->get_current_language()); ?> @@ -19,7 +19,7 @@ endif; ?> -
    +

    diff --git a/inc/templates/post-list-single-1-cols.php b/inc/templates/post-list-single-1-cols.php index a8b5df60..2e27c58f 100644 --- a/inc/templates/post-list-single-1-cols.php +++ b/inc/templates/post-list-single-1-cols.php @@ -15,7 +15,7 @@ $header_tag = isset($params["header_tag"]) ? $params["header_tag"] : false; $order = isset($params["order"]) ? $params["order"] : "metadata_created"; $extra_classes = isset($params["extra_classes"]) ? $params["extra_classes"] : null; - + ?>
    "> @@ -24,7 +24,7 @@ dataset_link) ? $post->dataset_link : get_permalink($post->ID); $localized_title = apply_filters('translate_text', $post->post_title, odm_language_manager()->get_current_language());?> -

    +

    -
    +

    • -

    +

    post_title, odm_language_manager()->get_current_language()); ?> @@ -52,7 +52,7 @@ -
    +

    @@ -72,13 +72,13 @@ endif; endif; ?> - +
    -
    diff --git a/inc/templates/post-list-single-2-cols.php b/inc/templates/post-list-single-2-cols.php index 18bf55eb..645580bc 100644 --- a/inc/templates/post-list-single-2-cols.php +++ b/inc/templates/post-list-single-2-cols.php @@ -23,7 +23,7 @@ dataset_link) ? $post->dataset_link : get_permalink($post->ID); $localized_title = apply_filters('translate_text', $post->post_title, odm_language_manager()->get_current_language());?> -

    +

    -
    +

    -

    - +

    post_title, odm_language_manager()->get_current_language()); ?> @@ -52,7 +51,7 @@ -
    +

    @@ -78,11 +77,11 @@ endif; ?>
    -
    diff --git a/inc/templates/post-list-single-4-cols.php b/inc/templates/post-list-single-4-cols.php index ecef196b..42046a87 100644 --- a/inc/templates/post-list-single-4-cols.php +++ b/inc/templates/post-list-single-4-cols.php @@ -23,7 +23,7 @@ dataset_link) ? $post->dataset_link : get_permalink($post->ID); $localized_title = apply_filters('translate_text', $post->post_title, odm_language_manager()->get_current_language());?> -

    +

    post_title, odm_language_manager()->get_current_language()); ?> @@ -36,10 +36,10 @@ endif; ?> -
    +

    -

    +

    post_title, odm_language_manager()->get_current_language()); ?> @@ -54,7 +54,7 @@ -
    +

    @@ -77,11 +77,11 @@
    -
    Date: Mon, 12 Jun 2017 18:41:22 +0200 Subject: [PATCH 27/35] Fixes #998 --- inc/widgets/odm-taxonomy-widget.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/widgets/odm-taxonomy-widget.php b/inc/widgets/odm-taxonomy-widget.php index a32a3a85..0563f326 100644 --- a/inc/widgets/odm-taxonomy-widget.php +++ b/inc/widgets/odm-taxonomy-widget.php @@ -48,13 +48,13 @@ public function print_category_linked_to_topic($category, $current_page_slug ="" } echo ""; if ($get_post_id): // if page of the topic exists - echo '

    '; + echo '
    '; endif; echo $category->name; if ($get_post_id): - echo "
    "; + echo "

    "; endif; echo "    "; @@ -73,13 +73,13 @@ public function print_category_linked_to_category( $category, $current_page_slug // add link if contetns categorized by this topic exist if ($category_has_contents): - echo '

    '; + echo '
    '; endif; echo $category->name; if ($category_has_contents): - echo "
    "; + echo "

    "; endif; echo ""; From 47d074db31288c8c65873af786558066442db43f Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 18:41:57 +0200 Subject: [PATCH 28/35] FIxes #998 --- less/_sidebar-widget.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/less/_sidebar-widget.less b/less/_sidebar-widget.less index caf37e95..372bb91a 100644 --- a/less/_sidebar-widget.less +++ b/less/_sidebar-widget.less @@ -186,7 +186,7 @@ .summary-item a{ font-weight: bolder; - font-size: @font-size-h4; + font-size: @font-size-h5; } li { From 40777d43de46ca900cdf44539f62dd227b60cdf5 Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Mon, 12 Jun 2017 18:44:15 +0200 Subject: [PATCH 29/35] Fixes #998 --- less/_sidebar-widget.less | 2 +- less/cambodia.less | 2 +- less/laos.less | 2 +- less/myanmar.less | 2 +- less/thailand.less | 2 +- less/vietnam.less | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/less/_sidebar-widget.less b/less/_sidebar-widget.less index 372bb91a..e5b019bc 100644 --- a/less/_sidebar-widget.less +++ b/less/_sidebar-widget.less @@ -153,7 +153,7 @@ span.nochildimage-mekong { display: inline-block; padding-left: 20px; - font-size: @font-size-h6; + font-size: @font-size-h5; } span.plusimage-mekong { background: url("../../img/expand-mekong.png") no-repeat 0 8px!important; diff --git a/less/cambodia.less b/less/cambodia.less index 994f447a..63106a56 100644 --- a/less/cambodia.less +++ b/less/cambodia.less @@ -87,7 +87,7 @@ html#map-embed #embed-header { span.nochildimage-cambodia { display: inline-block; padding-left: 20px; - font-size: @font-size-h4; + font-size: @font-size-h5; } span.plusimage-cambodia { diff --git a/less/laos.less b/less/laos.less index c3a74ecd..55e6d327 100644 --- a/less/laos.less +++ b/less/laos.less @@ -60,7 +60,7 @@ html#map-embed #embed-header { span.nochildimage-laos { display: inline-block; padding-left: 20px; - font-size: @font-size-h4; + font-size: @font-size-h5; } span.plusimage-laos { diff --git a/less/myanmar.less b/less/myanmar.less index d8955c28..209d83f8 100644 --- a/less/myanmar.less +++ b/less/myanmar.less @@ -93,7 +93,7 @@ h1, h2, h3, h4, h5, h6, p, a, li, td, th, div, input { span.nochildimage-myanmar { display: inline-block; padding-left: 20px; - font-size: @font-size-h4; + font-size: @font-size-h5; } span.plusimage-myanmar { diff --git a/less/thailand.less b/less/thailand.less index 6c244771..06133b6d 100644 --- a/less/thailand.less +++ b/less/thailand.less @@ -66,7 +66,7 @@ span.nochildimage-thailand { display: inline-block; padding-left: 20px; - font-size: @font-size-h4; + font-size: @font-size-h5; } span.plusimage-thailand { diff --git a/less/vietnam.less b/less/vietnam.less index 80d02800..a91a09ba 100644 --- a/less/vietnam.less +++ b/less/vietnam.less @@ -66,7 +66,7 @@ span.nochildimage-vietnam { display: inline-block; padding-left: 20px; - font-size: @font-size-h4; + font-size: @font-size-h5; } span.plusimage-vietnam { From 7a9803c14d233d6e72313384cdf993f7a9a50d55 Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Tue, 13 Jun 2017 10:28:33 +0200 Subject: [PATCH 30/35] Fixes #998 --- less/_typography.less | 1 + less/_variables.less | 1 + 2 files changed, 2 insertions(+) diff --git a/less/_typography.less b/less/_typography.less index 8b453641..5b22d24a 100644 --- a/less/_typography.less +++ b/less/_typography.less @@ -64,6 +64,7 @@ p { color: @primary-color; font-size: @base-font-size; font-weight: normal; + line-height: @paragraph-line-height; } a, a:visited{ diff --git a/less/_variables.less b/less/_variables.less index 8f288784..2dd665de 100644 --- a/less/_variables.less +++ b/less/_variables.less @@ -17,6 +17,7 @@ @title-line-height: 32px; @subtitle-line-height: 24px; +@paragraph-line-height: 21px; /* ========== Layout ============ */ From c6dad4c2cca4bc405bb406747fe2ac40ddf9b543 Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Tue, 13 Jun 2017 13:32:15 +0200 Subject: [PATCH 31/35] Fixes #1018 --- inc/utils/urls.php | 4 ++-- single.php | 17 +++++++++-------- style.css | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/inc/utils/urls.php b/inc/utils/urls.php index 5fecaf9d..6f4c2ff3 100644 --- a/inc/utils/urls.php +++ b/inc/utils/urls.php @@ -12,13 +12,13 @@ function url_path_exists($path){ $response_code = wp_remote_retrieve_response_message( $response ); return $response_code == 'OK'; } - + function category_name_to_slug($name){ $slug = strtolower($name); $slug = str_replace(" ","-",$slug); return $slug; } - + function generate_link_to_category_from_name($name){ $slug = category_name_to_slug($name); return "/category/" . $slug; diff --git a/single.php b/single.php index dd2f169f..8d21290f 100644 --- a/single.php +++ b/single.php @@ -23,15 +23,16 @@
    - +
    + diff --git a/style.css b/style.css index 073b3363..48bd36cc 100644 --- a/style.css +++ b/style.css @@ -5,7 +5,7 @@ Author: Open Development Mekong Author URI: http://github.com/OpenDevelopmentMekong Description: Open Development Mekong's wordpress theme. Based on JEO child theme Template: jeo -Version: 2.2.55 +Version: 2.2.56 License: GNU General Public License v3 or later License URI: http://www.gnu.org/licenses/gpl-3.0.html */ From a8b88ea5ac6b3b24a8ac33949d46ef7999048967 Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Tue, 13 Jun 2017 23:39:44 +0200 Subject: [PATCH 32/35] Fixes #998 --- less/_typography.less | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/less/_typography.less b/less/_typography.less index 5b22d24a..1c6be58d 100644 --- a/less/_typography.less +++ b/less/_typography.less @@ -55,10 +55,19 @@ h5 { a{ font-size: @font-size-h5; + font-weight: normal; text-decoration: none; } } +#sidebar{ + h5 { + a{ + font-weight: normal; + } + } +} + p { font-family: @primary-font; color: @primary-color; From ef079768a70f08ec72b0f9e6f40fef0944715de1 Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Tue, 13 Jun 2017 23:41:01 +0200 Subject: [PATCH 33/35] Fixes #998 --- less/_sidebar-widget.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/less/_sidebar-widget.less b/less/_sidebar-widget.less index e5b019bc..933191ce 100644 --- a/less/_sidebar-widget.less +++ b/less/_sidebar-widget.less @@ -185,7 +185,7 @@ } .summary-item a{ - font-weight: bolder; + font-weight: normal; font-size: @font-size-h5; } From 67db66443b9491b0a8c754c05306b1d3eb074964 Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Tue, 13 Jun 2017 23:43:50 +0200 Subject: [PATCH 34/35] Fixes #998 --- less/_typography.less | 1 - 1 file changed, 1 deletion(-) diff --git a/less/_typography.less b/less/_typography.less index 1c6be58d..b9c19cf6 100644 --- a/less/_typography.less +++ b/less/_typography.less @@ -55,7 +55,6 @@ h5 { a{ font-size: @font-size-h5; - font-weight: normal; text-decoration: none; } } From 79a9a643cf283ca4524bc15c9fcf27b235d4b7d5 Mon Sep 17 00:00:00 2001 From: Alex Corbi Date: Wed, 14 Jun 2017 09:18:40 +0200 Subject: [PATCH 35/35] Fixes #998 --- inc/templates/post-list-single-1-cols.php | 28 +++++++++++------------ inc/templates/post-list-single-2-cols.php | 28 +++++++++++------------ inc/templates/post-list-single-4-cols.php | 28 +++++++++++------------ 3 files changed, 39 insertions(+), 45 deletions(-) diff --git a/inc/templates/post-list-single-1-cols.php b/inc/templates/post-list-single-1-cols.php index 2e27c58f..8e607d24 100644 --- a/inc/templates/post-list-single-1-cols.php +++ b/inc/templates/post-list-single-1-cols.php @@ -36,24 +36,22 @@ -

    -

    - post_title, odm_language_manager()->get_current_language()); - ?> - +
    + post_title, odm_language_manager()->get_current_language()); + ?> + + ID); ?> + ID); ?> - - + endif; ?> - - -
    -

    + + +
    -

    -

    - post_title, odm_language_manager()->get_current_language()); - ?> - +
    + post_title, odm_language_manager()->get_current_language()); + ?> + + ID); ?> + ID); ?> - - + endif; ?> - - -
    -

    + + +
    -

    -

    - post_title, odm_language_manager()->get_current_language()); - ?> - +
    + post_title, odm_language_manager()->get_current_language()); + ?> + + ID); ?> + ID); ?> - - + endif; ?> - - -
    -

    + + +