Skip to content

Commit

Permalink
Merge pull request #341 from katzwebservices/dev/1.7.4
Browse files Browse the repository at this point in the history
Dev/1.7.4
  • Loading branch information
zackkatz committed Apr 6, 2015
2 parents 6f7a769 + 1563d0e commit a411eb4
Show file tree
Hide file tree
Showing 88 changed files with 7,193 additions and 4,300 deletions.
8 changes: 1 addition & 7 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
[submodule "includes/lib/redux-framework"]
path = includes/lib/redux-framework
url = git://github.com/ReduxFramework/redux-framework.git
[submodule "includes/lib/standalone-phpenkoder"]
path = includes/lib/standalone-phpenkoder
url = git://github.com/jnicol/standalone-phpenkoder.git
[submodule "includes/lib/edd-redux-extension"]
path = includes/lib/edd-redux-extension
url = git://github.com/katzwebservices/EDD-Redux-Extension.git
url = git://github.com/jnicol/standalone-phpenkoder.git
4 changes: 4 additions & 0 deletions .idea/encodings.xml

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

7 changes: 0 additions & 7 deletions .idea/inspectionProfiles/profiles_settings.xml

This file was deleted.

2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module.exports = function(grunt) {
files: [{
expand: true,
cwd: 'templates/css/source/',
src: ['*.scss','!search.scss','!edit.scss','!font.scss','!notice.scss','!oembed.scss'],
src: ['*.scss','!search.scss','!edit.scss','!font.scss','!notice.scss','!oembed.scss','!responsive.scss'],
dest: 'templates/css/',
ext: '.css'
}]
Expand Down
33 changes: 1 addition & 32 deletions assets/css/admin-settings.css

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

195 changes: 195 additions & 0 deletions assets/css/scss/admin-settings.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
/**
* Modify the GFAddon App Settings page
*/
.gravityview_page_gravityview_settings {

.gform_tab_content > h3 {
position: absolute;
top: .5em;
right:10px;
}

.version-info {
position: absolute;
right: 10px;
top: .5em
}

.gv-edd-message {
min-height: 20px;
padding: 8px 19px;
margin: 10px 0!important;
border: 1px solid;
border-radius: 4px;
position: relative;

display: block!important; // Overwrite .inline class declaration

background-color: #eeeeee;
border-color: #cccccc;
color: #666666;

&.valid {
background-color: #c4ee91;
border-color: #71af5d;
color: #4d7615;
}

&.error,
&.invalid,
&.failed {
background-color: #fba1a3;
border-color: #b84f5b;
color: #981225
}

&.site_inactive,
&.deactivated {
background-color: #fbeba4;
border-color: #d7c281;
color: #958234
}

&.pending {
background-color: #d3e4f4;
border-color: #a9b6c2;
color: #5c80a1;
}

p:first-child {
margin: 0;
padding: 2px;
}
}

.inline.hide:empty {
display: none!important;
}

.hide {
display: none;
}

#gaddon-setting-row-license_key .button {
margin: 0 0 0 10px
}

// Add the stars to the top
#gform_tab_group {
padding: 0;
background: url(../images/stars.jpg) left top repeat-x;

// Add Floaty
&:before {
content: '';
display: block;
position: relative;
margin-left: 0;
background-color: #fff;

min-height: 110px;
background: url(../images/astronaut-200x263.png) -30px top no-repeat;
margin: 0;
padding: 10px 0 0 160px;
}

}

.gform_tab_group {
position: relative;

// Don't change the position of the inputs when the .updated div slideUps
#message {
position: absolute;

// As wide as it needs to be
width: auto;
white-space: nowrap;

// Make it look like Floaty is saying it
top: 35px;
left: 150px;

margin-bottom: 10px; // For when JS is off, make sure it has some space

padding-top: 5px;
padding-bottom: 5px;
z-index: 1000;
opacity: .95;

p {
margin: 0;
padding: .25em 5px;
font-size: 16px;
strong {
font-weight: 400;
}
}
}
}

// Don't have tab margins
#gform_tab_container {
margin-left: 0;
background-color: #fff;
padding-bottom: 0;
}

// Hide the tabs
#gform_tabs {
margin-top: 0;
display: none;
}


#gform-settings {

clear: both;

tr {
border-top:1px solid #E7E7E7
}

tr:first-child,
tr:last-child {
border-top: none;
td, th {
padding-top: 10px!important;
}
}

tr:last-child {
td, th {
padding-bottom: 10px!important;
}
}

th, td {
margin: 0;
padding: 20px 10px 20px 0px;
width: auto;
}

td {
width: 70%;

div {
padding-left: 10px;
}
}

th {
font-weight: bold;
display: block
}

span.description {
display: block;
font-style: normal;
font-weight: 400;
color: #666;
}

}

}
Loading

0 comments on commit a411eb4

Please sign in to comment.