diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml index cf2b0809a7..fd3ba1bc53 100644 --- a/.github/workflows/test-php.yml +++ b/.github/workflows/test-php.yml @@ -18,7 +18,7 @@ jobs: - name: Setup PHP version uses: shivammathur/setup-php@v2 with: - php-version: '7.1' + php-version: '7.4' extensions: simplexml tools: composer:v2.1 - name: Checkout source code @@ -54,7 +54,7 @@ jobs: - name: Setup PHP version uses: shivammathur/setup-php@v2 with: - php-version: '7.1' + php-version: '7.4' extensions: simplexml, mysql tools: phpunit-polyfills - name: Checkout source code diff --git a/assets/scss/components/compat/woocommerce/_breadcrumbs.scss b/assets/scss/components/compat/woocommerce/_breadcrumbs.scss index a76a804ff2..347c9fc45e 100644 --- a/assets/scss/components/compat/woocommerce/_breadcrumbs.scss +++ b/assets/scss/components/compat/woocommerce/_breadcrumbs.scss @@ -4,6 +4,13 @@ color: var(--nv-text-color); font-size: 14px; white-space: nowrap; + scrollbar-width: none; /* Firefox */ + overflow-x: scroll; + + &::-webkit-scrollbar { + display: none; /* Chrome, Safari, Opera*/ + } + a { color: var(--nv-secondary-accent); diff --git a/assets/scss/components/compat/woocommerce/_checkout.scss b/assets/scss/components/compat/woocommerce/_checkout.scss index f6b6696bf5..af210cff56 100644 --- a/assets/scss/components/compat/woocommerce/_checkout.scss +++ b/assets/scss/components/compat/woocommerce/_checkout.scss @@ -144,7 +144,7 @@ border: 0 !important; } - main button { + main button:not(.wc-block-components-button) { width: 100%; } } diff --git a/composer.lock b/composer.lock index a6fbb2741e..c0aa98ea00 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "codeinwp/themeisle-sdk", - "version": "3.3.9", + "version": "3.3.11", "source": { "type": "git", "url": "https://github.com/Codeinwp/themeisle-sdk.git", - "reference": "d960c559b643f468d16ffc5379e83efdb1526224" + "reference": "583c474d8b5a8d12592f4a78ab8fa335aaf42fc0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeinwp/themeisle-sdk/zipball/d960c559b643f468d16ffc5379e83efdb1526224", - "reference": "d960c559b643f468d16ffc5379e83efdb1526224", + "url": "https://api.github.com/repos/Codeinwp/themeisle-sdk/zipball/583c474d8b5a8d12592f4a78ab8fa335aaf42fc0", + "reference": "583c474d8b5a8d12592f4a78ab8fa335aaf42fc0", "shasum": "" }, "require-dev": { @@ -42,9 +42,9 @@ ], "support": { "issues": "https://github.com/Codeinwp/themeisle-sdk/issues", - "source": "https://github.com/Codeinwp/themeisle-sdk/tree/v3.3.9" + "source": "https://github.com/Codeinwp/themeisle-sdk/tree/v3.3.11" }, - "time": "2023-11-16T15:27:37+00:00" + "time": "2023-12-12T10:06:27+00:00" }, { "name": "wptt/webfont-loader", diff --git a/globals/google-fonts.php b/globals/google-fonts.php index c4b443b2c7..732aed729a 100644 --- a/globals/google-fonts.php +++ b/globals/google-fonts.php @@ -1,6 +1,6 @@ array( '400',), 'Harmattan' => array( '400', '500', '600', '700',), 'Headland One' => array( '400',), + 'Hedvig Letters Sans' => array( '400',), + 'Hedvig Letters Serif' => array( '400',), 'Heebo' => array( '100', '200', '300', '400', '500', '600', '700', '800', '900',), 'Henny Penny' => array( '400',), 'Hepta Slab' => array( '100', '200', '300', '400', '500', '600', '700', '800', '900',), @@ -899,7 +901,7 @@ 'Nanum Gothic Coding' => array( '400', '700',), 'Nanum Myeongjo' => array( '400', '700', '800',), 'Nanum Pen Script' => array( '400',), - 'Narnoor' => array( '400',), + 'Narnoor' => array( '400', '500', '600', '700', '800',), 'Neonderthaw' => array( '400',), 'Nerko One' => array( '400',), 'Neucha' => array( '400',), @@ -1316,13 +1318,18 @@ 'Rubik' => array( '300', '400', '500', '600', '700', '800', '900', '300italic', '400italic', '500italic', '600italic', '700italic', '800italic', '900italic',), 'Rubik 80s Fade' => array( '400',), 'Rubik Beastly' => array( '400',), + 'Rubik Broken Fax' => array( '400',), 'Rubik Bubbles' => array( '400',), 'Rubik Burned' => array( '400',), 'Rubik Dirt' => array( '400',), 'Rubik Distressed' => array( '400',), + 'Rubik Doodle Shadow' => array( '400',), + 'Rubik Doodle Triangles' => array( '400',), 'Rubik Gemstones' => array( '400',), 'Rubik Glitch' => array( '400',), 'Rubik Iso' => array( '400',), + 'Rubik Lines' => array( '400',), + 'Rubik Maps' => array( '400',), 'Rubik Marker Hatch' => array( '400',), 'Rubik Maze' => array( '400',), 'Rubik Microbe' => array( '400',), @@ -1330,6 +1337,7 @@ 'Rubik Moonrocks' => array( '400',), 'Rubik Pixels' => array( '400',), 'Rubik Puddles' => array( '400',), + 'Rubik Scribble' => array( '400',), 'Rubik Spray Paint' => array( '400',), 'Rubik Storm' => array( '400',), 'Rubik Vinyl' => array( '400',), diff --git a/inc/views/nav_walker.php b/inc/views/nav_walker.php index 76aaf5f50f..f108cf7d75 100644 --- a/inc/views/nav_walker.php +++ b/inc/views/nav_walker.php @@ -209,7 +209,7 @@ public function get_mobile_caret_style() { $mobile_button_caret_css .= '.header-menu-sidebar .nav-ul li .wrap a { flex-grow: 1; display: flex; }'; $mobile_button_caret_css .= '.header-menu-sidebar .nav-ul li .wrap a .dd-title { width: var(--wrapdropdownwidth); }'; $mobile_button_caret_css .= '.header-menu-sidebar .nav-ul li .wrap button { border: 0; z-index: 1; background: 0; }'; - $mobile_button_caret_css .= '.header-menu-sidebar .nav-ul li:not([class*=block]):not(.menu-item-has-children) > .wrap > a { padding-right: calc(1em + (18px*2));}'; + $mobile_button_caret_css .= '.header-menu-sidebar .nav-ul li.menu-item-has-children:not([class*=block]) > .wrap > a { margin-right: calc(-1em - (18px*2));}'; return Dynamic_Css::minify_css( $mobile_button_caret_css ); } diff --git a/tests/test-neve-dynamic-selector.php b/tests/test-neve-dynamic-selector.php index eef2ee9b02..82be8fddf7 100644 --- a/tests/test-neve-dynamic-selector.php +++ b/tests/test-neve-dynamic-selector.php @@ -33,7 +33,7 @@ public function test_css_generation_with_color() { $css = ''; $css .= $subscriber; $this->assertNotEmpty( $css ); - $this->assertContains( "#ccc", $css ); + $this->assertStringContainsString( "#ccc", $css ); } public function test_css_generation_with_generic_rule() { @@ -45,7 +45,7 @@ public function test_css_generation_with_generic_rule() { ] ); $css = ''; $css .= $subscriber; - $this->assertContains('--css-var-example', $css); + $this->assertStringContainsString('--css-var-example', $css); $this->assertNotEmpty( $css ); } @@ -64,8 +64,8 @@ public function test_css_generation_with_value_override() { $css .= $subscriber; $this->assertNotEmpty( $css ); - $this->assertNotContains( "#bada55", $css ); - $this->assertContains( "var(--nv-text-color)", $css ); + $this->assertStringNotContainsString( "#bada55", $css ); + $this->assertStringContainsString( "var(--nv-text-color)", $css ); } public function test_css_generation_with_key() { @@ -81,7 +81,7 @@ public function test_css_generation_with_key() { $css .= $subscriber; $this->assertNotEmpty( $css ); - $this->assertContains( "#eee", $css ); + $this->assertStringContainsString( "#eee", $css ); } public function test_css_generation_with_suffix() { @@ -98,7 +98,7 @@ public function test_css_generation_with_suffix() { $css .= $subscriber; $this->assertNotEmpty( $css ); - $this->assertContains( "333em", $css ); + $this->assertStringContainsString( "333em", $css ); } public function test_css_generation_with_default() { @@ -113,7 +113,7 @@ public function test_css_generation_with_default() { $css = ''; $css .= $subscriber; $this->assertNotEmpty( $css ); - $this->assertContains( "929", $css ); + $this->assertStringContainsString( "929", $css ); } public function test_css_generation_with_filter() { @@ -132,7 +132,7 @@ public function test_css_generation_with_filter() { $css = ''; $css .= $subscriber; $this->assertNotEmpty( $css ); - $this->assertContains( "box-shadow: 333px;", $css ); + $this->assertStringContainsString( "box-shadow: 333px;", $css ); } public function test_css_generation_on_breakpoints() { @@ -149,7 +149,7 @@ public function test_css_generation_on_breakpoints() { $tablet_css = '' . $subscriber->for_tablet(); $this->assertNotEmpty( $mobile_css ); - $this->assertContains( "929", $mobile_css ); + $this->assertStringContainsString( "929", $mobile_css ); $this->assertEmpty( $desktop_css ); $this->assertEmpty( $tablet_css ); } @@ -172,9 +172,9 @@ public function test_css_generation_with_responsive() { $mobile_css = '' . $subscriber; $desktop_css = '' . $subscriber->for_desktop(); $tablet_css = '' . $subscriber->for_tablet(); - $this->assertContains( "10px;", $mobile_css ); - $this->assertContains( "50px;", $desktop_css ); - $this->assertContains( "300px;", $tablet_css ); + $this->assertStringContainsString( "10px;", $mobile_css ); + $this->assertStringContainsString( "50px;", $desktop_css ); + $this->assertStringContainsString( "300px;", $tablet_css ); } public function test_css_generation_with_responsiveness_encoded() { @@ -194,9 +194,9 @@ public function test_css_generation_with_responsiveness_encoded() { $mobile_css = '' . $subscriber; $desktop_css = '' . $subscriber->for_desktop(); $tablet_css = '' . $subscriber->for_tablet(); - $this->assertContains( "10px;", $mobile_css ); - $this->assertContains( "50px;", $desktop_css ); - $this->assertContains( "300px;", $tablet_css ); + $this->assertStringContainsString( "10px;", $mobile_css ); + $this->assertStringContainsString( "50px;", $desktop_css ); + $this->assertStringContainsString( "300px;", $tablet_css ); } public function test_css_generation_with_responsiveness_no_devices() { @@ -212,9 +212,9 @@ public function test_css_generation_with_responsiveness_no_devices() { $mobile_css = '' . $subscriber; $desktop_css = '' . $subscriber->for_desktop(); $tablet_css = '' . $subscriber->for_tablet(); - $this->assertContains( "200px;", $mobile_css ); - $this->assertContains( "200px;", $desktop_css ); - $this->assertContains( "200px;", $tablet_css ); + $this->assertStringContainsString( "200px;", $mobile_css ); + $this->assertStringContainsString( "200px;", $desktop_css ); + $this->assertStringContainsString( "200px;", $tablet_css ); } public function test_css_generation_responsiveness_with_subkey() { @@ -236,9 +236,9 @@ public function test_css_generation_responsiveness_with_subkey() { $mobile_css = '' . $subscriber; $desktop_css = '' . $subscriber->for_desktop(); $tablet_css = '' . $subscriber->for_tablet(); - $this->assertContains( "555px;", $mobile_css ); - $this->assertContains( "666px;", $desktop_css ); - $this->assertContains( "777px;", $tablet_css ); + $this->assertStringContainsString( "555px;", $mobile_css ); + $this->assertStringContainsString( "666px;", $desktop_css ); + $this->assertStringContainsString( "777px;", $tablet_css ); } public function test_css_generation_responsiveness_with_subkey_with_suffix() { @@ -265,9 +265,9 @@ public function test_css_generation_responsiveness_with_subkey_with_suffix() { $mobile_css = '' . $subscriber; $desktop_css = '' . $subscriber->for_desktop(); $tablet_css = '' . $subscriber->for_tablet(); - $this->assertContains( "555em;", $mobile_css ); - $this->assertContains( "666%;", $desktop_css ); - $this->assertContains( "777px;", $tablet_css ); + $this->assertStringContainsString( "555em;", $mobile_css ); + $this->assertStringContainsString( "666%;", $desktop_css ); + $this->assertStringContainsString( "777px;", $tablet_css ); } public function test_css_generation_with_extra_selectors() { @@ -285,8 +285,9 @@ public function test_css_generation_with_extra_selectors() { ] ); $css = '' . $subscriber; - $this->assertContains( ",.one-test-selector", $css ); - $this->assertNotContains( \Neve\Core\Settings\Config::CSS_SELECTOR_BTN_PRIMARY_HOVER, $css ); - $this->assertContains( "color: #fff", $css ); + $this->assertStringContainsString( ",.one-test-selector", $css ); + $this->assertStringNotContainsString( \Neve\Core\Settings\Config::CSS_SELECTOR_BTN_PRIMARY_HOVER, $css ); + $this->assertStringContainsString( \Neve\Core\Settings\Config::$css_selectors_map[\Neve\Core\Settings\Config::CSS_SELECTOR_BTN_PRIMARY_HOVER], $css ); + $this->assertStringContainsString( "color: #fff", $css ); } }