Skip to content
This repository has been archived by the owner on Mar 13, 2023. It is now read-only.

Commit

Permalink
Merge in develop
Browse files Browse the repository at this point in the history
  • Loading branch information
frankiejarrett committed Feb 22, 2017
2 parents 8dc162f + 1e847d9 commit 2a3a6eb
Show file tree
Hide file tree
Showing 16 changed files with 1,066 additions and 217 deletions.
10 changes: 5 additions & 5 deletions .dev/sass/common/_customizer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ $heading-font: "Lato";

// Colors
$header-textcolor: #ffffff;
$background-color: #f4f5f9;
$header-background-color: #d24343;
$menu-background-color: #3fba73;
$background-color: #ffffff;
$header-background-color: #2c3845;
$menu-background-color: #cc494f;
$footer-background-color: #2c3845;
$tagline-text-color: #ffffff;
$link-color: #ff6663;
$main-text-color: #0b3954;
$link-color: #cc494f;
$main-text-color: #252525;
$secondary-text-color: #686868;
220 changes: 220 additions & 0 deletions .dev/sass/compat/woocommerce.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,220 @@
.primer-wc-cart-menu {
display: none !important;

.main-navigation & {
display: list-item !important;
}

.primer-wc-cart-sub-menu {
float: right;
width: 100%;
box-shadow: none;

li,
.widget_shopping_cart {
width: 100%;
background: inherit;
}

.widget_shopping_cart {
float: right;
width: 250px;
box-shadow: 0 3px 3px rgba(0, 0, 0, 0.2);

.quantity {
display: block;
float: left;
font-style: italic;
padding-left: 1.25em;
padding-bottom: .5em;
}

ul.product_list_widget {
position: relative !important;
left: 0;
max-height: 250px;
overflow-y: auto;
}

p.buttons,
.total,
.product_list_widget {
float: left;
width: 100%;
}

.total strong {
text-index: 0;
}

p.buttons {
padding: .5em;
padding-top: 0;
margin: 0;
}

.cart_list li.mini_cart_item {
padding: 0 !important;
margin: 0;
width: 100%;
padding-bottom: 5px;
border-bottom: none;
padding: .5em 1em;
text-indent: 0;
opacity: 1;
transition: opacity .25s ease-out;

img {
width: 100%;
max-width: 55px;
}

a {
border-bottom: none;
}

a:nth-child(2) {
padding: .5em;
padding-bottom: 0;
margin: 0;
width: 100%;
text-indent: 0 !important;
}

&:hover {
opacity: .85;
}
}
}

.primer-wc-cart-sub-menu-item {
.product_list_widget {
border: none;
box-shadow: none;
display: inline-block;
left: 0 !important;
background: inherit;
}

.widget_shopping_cart {
padding: 0;
margin-bottom: 0;

.total {
margin: 0;
padding: 10px 0;
text-align: center;
}

.total strong {
text-indent: 0;
}

p.buttons a {
text-align: center;
width: 100%;
text-indent: 0;

&:first-child {
margin-bottom: 5px;
}
}
}

.cart-preview-count {
margin-left: 8px;
}

.cart_list li a.remove {
position: relative !important;
float: left;
padding: 0;
margin-top: 10px;
margin-left: 15px;
text-indent: 0;
margin-right: 5px;
z-index: 1001;
line-height: .95;
text-indent: 0 !important;
border: none;
box-shadow: none;

&:hover {
background: red !important;
}
}
}
}

&:hover {
cursor: pointer;

a {
background: transparent;
}
}
}

body.post-type-archive,
body.single-product {
/* On Sale Badge */
span.onsale,
ul.products li.product .onsale {
padding: 2px 8px;
border-radius: 0;
margin: 0;
min-height: auto;
min-width: auto;
line-height: inherit;
}
}

body.single-product {
span.onsale {
padding: 3px 18px;
top: 0;
left: 0;
}

.quantity .input-text {
padding: 8px;
}
}

body.woocommerce-cart {
.primer-wc-cart-sub-menu {
display: none;
}
}

.woocommerce,
.woocommerce-page {
table.cart {
img {
width: 100%;
max-width: 100px;
margin-bottom: 0;
}

td.actions .input-text {
padding: 7px !important;
}
}
}

