Merge pull request #326 from katzwebservices/dev/1.6

Dev/1.6

Gruntfile.js

@@ -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'],
+		          src: ['*.scss','!search.scss','!edit.scss','!font.scss','!notice.scss','!oembed.scss'],
 		          dest: 'templates/css/',
 		          ext: '.css'
 		      }]
@@ -48,7 +48,7 @@ module.exports = function(grunt) {
 		          dest: 'includes/extensions/search-widget/assets/js/',
 		          ext: '.min.js'
 		      }]
-			}
+			},
 		},
 
 		watch: {

assets/css/scss/admin-views.scss

@@ -9,22 +9,23 @@
  *
  * @since 1.0.0
  */
-
-
+@import "admin-widgets-php";
 @import "admin-merge-tags";
 @import "admin-tooltips";
 
 // http://blog.teamtreehouse.com/a-better-clearfix-with-sass
 %clearfix {
-  &:after {
-    content: "";
-    display: table;
-    clear: both;
-  }
+	&:after {
+		content: "";
+		display: table;
+		clear: both;
+	}
 }
 
 $dismiss-red: #d03a3a;
 
+$gv-overlay-index: 10000;
+
 /* GV Grid
 --------------------------------------- */
 
@@ -248,7 +249,6 @@ $dismiss-red: #d03a3a;
 	}
 }
 
-
 // Don't display the arrow toggle for collapsing the metabox
 #gravityview_select_form .handlediv {
 	display: none;
@@ -272,7 +272,6 @@ $dismiss-red: #d03a3a;
 	}
 }
 
-
 #gv_switch_view_button {
 	display: inline-block;
 }
@@ -285,6 +284,7 @@ $dismiss-red: #d03a3a;
 	max-height: 450px;
 	overflow-x: auto;
 }
+
 #gravityview_select_template .gv-grid-col-1-3 {
 	max-width: 250px;
 	min-width: 200px;
@@ -321,15 +321,19 @@ $dismiss-red: #d03a3a;
 
 /** View configuration tabs */
 .ui-tabs {
-	position: relative; padding: .1em; zoom: 1; margin-top: 1em;
+	position: relative;
+	padding: .1em;
+	zoom: 1;
+	margin-top: 1em;
 
 	// Fix issue with theme conflicts where .gv-overlay gets in the way
 	.ui-front {
-		z-index: 999999;
+		z-index: $gv-overlay-index + 1;
 	}
 
 	.ui-tabs-nav {
-		margin: 0; padding: .1em .1em 0;
+		margin: 0;
+		padding: .1em .1em 0;
 		-webkit-margin-before: 0;
 		-webkit-margin-after: 0;
 		-webkit-margin-start: 0;
@@ -360,7 +364,9 @@ $dismiss-red: #d03a3a;
 			}
 
 			// Non-active state
-			.dashicons { color: #aaa; }
+			.dashicons {
+				color: #aaa;
+			}
 
 			&.ui-state-active,
 			&.ui-state-active.ui-state-hover {
@@ -372,7 +378,9 @@ $dismiss-red: #d03a3a;
 
 				// Active text is #555 - we want a bit lighter
 				// since it's bolder.
-				.dashicons { color: #666; }
+				.dashicons {
+					color: #666;
+				}
 			}
 
 			&.ui-state-hover .dashicons {
@@ -390,31 +398,35 @@ $dismiss-red: #d03a3a;
 		border: 1px solid #ddd;
 	}
 
-	.ui-tabs-hide { display: none!important; }
+	.ui-tabs-hide {
+		display: none !important;
+	}
+}
+
+.gv-dialog {
+	z-index: $gv-overlay-index + 1;
 }
 
 .gv-overlay {
 	cursor: pointer;
 	position: fixed;
-	z-index: 10000;
+	z-index: $gv-overlay-index;
 	background: transparent; // For browsers without support for rgba
 	background: rgba(225, 225, 225, .4);
 	width: 100%;
 	height: 100%;
 	overflow: hidden;
 }
 
-
 /** Sections */
 
-hr{
+hr {
 	border: 0;
 	height: 0;
 	border-bottom: 1px solid #ddd;
 	margin: 2em 0 2em 0;
 }
 
-
 /* GV Droppable Areas
 --------------------------------------- */
 
@@ -453,7 +465,9 @@ hr{
 		float: right;
 	}
 
-} // End .gv-droppable-area
+}
+
+// End .gv-droppable-area
 
 .active-drop {
 	padding: 3px 7px;
@@ -479,14 +493,15 @@ hr{
 
 	}
 
-} // End .active-drop
+}
+
+// End .active-drop
 
 .gv-grid-col-1-2 .drop-message {
 	padding-top: 0;
 	padding-bottom: 0;
 }
 
