Skip to content

Commit

Permalink
Merge pull request #50 from WordImpress/master
Browse files Browse the repository at this point in the history 
Latest Master
  • Loading branch information
@mehul0810
mehul0810 committed Jul 11, 2017
2 parents 4943f51 + 8b4d42f commit 73ae825
Show file tree
Hide file tree
Showing 160 changed files with 13,122 additions and 10,593 deletions.
1 change: 0 additions & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ php:
- 5.6
- 7.0
- 7.1
- hhvm

env:
- WP_VERSION=latest WP_MULTISITE=0 PHP_LATEST_STABLE=7.1
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ If you would like to submit a pull request, please follow the steps below:
* If you're adding/editing a function in a class, make sure to add `@access {private|public|protected}`
* Finally, please use tabs and not spaces. The tab indent size should be 4 for all Give code.

At this point you're waiting on us to merge your pull request. We'll review all pull requests, and make suggestions and changes if necessary.
At this point, you're waiting for us to merge your pull request. We'll review all pull requests, and make suggestions and changes if necessary.
191 changes: 90 additions & 101 deletions assets/css/give-admin-rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,11 @@ x:-o-prefocus, .qtip .qtip-tip {
.give-metabox-tabs li .give-icon-purse:before {
content: "\e8df"; }

.give-metabox-tabs li .dashicons {
font-size: 14px;
width: 14px;
line-height: 20px; }

/**
* Give Forms SCSS
*
Expand Down Expand Up @@ -806,7 +811,7 @@ div.cmb-type-levels-repeater-header + div.cmb-repeat-group-wrap {
margin-left: -4px; }

.give-money-symbol-after {
margin-right: -1px; }
margin-right: -5px; }

.give_options_panel input[type="text"] {
padding: 5px;
Expand Down Expand Up @@ -1118,7 +1123,7 @@ ASIDE
display: block;
position: absolute;
bottom: 0;
right: 170px;
right: 166px;
width: 170px;
max-height: 250px;
overflow-y: scroll; }
Expand Down Expand Up @@ -1620,20 +1625,6 @@ p.give-field-description, .cmb2-metabox-description {
font-style: italic;
font-size: 13px !important; }

.give-image-thumb {
position: relative;
margin-top: 14px; }
.give-image-thumb span.give-delete-image-thumb {
position: absolute;
background: red;
color: white;
border-radius: 30px;
right: -10px;
top: -10px; }
.give-image-thumb img {
max-width: 400px;
border: 4px solid white; }

.cmb-type-give-title label,
.give-setting-tab-header h2 {
float: right;
Expand Down Expand Up @@ -1712,37 +1703,6 @@ p.give-field-description, .cmb2-metabox-description {
#give-download-sysinfo {
margin: 0; }

.cmb2-id-api .cmb-td {
padding: 0; }

.cmb2-id-api table th {
padding: 10px 8px; }

.cmb2-id-api .give-ajax-user-search {
padding: 3px 5px; }

.give_user_search_wrap {
position: relative;
overflow: visible; }

.give_user_search_results {
position: absolute;
right: 0;
top: 27px;
z-index: 100; }
.give_user_search_results a.give-ajax-user-cancel {
position: absolute;
left: 6px;
top: 2px; }
.give_user_search_results ul {
padding: 10px 10px 4px;
margin: 0;
background: #f0f0f0;
border: 1px solid #DFDFDF;
width: 300px;
max-height: 200px;
overflow-y: scroll; }

#api .tablenav .actions {
overflow: visible; }

Expand Down Expand Up @@ -1931,6 +1891,21 @@ h2.give-nav-tab-wrapper {
outline: none;
box-shadow: inset 0px 0px 4px #ddd; }

.give-image-thumb {
position: relative;
margin-top: 14px; }
.give-image-thumb span.give-delete-image-thumb {
position: absolute;
background: red;
color: white;
border-radius: 30px;
right: -10px;
top: -10px;
cursor: pointer; }
.give-image-thumb img {
max-width: 250px;
border: 4px solid white; }

/**
* Give Payment History SCSS
*
Expand Down Expand Up @@ -1964,9 +1939,12 @@ h2.give-nav-tab-wrapper {
#give-payment-filters label.give-start-date-label {
margin-right: 5px; }

#give-payments-filter ul.subsubsub {
#give-payments-advanced-filter ul.subsubsub {
margin-bottom: 12px; }

#give-payments-advanced-filter #search-submit {
margin-left: 20px; }

#give-payments-filter .tablenav.top {
float: none; }
#give-payments-filter .tablenav.top .bulkactions {
Expand Down Expand Up @@ -2107,10 +2085,6 @@ Responsiveness
.give-admin-box-inside .strong {
font-weight: 600; }

.give-payment-fees .fee-label {
font-weight: normal;
color: #666; }

.give-admin-box .right {
float: left; }

Expand Down Expand Up @@ -2236,6 +2210,21 @@ input.give-price-field {
.give_forms_page_give-payment-history #give-dashboard-widgets-wrap #side-sortables {
padding-top: 0; }

.give-select-chosen .spinner {
position: absolute;
left: 5px;
top: 2px;
z-index: 999; }

.give-select-chosen-ajax .spinner {
visibility: visible; }

.give-select-chosen-ajax .chosen-search input[type="text"] {
background-image: none !important; }

.give-select-chosen-ajax.chosen-container-single .chosen-search input[type="text"] {
background-image: none !important; }

/**
* Give Admin Dashboard SCSS
*
Expand Down Expand Up @@ -2338,54 +2327,54 @@ input.give-price-field {
float: left;
clear: none; }

#give-customer-card-wrapper {
#give-donor-card-wrapper {
margin-right: -1px;
z-index: 2;
min-height: 200px; }
#give-customer-card-wrapper input {
#give-donor-card-wrapper input {
font-weight: normal; }
#give-customer-card-wrapper .customer-section {
#give-donor-card-wrapper .donor-section {
border-bottom: 1px solid #eee;
margin-bottom: 10px; }
#give-customer-card-wrapper .customer-section table {
#give-donor-card-wrapper .donor-section table {
margin-bottom: 0; }
#give-customer-card-wrapper > div:first-child {
#give-donor-card-wrapper > div:first-child {
padding-top: 20px; }
#give-customer-card-wrapper > div:last-child {
#give-donor-card-wrapper > div:last-child {
padding-bottom: 20px;
border: none; }
#give-customer-card-wrapper .avatar-wrap {
#give-donor-card-wrapper .avatar-wrap {
padding: 0 0 15px 15px;
text-align: center;
float: right; }
#give-customer-card-wrapper .avatar-wrap img {
#give-donor-card-wrapper .avatar-wrap img {
border-radius: 3px; }
#give-customer-card-wrapper a.delete {
#give-donor-card-wrapper a.delete {
text-decoration: none;
color: #ff0000;
margin-left: 5px; }
#give-customer-card-wrapper .donor-bio-header .customer-since {
#give-donor-card-wrapper .donor-bio-header .donor-since {
margin: 10px 0;
font-size: 16px; }
#give-customer-card-wrapper .donor-bio-header .customer-id {
#give-donor-card-wrapper .donor-bio-header .donor-id {
display: inline-block;
font-size: 24px;
font-weight: 600;
margin-left: 10px; }
#give-customer-card-wrapper .donor-bio-header .customer-name-wrap {
#give-donor-card-wrapper .donor-bio-header .donor-name-wrap {
display: inline-block; }
#give-customer-card-wrapper .donor-bio-header .customer-edit-link {
#give-donor-card-wrapper .donor-bio-header .donor-edit-link {
margin-bottom: 15px; }

.customer-main-wrapper {
.donor-main-wrapper {
clear: both;
margin: 0 0 20px; }
@media (max-width: 655px) {
.customer-main-wrapper {
.donor-main-wrapper {
width: 100%; } }
.customer-main-wrapper table {
.donor-main-wrapper table {
margin: 0; }
.customer-main-wrapper input {
.donor-main-wrapper input {
width: 200px; }

#donor-summary {
Expand All @@ -2400,22 +2389,22 @@ input.give-price-field {
color: #F0F0F0;
z-index: 0; }

#give-customer-card-wrapper .customer-address-wrapper {
#give-donor-card-wrapper .donor-address-wrapper {
width: 202px; }
#give-customer-card-wrapper .customer-address-wrapper span[data-key="line2"] {
#give-donor-card-wrapper .donor-address-wrapper span[data-key="line2"] {
display: table;
clear: both; }

#give-customer-card-wrapper .customer-address-wrapper select {
#give-donor-card-wrapper .donor-address-wrapper select {
width: 200px; }

#give-customer-card-wrapper .customer-info {
#give-donor-card-wrapper .donor-info {
min-height: 185px; }

#give-customer-card-wrapper .info-wrapper {
#give-donor-card-wrapper .info-wrapper {
min-height: 125px; }

.customer-info .customer-name {
.donor-info .donor-name {
font-size: 24px;
font-weight: 600; }

Expand All @@ -2424,92 +2413,92 @@ input.give-price-field {
font-weight: normal;
text-decoration: none; }

#customer-edit-actions {
#donor-edit-actions {
text-align: center;
margin-bottom: 20px;
line-height: 28px; }

#customer-edit-actions .button-secondary {
#donor-edit-actions .button-secondary {
margin-left: 10px; }

#give-customer-card-wrapper .edit-item {
#give-donor-card-wrapper .edit-item {
display: none; }

#give-customer-card-wrapper .give_user_search_results {
#give-donor-card-wrapper .give_user_search_results {
right: 1px;
top: 16px; }

#give-customer-card-wrapper .give_user_search_results ul {
#give-donor-card-wrapper .give_user_search_results ul {
width: 200px; }

#customer-stats-wrapper {
#donor-stats-wrapper {
margin: 0 auto;
text-align: center;
padding: 15px; }
#customer-stats-wrapper ul {
#donor-stats-wrapper ul {
margin: 0;
padding: 0;
overflow: hidden; }
#customer-stats-wrapper ul li {
#donor-stats-wrapper ul li {
width: 50%;
float: right;
line-height: 22px;
font-size: 14px;
margin: 0; }
#customer-stats-wrapper a {
#donor-stats-wrapper a {
text-decoration: none; }

#customer-stats-wrapper .dashicons {
#donor-stats-wrapper .dashicons {
color: #888; }

#customer-tables-wrapper table {
#donor-tables-wrapper table {
width: 100%;
text-align: center; }

#customer-tables-wrapper th {
#donor-tables-wrapper th {
text-align: center; }

#customer-tables-wrapper .donations tr > th:first-child,
#customer-tables-wrapper .donations tr > td:first-child,
#customer-tables-wrapper .emails tr > th:first-child,
#customer-tables-wrapper .emails tr > td:first-child {
#donor-tables-wrapper .donations tr > th:first-child,
#donor-tables-wrapper .donations tr > td:first-child,
#donor-tables-wrapper .emails tr > th:first-child,
#donor-tables-wrapper .emails tr > td:first-child {
text-align: right; }

#customer-tables-wrapper .donations tr > td:only-child {
#donor-tables-wrapper .donations tr > td:only-child {
text-align: center; }

#customer-notes-wrapper {
#donor-notes-wrapper {
min-height: 50px; }

.customer-notes-header span, .customer-notes-header img {
.donor-notes-header span, .donor-notes-header img {
font-weight: 600;
line-height: 30px;
vertical-align: middle; }

.customer-note-input {
.donor-note-input {
width: 100%;
margin-bottom: 5px; }

#give-customer-notes div:nth-of-type(even) {
#give-donor-notes div:nth-of-type(even) {
background-color: #f9f9f9; }

#give-customer-notes .customer-note-wrapper {
#give-donor-notes .donor-note-wrapper {
border-bottom: 1px solid #f9f9f9;
min-height: 38px;
padding: 0; }
#give-customer-notes .customer-note-wrapper .note-content-wrap {
#give-donor-notes .donor-note-wrapper .note-content-wrap {
padding: 10px 12px;
line-height: 20px;
font-size: 14px; }

#give-customer-notes .give-no-customer-notes {
#give-donor-notes .give-no-donor-notes {
text-align: center;
padding: 20px; }

.customer-note-wrapper span {
.donor-note-wrapper span {
display: block; }

.delete-customer {
.delete-donor {
text-align: center; }

/**
Expand Down
2 changes: 1 addition & 1 deletion assets/css/give-admin-rtl.min.css
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 73ae825

Please sign in to comment.