From 9f938371ce249a45acdd7081da5b4b4415726399 Mon Sep 17 00:00:00 2001 From: Takashi Kitajima Date: Tue, 26 Jun 2018 14:33:10 +0900 Subject: [PATCH] 6.1.0 --- composer.json | 2 +- composer.lock | 69 ++++---- .../component/_woocommerce/_woocommerce.scss | 56 ++++++- .../src/css/object/component/_wpac/_wpac.scss | 31 ++-- .../object/project/_comments/_comments.scss | 16 ++ .../project/_global-nav/_global-nav.scss | 3 +- .../project/_social-nav/_social-nav.scss | 148 ++++++++++++++++++ resources/src/js/_fix-adminbar.js | 10 +- resources/style.css | 2 +- resources/templates/view/404.php | 4 + resources/templates/view/content-full.php | 4 + resources/templates/view/content-page.php | 4 + resources/templates/view/content-post.php | 4 + resources/templates/view/content-product.php | 36 ----- resources/templates/view/content.php | 4 + .../view/woocommerce-archive-product.php | 76 +++++++++ .../view/woocommerce-content-product.php | 14 ++ resources/woocommerce/archive-product.php | 12 ++ resources/woocommerce/single-product.php | 12 ++ 19 files changed, 413 insertions(+), 94 deletions(-) delete mode 100644 resources/templates/view/content-product.php create mode 100644 resources/templates/view/woocommerce-archive-product.php create mode 100644 resources/templates/view/woocommerce-content-product.php create mode 100644 resources/woocommerce/archive-product.php create mode 100644 resources/woocommerce/single-product.php diff --git a/composer.json b/composer.json index c7bc9c2f..74b61b3a 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ }, "require": { "php": ">=5.6", - "inc2734/mimizuku-core": ">=2.4.1" + "inc2734/mimizuku-core": ">=2.4.3" }, "config": { "process-timeout": 0, diff --git a/composer.lock b/composer.lock index 649fecb6..f9d816a7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,27 +4,27 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "638ece5e3df356d652db63f866f2cdf9", - "content-hash": "6aba9ffbfedddecfc893dee52ea7684d", + "hash": "d5dd0f5b1db70ea8285f923f40284963", + "content-hash": "4ea4624ea1bd4367a54e34aecb5dbb45", "packages": [ { "name": "inc2734/mimizuku-core", - "version": "2.4.1", + "version": "2.4.3", "source": { "type": "git", "url": "https://github.com/inc2734/mimizuku-core.git", - "reference": "ca3427b24d4473c7ccb2f7b6c946113ba1ac6921" + "reference": "6efe23199540fbfbeeefcc8d8e96d9126ae60c0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/inc2734/mimizuku-core/zipball/ca3427b24d4473c7ccb2f7b6c946113ba1ac6921", - "reference": "ca3427b24d4473c7ccb2f7b6c946113ba1ac6921", + "url": "https://api.github.com/repos/inc2734/mimizuku-core/zipball/6efe23199540fbfbeeefcc8d8e96d9126ae60c0c", + "reference": "6efe23199540fbfbeeefcc8d8e96d9126ae60c0c", "shasum": "" }, "require": { "inc2734/wp-awesome-components": ">=1.0.3", - "inc2734/wp-awesome-widgets": ">=2.2.2", - "inc2734/wp-basis": ">=1.0.0", + "inc2734/wp-awesome-widgets": ">=2.3.0", + "inc2734/wp-basis": ">=1.0.1", "inc2734/wp-breadcrumbs": ">=1.0.2", "inc2734/wp-contents-outline": ">=1.0.2", "inc2734/wp-customizer-framework": ">=3.1.1", @@ -62,7 +62,7 @@ } ], "description": "This library is core of WordPress theme mimizuku", - "time": "2018-06-14 07:06:36" + "time": "2018-06-26 04:47:42" }, { "name": "inc2734/wp-awesome-components", @@ -108,20 +108,21 @@ }, { "name": "inc2734/wp-awesome-widgets", - "version": "2.2.2", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/inc2734/wp-awesome-widgets.git", - "reference": "09b02b4091fed40171bdc649bb4d1be2a8b476f0" + "reference": "971c0b915eea9bb2e0e0acee1d6227375a0538f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/inc2734/wp-awesome-widgets/zipball/09b02b4091fed40171bdc649bb4d1be2a8b476f0", - "reference": "09b02b4091fed40171bdc649bb4d1be2a8b476f0", + "url": "https://api.github.com/repos/inc2734/wp-awesome-widgets/zipball/971c0b915eea9bb2e0e0acee1d6227375a0538f8", + "reference": "971c0b915eea9bb2e0e0acee1d6227375a0538f8", "shasum": "" }, "require": { "inc2734/wp-contents-outline": ">=1.0.2", + "inc2734/wp-profile-box": ">=1.1.0", "inc2734/wp-view-controller": ">=4.0.5", "php": ">=5.6" }, @@ -148,20 +149,20 @@ } ], "description": "A library to add some awesome widgets for WordPress.", - "time": "2018-06-14 07:04:24" + "time": "2018-06-20 02:02:17" }, { "name": "inc2734/wp-basis", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/inc2734/wp-basis.git", - "reference": "2f2fe1e6778f13cc1a64d04acd93724e66766afc" + "reference": "85d6ec7d7abaa5729667c94d1ecc14203775b333" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/inc2734/wp-basis/zipball/2f2fe1e6778f13cc1a64d04acd93724e66766afc", - "reference": "2f2fe1e6778f13cc1a64d04acd93724e66766afc", + "url": "https://api.github.com/repos/inc2734/wp-basis/zipball/85d6ec7d7abaa5729667c94d1ecc14203775b333", + "reference": "85d6ec7d7abaa5729667c94d1ecc14203775b333", "shasum": "" }, "require": { @@ -190,7 +191,7 @@ } ], "description": "This library customizes HTML to use sass-basis in WordPress.", - "time": "2018-06-14 06:02:23" + "time": "2018-06-26 04:42:30" }, { "name": "inc2734/wp-breadcrumbs", @@ -2161,16 +2162,16 @@ }, { "name": "symfony/config", - "version": "v3.4.11", + "version": "v3.4.12", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "73e055cf2e6467715f187724a0347ea32079967c" + "reference": "1fffdeb349ff36a25184e5564c25289b1dbfc402" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/73e055cf2e6467715f187724a0347ea32079967c", - "reference": "73e055cf2e6467715f187724a0347ea32079967c", + "url": "https://api.github.com/repos/symfony/config/zipball/1fffdeb349ff36a25184e5564c25289b1dbfc402", + "reference": "1fffdeb349ff36a25184e5564c25289b1dbfc402", "shasum": "" }, "require": { @@ -2221,20 +2222,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2018-05-14 16:49:53" + "time": "2018-06-19 14:02:58" }, { "name": "symfony/dependency-injection", - "version": "v3.4.11", + "version": "v3.4.12", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "8a4672aca8db6d807905d695799ea7d83c8e5bba" + "reference": "a0be80e3f8c11aca506e250c00bb100c04c35d10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/8a4672aca8db6d807905d695799ea7d83c8e5bba", - "reference": "8a4672aca8db6d807905d695799ea7d83c8e5bba", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/a0be80e3f8c11aca506e250c00bb100c04c35d10", + "reference": "a0be80e3f8c11aca506e250c00bb100c04c35d10", "shasum": "" }, "require": { @@ -2292,20 +2293,20 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2018-05-25 11:57:15" + "time": "2018-06-25 08:36:56" }, { "name": "symfony/filesystem", - "version": "v3.4.11", + "version": "v3.4.12", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "8e03ca3fa52a0f56b87506f38cf7bd3f9442b3a0" + "reference": "8a721a5f2553c6c3482b1c5b22ed60fe94dd63ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/8e03ca3fa52a0f56b87506f38cf7bd3f9442b3a0", - "reference": "8e03ca3fa52a0f56b87506f38cf7bd3f9442b3a0", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/8a721a5f2553c6c3482b1c5b22ed60fe94dd63ed", + "reference": "8a721a5f2553c6c3482b1c5b22ed60fe94dd63ed", "shasum": "" }, "require": { @@ -2342,7 +2343,7 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2018-05-16 08:49:21" + "time": "2018-06-21 11:10:19" }, { "name": "symfony/polyfill-ctype", diff --git a/resources/src/css/object/component/_woocommerce/_woocommerce.scss b/resources/src/css/object/component/_woocommerce/_woocommerce.scss index 78b5d87c..824d1c54 100644 --- a/resources/src/css/object/component/_woocommerce/_woocommerce.scss +++ b/resources/src/css/object/component/_woocommerce/_woocommerce.scss @@ -1,13 +1,67 @@ .woocommerce-input-wrapper, .quantity, -.woocommerce-EditAccountForm { +.woocommerce-EditAccountForm, +.woocommerce-form, +.woocommerce-ResetPassword { .input-text { @include _form-control(); } } .woocommerce-EditAccountForm { + @include _content(); + fieldset { border: none; } } + +.woocommerce-MyAccount-content, +.woocommerce-MyAccount-content > [class^="woocommerce-"], +.woocommerce-MyAccount-content > header, +.woocommerce-checkout { + @include _content(); +} + +.woocommerce-MyAccount-navigation { + @include _margin-bottom(1); + + ul { + @include _list-unstyled(); + border-top: 1px solid _lighter($_color-gray); + } + + li { + border-bottom: 1px solid _lighter($_color-gray); + } + + a { + display: block; + text-decoration: none; + @include _padding(.25, 0); + + @include _hover(lg) { + text-decoration: underline; + } + } +} + +.#{$_prefix}c-entry__content { + .woocommerce .shop_table { + border-collapse: collapse; + + thead { + th { + background-color: _lightest($_color-gray); + } + } + } +} + +.woocommerce .quantity .qty { + max-height: 37px; +} + +.woocommerce-Tabs-panel { + @include entry-content(); +} diff --git a/resources/src/css/object/component/_wpac/_wpac.scss b/resources/src/css/object/component/_wpac/_wpac.scss index c02ab883..e9e35f2b 100644 --- a/resources/src/css/object/component/_wpac/_wpac.scss +++ b/resources/src/css/object/component/_wpac/_wpac.scss @@ -14,30 +14,28 @@ * Alert */ .wpac-alert { - $color: #bdb53c; + $color: #fff9e6; @include _alert(); @include _content(.75); - background-color: _lighter($color); - border: 1px solid $color; + background-color: $color; + border: 1px solid darken(desaturate($color, 10%), 10%); border-radius: $_border-radius; - color: _dark($color); + color: darken(desaturate($color, 60%), 60%); @include _padding(.5); &--warning { - $color: #bd543c; - background-color: _lighter($color); - border-color: $color; - color: _dark($color); + background-color: adjust-hue($color, -30deg); + border-color: adjust-hue(darken(desaturate($color, 10%), 10%), -30deg); + color: adjust-hue(darken(desaturate($color, 60%), 60%), -30deg); } &--success { - $color: #90bd3c; - background-color: _lighter($color); - border-color: $color; - color: _dark($color); + background-color: adjust-hue($color, 40deg); + border-color: adjust-hue(darken(desaturate($color, 15%), 15%), 40deg); + color: adjust-hue(darken(desaturate($color, 70%), 70%), 40deg); } - > .mceEditable, &__body { + > .mceEditable { @include _content(.75); } } @@ -69,8 +67,9 @@ &__figure { position: relative; - flex: none; + flex: 0 0 60px; @include _circle(60px); + max-width: 60px; border: 2px solid _lighter($_color-gray); > img { @@ -109,6 +108,7 @@ } @include _media-min(md) { + max-width: calc(100% - 80px); @include _balloon-triangle(left, 10px, #fff, 1px, _light($_color-gray)); } } @@ -200,7 +200,8 @@ .#{$_prefix}l-body--one-column &, .#{$_prefix}l-body--one-column-fluid &, - .#{$_prefix}l-body--one-column-slim & { + .#{$_prefix}l-body--one-column-slim &, + .#{$_prefix}l-body--one-column-full & { margin-right: calc(50% - 50vw); margin-left: calc(50% - 50vw); } diff --git a/resources/src/css/object/project/_comments/_comments.scss b/resources/src/css/object/project/_comments/_comments.scss index 56d20c2a..3368dcb3 100644 --- a/resources/src/css/object/project/_comments/_comments.scss +++ b/resources/src/css/object/project/_comments/_comments.scss @@ -29,6 +29,8 @@ } .comment-form { + @include _content(.5); + .logged-in-as { display: none; } @@ -40,6 +42,20 @@ } } + .comment-form-cookies-consent { + overflow: hidden; + + [id="wp-comment-cookies-consent"] { + margin: .35em .5em 0 0; + float: left; + } + + [for="wp-comment-cookies-consent"] { + margin-bottom: 0; + overflow: hidden; + } + } + .#{$_prefix}c-form-control { display: block; width: 100%; diff --git a/resources/src/css/object/project/_global-nav/_global-nav.scss b/resources/src/css/object/project/_global-nav/_global-nav.scss index 454d9d9f..ef0b202b 100644 --- a/resources/src/css/object/project/_global-nav/_global-nav.scss +++ b/resources/src/css/object/project/_global-nav/_global-nav.scss @@ -12,7 +12,8 @@ } &__subitem { - @include _font-size-line-height($_base-font-size-px - 2); + @include _font-size($_base-font-size-px - 2); + @include _line-height($_base-font-size-px + 4); @include _hover() { background-color: rgba(#fff, .05); diff --git a/resources/src/css/object/project/_social-nav/_social-nav.scss b/resources/src/css/object/project/_social-nav/_social-nav.scss index c3dba55e..4e24ba41 100644 --- a/resources/src/css/object/project/_social-nav/_social-nav.scss +++ b/resources/src/css/object/project/_social-nav/_social-nav.scss @@ -25,4 +25,152 @@ display: none; } } + + .fa-amazon { + color: #fd9827; + } + + .fa-bitbucket { + color: #23517f; + } + + .fa-paypal { + color: #1172b9; + } + + .fa-stripe { + color: #553ffb; + } + + .fa-codepen { + color: #000; + } + + .fa-digg { + color: #1b1a19; + } + + .fa-dribbble { + color: #e84f89; + } + + .fa-dropbox { + color: #1267fb; + } + + .fa-facebook { + color: #3c5a96; + } + + .fa-flickr { + color: #000; + } + + .fa-get-pocket { + color: #e64555; + } + + .fa-github { + color: #25292e; + } + + .fa-gitlab { + color: #e04432; + } + + .fa-google-plus { + color: #db4a42; + } + + .fa-google { + color: #5592f2; + } + + .fa-instagram { + color: #000; + } + + .fa-linkedin { + color: #1178b3; + } + + .fa-medium { + color: #26b377; + } + + .fa-pinterest { + color: #bb0f23; + } + + .fa-reddit { + color: #e23f19; + } + + .fa-skype { + color: #1cace7; + } + + .fa-slack { + color: #323747; + } + + .fa-slideshare { + color: #1177b2; + } + + .fa-snapchat { + color: #fff937; + } + + .fa-stack-overflow { + color: #f28033; + } + + .fa-tumblr { + color: #324357; + } + + .fa-vimeo { + color: #2ab8e8; + } + + .fa-twitter { + color: #2aa3f0; + } + + .fa-weibo { + color: #d32d31; + } + + .fa-wordpress { + color: #1ca9da; + } + + .fa-youtube { + color: #fb0d1b; + } + + .fa-behance { + color: #115efb; + } + + .fa-500px { + color: #000; + } + + .fa-blogger { + color: #fd8024; + } + + .fa-soundcloud { + color: #fc561f; + } + + .fa-spotify { + color: #2fd566; + } + + .fa-foursquare { + color: #315fe0; + } } diff --git a/resources/src/js/_fix-adminbar.js b/resources/src/js/_fix-adminbar.js index 5b00a62e..938286a0 100644 --- a/resources/src/js/_fix-adminbar.js +++ b/resources/src/js/_fix-adminbar.js @@ -4,12 +4,12 @@ import $ from 'jquery'; export default class FixAdminBar { constructor() { - this.min = 599; - this.container = $('.l-container'); - this.header = $('.l-header'); - this.contents = $('.l-contents'); - $(() => { + this.min = 599; + this.container = $('.l-container'); + this.header = $('.l-header'); + this.contents = $('.l-contents'); + this.adminBar = $('#wpadminbar'); if (this.adminBar.length) { diff --git a/resources/style.css b/resources/style.css index 21ad1c66..b2fe1312 100644 --- a/resources/style.css +++ b/resources/style.css @@ -4,7 +4,7 @@ Theme URI: Author: inc2734 Author URI: https://2inc.org Description: -Version: 6.0.0 +Version: 6.1.0 License: GPLv2 or later License URI: license.txt Tags: editor-style, featured-images diff --git a/resources/templates/view/404.php b/resources/templates/view/404.php index a08526c3..f1381dbb 100644 --- a/resources/templates/view/404.php +++ b/resources/templates/view/404.php @@ -6,6 +6,8 @@ */ ?>
+ +


@@ -15,4 +17,6 @@

+ +
diff --git a/resources/templates/view/content-full.php b/resources/templates/view/content-full.php index 36a81d8e..11d9d165 100644 --- a/resources/templates/view/content-full.php +++ b/resources/templates/view/content-full.php @@ -7,8 +7,12 @@ ?>
> + +
+ +
diff --git a/resources/templates/view/content-page.php b/resources/templates/view/content-page.php index 4250f855..cf401704 100644 --- a/resources/templates/view/content-page.php +++ b/resources/templates/view/content-page.php @@ -10,10 +10,14 @@

+ +
+ + diff --git a/resources/templates/view/content-post.php b/resources/templates/view/content-post.php index af808da8..efbfd283 100644 --- a/resources/templates/view/content-post.php +++ b/resources/templates/view/content-post.php @@ -19,6 +19,8 @@ ] ); ?> + +
@@ -26,6 +28,8 @@
+ +