Merge pull request #82 from Freemius/develop

Develop - version 1.2.0

assets/scss/admin/_deactivation-feedback.scss

@@ -0,0 +1,42 @@
+@import "../colors";
+
+.fs-modal.fs-modal-deactivation-feedback {
+	.reason-input, .internal-message {
+		margin:	3px 0 3px 22px;
+
+		input, textarea {
+			width: 100%;
+		}
+	}
+
+	li.reason {
+		&.has-internal-message .internal-message {
+			border: 1px solid lighten($darkest-color, 80%);
+			padding: 7px;
+			display: none;
+		}
+
+		@media (max-width: 650px) {
+			li.reason {
+				margin-bottom: 10px;
+
+				.reason-input, .internal-message {
+					margin-left: 29px;
+				}
+
+				label {
+					display: table;
+
+					> span {
+						display: table-cell;
+						font-size: 1.3em;
+					}
+				}
+			}
+		}
+	}
+}
+
+#the-list .deactivate > .fs-slug {
+	display: none;
+}

assets/scss/admin/_license-activation.scss

@@ -0,0 +1,7 @@
+.fs-modal.fs-modal-license-activation {
+	.fs-modal-body {
+		input.license_key {
+			width: 100%;
+		}
+	}
+}

assets/scss/admin/_license-key-resend.scss

@@ -0,0 +1,35 @@
+.fs-modal.fs-modal-license-key-resend {
+	.button-close {
+		float: right;
+		margin: 5px;
+
+		&:hover {
+			cursor: pointer;
+		}
+	}
+
+	.fs-modal-body {
+		.input-container > .email-address-container {
+			overflow: hidden;
+			padding-right: 2px;
+		}
+
+		input.email-address {
+			width: 100%;
+		}
+
+		.button-container {
+			float: right;
+			margin-left: 7px;
+
+			@media (max-width: 650px) {
+				margin-top: 2px;
+			}
+		}
+	}
+}
+
+a.show-license-resend-modal {
+	margin-top: 4px;
+	display: inline-block;
+}

assets/scss/admin/license-activation.scss → assets/scss/admin/_modal-common.scss

@@ -1,3 +1,5 @@
+@import "../colors";
+
 .fs-modal {
 	position: fixed;
 	overflow: auto;
@@ -17,14 +19,14 @@
 		top: -100%;
 		z-index: 100001;
 		width: 596px;
-		
+
 		@media (max-width: 650px) {
 			margin-left: -50%;
 			box-sizing: border-box;
 			padding-left: 10px;
 			padding-right: 10px;
 			width: 100%;
-			
+
 			.fs-modal-panel > h3 > strong {
 				font-size: 1.3em;
 			}
@@ -53,18 +55,14 @@
 	.fs-modal-body {
 		border-bottom: 0;
 
-		input.license_key {
-			width: 100%;
-		}
-
 		p {
 			font-size: 14px;
 		}
 
 		h2 {
 			font-size: 20px;
 		}
-		
+
 		> div {
 			margin-top: 10px;
 
@@ -79,7 +77,7 @@
 	.fs-modal-footer {
 		border-top: #eeeeee solid 1px;
 		text-align: right;
-		
+
 		> .button {
 			margin: 0 7px;
 
@@ -89,8 +87,15 @@
 		}
 	}
 
-	.fs-modal-panel:not(.active) {
-		display: none;
+	.fs-modal-panel {
+		> .notice.inline {
+			margin: 0;
+			display: none;
+		}
+
+		&:not(.active) {
+			display: none;
+		}
 	}
 }
 

assets/scss/admin/account.scss

@@ -58,6 +58,10 @@
     }
 }
 
+#fs_account_details .button-group {
+    float: right;
+}
+
 .rtl #fs_account .fs-header-actions
 {
     left: 15px;
@@ -106,12 +110,21 @@
         padding: 10px;
     }
 
-    var, code
+    code {
+        line-height: 28px;
+    }
+
+    var, code, input[type="text"]
     {
         color: #0073AA;
         font-size: 16px;
         background: none;
     }
+
+    input[type="text"] {
+        width: 100%;
+        font-weight: bold;
+    }
 }
 
 label.fs-tag

assets/scss/admin/dialog-boxes.scss

@@ -0,0 +1,4 @@
+@import "modal-common";
+@import "deactivation-feedback";
+@import "license-activation";
+@import "license-key-resend";