-
 .fields-placeholder {
 	margin: 5px 2px;
 	height: 32px; // .active-drop height - margin-top - margin-bottom - 2px border
@@ -595,7 +610,7 @@ hr{
 
 			span {
 				&:after {
-					content:", ";
+					content: ", ";
 				}
 
 				&.gv-sublabel,
@@ -606,7 +621,9 @@ hr{
 		}
 	}
 
-} // End .gv-fields
+}
+
+// End .gv-fields
 
 .ui-dialog-content,
 .ui-dialog {
@@ -644,7 +661,6 @@ hr{
 	}
 }
 
-
 .gv-sublabel {
 	font-size: .9em;
 	display: block;
@@ -663,11 +679,12 @@ hr{
 
 	display: none;
 	width: 90%;
-	padding: 10px 0!important;
+	padding: 10px 0 !important;
 
 	&.gv-dialog-warning p {
 		font-size: 1.1em;
 	}
+
 	&.gv-dialog-warning .dashicons {
 		font-size: 70px;
 		width: 70px;
@@ -721,6 +738,10 @@ hr{
 		margin: 0 auto;
 	}
 
+}
+
+.gv-widget-search-fields, .gv-dialog-options {
+
 	table {
 		padding-bottom: 15px;
 
@@ -745,14 +766,15 @@ hr{
 			}
 		}
 
-		.cell-input-types {
-			width: 180px;
+	  	.gv-search-fields,
+		.gv-search-inputs {
+			width: 100%;
 		}
 
 		.cell-sort,
 		.cell-add-remove {
 
-			width: 40px;
+			//width: 40px;
 
 			a {
 				font-size: 18px;
@@ -775,30 +797,19 @@ hr{
 		}
 
 		.cell-sort {
-			width: 18px;
+			width: 24px;
 		}
 
-	}
-
-	#gv-loading {
-		text-align: center;
-		font-size: 16px;
-		line-height: 20px;
-		display: block;
-
-		.spinner {
-			display: inline-block;
-			margin-top: -3px;
-			float: none;
+	  	.cell-add-remove {
+		  width: 50px;
 		}
-	}
-
 
+	}
 }
 
-
 // Only modify GV post type
-.post-type-gravityview {
+.post-type-gravityview,
+.widgets-php {
 
 	// Make the dropdown icon fit on the same line as the text field
 	input.merge-tag-support {
@@ -810,8 +821,20 @@ hr{
 		max-width: 300px;
 	}
 
-}
+	#gv-loading {
+		text-align: center;
+		font-size: 16px;
+		line-height: 20px;
+		display: block;
 
+		.spinner {
+			display: inline-block;
+			margin-top: -3px;
+			float: none;
+		}
+	}
+
+}
 
 .gv-label {
 	display: inline-block;
@@ -821,8 +844,8 @@ hr{
 
 .gv-label-checkbox {
 	padding-right: 1em;
-	display:block;
-	width:100%;
+	display: block;
+	width: 100%;
 }
 
 .gv-label-textarea,
@@ -834,7 +857,6 @@ hr{
 	margin-bottom: 0.5em;
 }
 
-
 .gv-shortcode {
 	.dashicons-editor-code {
 		color: #888;

assets/css/scss/admin-widgets-php.scss

@@ -0,0 +1,23 @@
+
+.widgets-php .gv-overlay {
+	display: none;
+}
+
+#gv-widget-search-settings-link {
+
+	display: none;
+	text-align: center;
+	font-size: 110%;
+
+	.dashicons {
+		margin-right: 5px;
+		line-height: 20px!important;
+		height: 20px!important;
+		font-size: 20px!important;
+	}
+
+	a {
+		text-decoration: none;
+		text-align: center;
+	}
+}