Skip to content

Commit

Permalink
publish: Merge branch 'release/1.0.18'
Browse files Browse the repository at this point in the history
generated from commit 88fa9a5
  • Loading branch information
codalytics-volusion committed Apr 3, 2015
1 parent 926c309 commit 47ac536
Show file tree
Hide file tree
Showing 7 changed files with 62 additions and 31 deletions.
8 changes: 4 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<title>Volusion AngularJS Method Theme</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=0">
<link rel="stylesheet" href="/styles/11e81292.vendor.css">
<link rel="stylesheet" href="/styles/eb3d6c8a.main.css">
<link rel="stylesheet" href="/styles/df8a6fd6.vendor.css">
<link rel="stylesheet" href="/styles/220adf71.main.css">
<link rel="stylesheet" ng-href="{{ overridesCSS }}">
<base href="/">
</head>
Expand Down Expand Up @@ -45,9 +45,9 @@

</div>

<script src="scripts/28ceb405.vendor.js"></script>
<script src="scripts/96bbc025.vendor.js"></script>

<script src="/scripts/5c6891e8.scripts.js"></script>
<script src="/scripts/ee9d6c80.scripts.js"></script>

</body>
</html>
2 changes: 0 additions & 2 deletions scripts/5c6891e8.scripts.js

This file was deleted.

21 changes: 11 additions & 10 deletions scripts/28ceb405.vendor.js → scripts/96bbc025.vendor.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions scripts/ee9d6c80.scripts.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions settings/themeInfo.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Method",
"version": "1.0.17",
"source": "https://github.com/volusion-angular-themes/method/archive/v1.0.17.zip",
"version": "1.0.18",
"source": "https://github.com/volusion-angular-themes/method/archive/v1.0.18.zip",
"author": {
"name": "John Smith",
"email": "[email protected]",
Expand Down
54 changes: 42 additions & 12 deletions styles/eb3d6c8a.main.css → styles/220adf71.main.css
Original file line number Diff line number Diff line change
Expand Up @@ -5485,6 +5485,16 @@ button.close {
.th__back-button {
margin-top: 20px;
font-size: 1.6rem; }
.th__title {
font-weight: bold;
text-transform: uppercase;
margin-top: 10px;
text-align: center;
font-size: 2.4rem;
margin-bottom: 20px; }
.th__subtitle {
margin-bottom: 20px;
text-align: center; }

.align-right {
text-align: right; }
Expand Down Expand Up @@ -7193,19 +7203,19 @@ input.ng-pristine + .input-help {
.th-checkout__thanks__display .th-credit-card__number {
font-weight: bold; }

.th-checkout__login {
.th-login {
text-align: center;
background-color: white;
height: 100%;
margin: 50px 0px; }
.th-checkout__login__form {
.th-login__form {
margin: 20px; }
@media (max-width: 480px) {
.th-checkout__login__form {
.th-login__form {
margin: 0 0 20px 0; } }
.th-checkout__login__form .form-control {
.th-login__form .form-control {
font-size: 1.8rem; }
.th-checkout__login__error {
.th-login__error {
border-radius: 0;
color: #a94442;
background-color: #f2dede;
Expand All @@ -7214,20 +7224,27 @@ input.ng-pristine + .input-help {
margin-bottom: 10px;
padding: 15px; }
@media (max-width: 480px) {
.th-checkout__login__error {
margin: 0px; } }
.th-checkout__login__user-type {
.th-login__error {
margin-bottom: 20px; } }
.th-login__user-type {
text-align: center;
padding: 0px 0px 20px 0px; }
.th-checkout__login__user-type .btn-group {
.th-login__user-type .btn-group {
width: 100%; }
.th-checkout__login__user-type .btn-group button {
.th-login__user-type .btn-group button {
width: 50%; }
@media (max-width: 480px) {
.th-checkout__login__user-type .btn-group button {
.th-login__user-type .btn-group button {
font-size: 14px; } }
.th-checkout__login__continue {
.th-login__continue {
margin-top: 20px; }
.th-login__title {
font-weight: bold;
text-transform: uppercase;
margin-top: 10px;
text-align: center;
font-size: 2.4rem;
margin-bottom: 20px; }

.th-checkout__review__discounts__discount-info--subtotal, .th-checkout__review__store-credit-info--subtotal, .th-checkout__review__shipping-method-info--subtotal, .th-checkout__review__tax-info--subtotal, .th-checkout__review__grand-total-info--subtotal, .th-checkout__review__items__item-info--subtotal {
font-size: 1.5rem;
Expand Down Expand Up @@ -7539,6 +7556,19 @@ input.ng-pristine + .input-help {
.th-payment-profiles .th-credit-card__img {
margin-left: 0; }

.th-change-email .th-my-account__title {
margin-bottom: 20px; }
.th-change-email__current {
line-height: 1.4;
margin: 0 0 25px 0; }
.th-change-email__current__title {
text-transform: uppercase;
font-size: 11px;
color: #999; }

.th-change-password .th-my-account__title {
margin-bottom: 20px; }

#main-content-area > div {
height: 100%; }

Expand Down
2 changes: 1 addition & 1 deletion styles/11e81292.vendor.css → styles/df8a6fd6.vendor.css

Large diffs are not rendered by default.

0 comments on commit 47ac536

Please sign in to comment.