Merge branch 'release/2.0'

assets/src/js/admin.js

@@ -310,4 +310,29 @@
 
 	});
 
+	// Plugin removal
+
+	$( '#the-list tr[data-slug="notification"] .deactivate a' ).click( function( event ) {
+		event.preventDefault();
+	} );
+
+	$( 'body' ).on( 'submit', '#notification-plugin-feedback-form', function( event ) {
+
+		event.preventDefault();
+
+		var $form = $(this);
+
+		$form.find( '.spinner' ).addClass( 'is-active' );
+
+		var data = {
+			'action': 'notification_send_feedback',
+			'form'  : $form.serializeArray()
+		};
+
+		$.post( ajaxurl, data, function( response ) {
+			window.location.href = $( '#the-list tr[data-slug="notification"] .deactivate a' ).data( 'deactivate' );
+		});
+
+	} );
+
 })(jQuery);

assets/src/sass/partials/_deactivation.scss

@@ -0,0 +1,27 @@
+/**
+ * Deactivation popup styles
+ */
+
+#TB_window {
+	max-width: 500px;
+	width: 500px;
+	max-height: 400px;
+
+	&:before {
+		background-image: none !important;
+	}
+
+	#TB_ajaxContent {
+		width: 100% !important;
+		height: 100% !important;
+		box-sizing: border-box;
+
+		.reasons label {
+			margin-bottom: 1em;
+			display: block;
+		}
+
+	}
+
+}
+

assets/src/sass/partials/_metabox.scss

@@ -112,3 +112,7 @@
 	}
 
 }
+
+#notification_trigger {
+	margin-top: 20px;
+}

assets/src/sass/partials/_settings.scss

@@ -0,0 +1,110 @@
+/**
+ * Settings styles
+ */
+
+.notification-settings {
+
+	h1 {
+		margin-bottom: 16px;
+	}
+
+	.box {
+		box-shadow: 0 1px 1px rgba(0,0,0,.04);
+	    border: 1px solid #e5e5e5;
+	    background: #fff;
+	    color: #555;
+	    padding: 15px;
+	    margin: 0;
+	    box-sizing: border-box;
+	}
+
+	.menu-col {
+		width: 280px;
+		margin-right: 40px;
+		float: left;
+		padding-left: 0;
+
+		@include mobile {
+			float: none;
+			margin: 0 0 40px 0;
+			width: 100%;
+		}
+
+		.menu-list {
+			margin: 0;
+
+		    li {
+		    	padding-left: 15px;
+		    	display: block;
+		    	margin: 12px 0;
+
+		    	a {
+		    		font-size: 18px;
+		    		text-decoration: none;
+		    		text-transform: uppercase;
+		    		color: #555;
+		    		display: block;
+		    		padding: 6px 0;
+		    	}
+
+		    	&.current {
+		    		border-left: 4px solid #666;
+		    		padding-left: 11px;
+
+		    		a {
+		    			color: #23282d;
+		    		}
+
+		    	}
+
+		    	&:first-child {
+		    		margin-top: 0;
+		    	}
+
+		    	&:last-child {
+		    		margin-bottom: 0;
+		    	}
+
+		    }
+
+		}
+
+	}
+
+	.setting-col {
+		margin-left: 320px;
+		font-size: 15px;
+
+		@include mobile {
+			margin-left: 0;
+			width: 100%;
+		}
+
+		.setting-group {
+			margin-bottom: 2em;
+
+			&:last-child {
+				margin-bottom: 0;
+			}
+
+			h3 {
+				font-weight: normal;
+				margin: 4px 0;
+			    border-bottom: 1px solid #e4e4e4;
+			    padding-bottom: 16px;
+			}
+
+			.form-table {
+				clear: none;
+
+				th {
+					font-weight: normal;
+				}
+
+			}
+
+		}
+
+	}
+
+}

assets/src/sass/style.scss

@@ -13,3 +13,5 @@
  */
 @import 'partials/metabox';
 @import 'partials/messages';
+@import 'partials/settings';
+@import 'partials/deactivation';