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

Commit

Permalink
iPhone polish (#865)
Browse files Browse the repository at this point in the history
* fix formatting of refactored donation on iPhone

* push iphone-polish branch to staging

* make braintree CC placeholders easier to read
  • Loading branch information
NealJMD committed Feb 8, 2017
1 parent 6f81fee commit 8554050
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 6 deletions.
11 changes: 8 additions & 3 deletions app/assets/stylesheets/member-facing/form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@
select {
height: 58px;
}
@media(max-width: 420px) {
input:not([type=checkbox]):not([type=radio]) {
-webkit-appearance: none;
}
}

label.checkbox-label, .form__instruction {
margin: 10px 0 4px;
Expand Down Expand Up @@ -145,8 +150,8 @@ label.checkbox-label {
pointer-events: auto;
color: rgba(black, 0.4);
transition: all 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;
transform: scale(1) translate3d(0px, 0px, 0px);
transform-origin: left top 0px;
@include transform(scale(1) translate3d(0px, 0px, 0px));
@include transform-origin(left, top, 0px);
-webkit-user-select: none;
font-size: 18px;
line-height: 28px;
Expand All @@ -164,7 +169,7 @@ label.checkbox-label {
color: rgba(black, 0.6);
}
&--active, &--full {
transform: perspective(1px) scale(0.6) translate3d(0px, -15px, 0px);
@include transform(perspective(1px) scale(0.6) translate3d(0px, -15px, 0px));
max-width: 170%;
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/frontend/components/Braintree/BraintreeCardFields.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class BraintreeCardFields extends Component {
client,
styles: {
input: {
color: '#ccc',
color: '#333',
'font-size': '16px',
},
':focus': { color: '#333' },
Expand Down
4 changes: 4 additions & 0 deletions app/frontend/components/Button/Button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
font-size: 20px;
}
}
.Button-root > span {
margin-left: auto;
margin-right: auto;
}

.Button-root.disabled,
.Button-root.disabled:hover,
Expand Down
1 change: 1 addition & 0 deletions app/frontend/components/Checkbox/Checkbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
top: -3px;
cursor: pointer;
max-width: 16px;
padding: 0;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
.PaymentMethod input {
height: 14px;
width: 14px;
padding: 0;
}

.PaymentMethodWrapper__icon {
Expand Down
1 change: 0 additions & 1 deletion app/frontend/components/SweetInput/SweetInput.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// @flow weak
import React, { Component } from 'react';
import classnames from 'classnames';
import './SweetInput.css';

type OwnProps = {
name: string;
Expand Down
2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ deployment:
- ./bin/build.sh
- ./bin/deploy.sh $CIRCLE_SHA1 'champaign' 'env-production' 'champaign-assets-production' 'logs3.papertrailapp.com:44107' 'actions.sumofus.org'
staging:
branch: development
branch: iphone-polish
commands:
- ./bin/build.sh
- ./bin/deploy.sh $CIRCLE_SHA1 'champaign' 'champaign-staging' 'champaign-assets-staging' 'logs3.papertrailapp.com:34848' 'action-staging.sumofus.org'
Expand Down

0 comments on commit 8554050

Please sign in to comment.