.woocommerce ul.products li.product a.add_to_cart_button {
width: 100%;
font-size: 16px;
text-align: center;
}

@media #{$small-only} {

.primer-wc-cart-menu {
.primer-wc-cart-sub-menu {
.widget_shopping_cart {
width: 100%;
}
}
}
}
14 changes: 13 additions & 1 deletion .dev/sass/components/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ input[type="time"],
input[type="datetime"],
input[type="datetime-local"],
input[type="color"],
textarea {
textarea,
.select2-container .select2-choice {
color: $color__text-input;
border: 1px solid $color__border;
border-radius: 3px;
Expand All @@ -25,6 +26,17 @@ textarea {
}
}

.select2-container .select2-choice {
padding: 0.35rem 0.75rem;
}

.select2-drop-active,
.select2-drop.select2-drop-above.select2-drop-active,
.select2-dropdown-open.select2-drop-above .select2-choice,
.select2-dropdown-open.select2-drop-above .select2-choices {
border-color: $color__border;
}

input[type="checkbox"],
input[type="radio"] {
margin: 0 0.25em;
Expand Down
1 change: 0 additions & 1 deletion .dev/sass/layouts/_comments.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
.comments-area {
margin: 0 0 1.5em;
padding: 2.5em 3em;
background-color: #fff;

@media #{$medium-only} {
padding: 1.5em;
Expand Down
5 changes: 5 additions & 0 deletions .dev/sass/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -167,3 +167,8 @@
# Comments
--------------------------------------------------------------*/
@import "layouts/comments";

/*--------------------------------------------------------------
# Compatibility
--------------------------------------------------------------*/
@import "compat/woocommerce";
22 changes: 15 additions & 7 deletions .distignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
.distignore
.git
.gitignore
.travis.yml
.dev
package.json
node_modules
.*
*.yml
composer.*
Gruntfile.js
package.json
phpcs.ruleset.xml
phpunit.xml.dist
readme.md
svn-username
bin/
build/
dev-lib/
languages/*.po
node_modules/
tests/
vendor/
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
.DS_Store
svn-username
.sass-cache/
build/
node_modules/
55 changes: 55 additions & 0 deletions .styleci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
preset: none

enabled:
- blank_line_after_namespace
- blank_line_before_return
- cast_spaces
- combine_consecutive_unsets
- concat_with_spaces
- elseif
- encoding
- full_opening_tag
- function_typehint_space
- hash_to_slash_comment
- include
- linebreak_after_opening_tag
- lowercase_cast
- lowercase_constants
- lowercase_keywords
- method_visibility_required
- native_function_casing
- no_closing_tag
- no_extra_consecutive_blank_lines
- no_php4_constructor
- no_short_echo_tag
- no_spaces_after_function_name
- no_trailing_comma_in_list_call
- no_trailing_comma_in_singleline_array
- no_trailing_whitespace
- no_trailing_whitespace_in_comment
- no_useless_else
- no_whitespace_before_comma_in_array
- not_operator_with_space
- phpdoc_no_access
- phpdoc_no_empty_return
- phpdoc_scalar
- property_visibility_required
- short_scalar_cast
- single_blank_line_at_eof
- single_class_element_per_statement
- single_import_per_statement
- single_line_after_imports
- single_quote
- standardize_not_equals
- strict_comparison
- switch_case_semicolon_to_colon
- ternary_operator_spaces
- trailing_comma_in_multiline_array
- unix_line_endings
- whitespace_after_comma_in_array

finder:
exclude:
- ".dev"
name:
- "*.php"
17 changes: 13 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
sudo: false

language:
- php
- node_js
language: php

notifications:
email:
on_success: never
on_failure: change

branches:
only:
- master
- develop

before_script:
- curl -s https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli-nightly.phar > /tmp/wp-cli.phar
- curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli-nightly.phar > /tmp/wp-cli.phar
- chmod +x /tmp/wp-cli.phar

script:
- echo "Deploy only"
Expand Down
Loading

0 comments on commit 2a3a6eb

Please sign in to comment.