Skip to content

Commit

Permalink
6.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
inc2734 committed Jun 26, 2018
1 parent 79ab6db commit 9f93837
Show file tree
Hide file tree
Showing 19 changed files with 413 additions and 94 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"require": {
"php": ">=5.6",
"inc2734/mimizuku-core": ">=2.4.1"
"inc2734/mimizuku-core": ">=2.4.3"
},
"config": {
"process-timeout": 0,
Expand Down
69 changes: 35 additions & 34 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -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();
}
31 changes: 16 additions & 15 deletions resources/src/css/object/component/_wpac/_wpac.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -109,6 +108,7 @@
}

@include _media-min(md) {
max-width: calc(100% - 80px);
@include _balloon-triangle(left, 10px, #fff, 1px, _light($_color-gray));
}
}
Expand Down Expand Up @@ -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);
}
Expand Down
16 changes: 16 additions & 0 deletions resources/src/css/object/project/_comments/_comments.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
}

.comment-form {
@include _content(.5);

.logged-in-as {
display: none;
}
Expand All @@ -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%;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading

0 comments on commit 9f93837

Please sign in to comment.