refactored sass files, finished styling of analytics table, minor bug…

… fixes
tpkemme · Mar 2, 2017 · 4467bdc · 4467bdc
1 parent eb5db57
commit 4467bdc
Show file tree

Hide file tree

Showing 20 changed files with 438 additions and 1,095 deletions.
diff --git a/.yo-rc.json b/.yo-rc.json
@@ -1,7 +1,7 @@
 {
   "generator-plugin-wp": {
     "name": "WP Cloudflare Dashboard",
-    "homepage": "https://tacticalwp.com",
+    "homepage": "https://tylerkemme.com",
     "description": "A Cloudflare Analytics Dashboard for Wordpress.",
     "version": "0.0.0",
     "author": "Tyler Kemme",

diff --git a/assets/README.md b/assets/README.md
diff --git a/assets/css/sass/cmb2.scss b/assets/css/sass/cmb2.scss
@@ -1,76 +1,63 @@
 /**
- * WP Cloudflare Dashboard
- * https://tacticalwp.com
+ * WP Cloudflare Dashboard CMB2 Styles
+ *
+ * Styles for the metabox/custom fields library CMB2
+ *
+ * https://tylerkemme.com
  *
  * Copyright (c) 2017 Tyler Kemme
  * Licensed under the GPLv2+ license.
- */
-.cmb-row {
-	padding: 7px 25px !important;
-}
-
-.cmb-td {
-	float: none !important;
-	display: inline-block;
-	width: 64%;
-}
-
-.cmb-th{
-	display: inline-block;
-	width: 33% !important;
-}
-
-.cmb-th label {
-    font-size: 15px;
-    font-weight: 700;
-}
-
-.cmb2-metabox.cmb-field-list .cmb-row.cmb-type-title {
-	padding: 8px 12px;
-	margin: 0;
-	margin-top:10px;
-	line-height: 1.4;
-	border: 1px solid #e5e5e5;
-	border-bottom: 1px solid #eee;
-}
-.cmb2-metabox.cmb-field-list .cmb-row {
-	background: #fff;
-	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
-	padding: 0 12px;
-	border: 1px solid #e5e5e5;
-	margin-top:-1px;
-}
-.cmb2-metabox.cmb-field-list .cmb-th {
-	font-weight: initial;
-}
-.cmb2-metabox.cmb-field-list .cmb2-metabox-title {
-	margin: 0;
-	padding:0;
-}
-.cmb-form .button-primary {
-    margin-top: 20px;
-}
-
-.cmb2-options-page > h2 {
-    padding: 10px 0px !important;
-}
-
+*/
 .cmb2-analytics{
 	background: #fff;
     padding: 20px 15px;
     border:  none;
     margin: 10px -4px;
-}
-
-.cmb2-analytics-data{
-	max-width: 97.5%;
-	padding: 20px 0;
-}
-
-.cmb2-analytics-data svg{
-	overflow: visible !important;
-}
 
-.cmb2-id-cloudflare-email-address {
-    margin-bottom: 15px !important;
+	.cmb2-analytics-data{
+		max-width: 97.5%;
+		padding: 20px 0;
+
+		svg{
+			overflow: visible !important;
+		}
+	}
+}
+
+.cmb2-options-page{
+	.cmb-form{
+		.cmb-row {
+			padding: 7px 25px !important;
+			margin-bottom: 10px;
+		    background: #fff;
+		    box-shadow: 0 1px 1px rgba(0,0,0,.04);
+		    border: 1px solid #e5e5e5;
+
+			.cmb-td {
+				float: none !important;
+				display: inline-block;
+				width: 64%;
+			}
+
+			.cmb-th{
+				display: inline-block;
+				width: 33% !important;
+
+				label {
+				    font-size: 15px;
+				    font-weight: 700;
+				}
+			}
+		}
+		.cmb-row.cmb2-id-cloudflare-email-address {
+		    margin-bottom: 15px !important;
+		}
+		.button-primary {
+		    margin-top: 20px;
+		}
+	}
+
+	> h2{
+		padding: 10px 0px !important;
+	}
 }
diff --git a/assets/css/sass/selectmenu.scss b/assets/css/sass/selectmenu.scss
@@ -1,82 +1,38 @@
 /**
  * WP Cloudflare Dashboard
- * https://tacticalwp.com
+ * https://tylerkemme.com
  *
  * Copyright (c) 2017 Tyler Kemme
  * Licensed under the GPLv2+ license.
- */
-h2 {
-	 margin: 30px 0 0 0;
-}
-fieldset {
-	border: 0;
-}
-label {
-	display: block;
-}
-
-/* select with custom icons */
-.ui-selectmenu-menu .ui-menu.customicons .ui-menu-item-wrapper {
-	padding: 0.5em 0 0.5em 3em;
-}
-.ui-selectmenu-menu .ui-menu.customicons .ui-menu-item .ui-icon {
-	height: 24px;
-	width: 24px;
-	top: 0.1em;
-}
-.ui-icon.status-green {
-	background-image: url("../images/status-green.png") !important;
-	background-size: contain;
-}
-.ui-icon.status-yellow {
-	background-image: url("../images/status-yellow.png") !important;
-	background-size: contain;
-}
-.ui-icon.status-red {
-	background-image: url("../images/status-red.png") !important;
-	background-size: contain;
-}
-
-/* select with CSS avatar icons */
-option.avatar {
-	background-repeat: no-repeat !important;
-	padding-left: 20px;
-}
-.avatar .ui-icon {
-	background-position: left top;
-}
-
-#zoneSelect-button,
-#timeSelect-button {
-    min-width: 250px;
-    margin: 10px 0px;
-}
-
-#zoneSelect-button:focus,
-#timeSelect-button:focus {
-    outline: none;
-}
-
-#timeSelect-menu li .ui-icon {
-    display: none;
-}
-
-#timeSelect-menu li {
-    padding-left: 1em;
-}
-
-.cmb-analytics-form #filter-select-form{
-	margin-bottom: 10px;
-}
-.cmb-analytics-form #filter-select-form, .cmb-analytics-form #analytics-tabs {
-    background: #fff;
-    box-shadow: 0 1px 1px rgba(0,0,0,.04);
-    padding: 15px 15px;
-    border: 1px solid #e5e5e5;
-}
-
-#filter-select-form fieldset {
-    border: 0;
-    display: inline-block;
-    width: 49%;
+*/
+.ui-selectmenu-menu {
+	.ui-menu.customicons {
+
+		.ui-menu-item-wrapper {
+			padding: 0.5em 0 0.5em 3em;
+		}
+
+		.ui-menu-item {
+			.ui-icon {
+				height: 24px;
+				width: 24px;
+				top: 0.1em;
+			}
+
+			.ui-icon.status-green {
+				background-image: url("../images/status-green.png") !important;
+				background-size: contain;
+			}
+
+			.ui-icon.status-yellow {
+				background-image: url("../images/status-yellow.png") !important;
+				background-size: contain;
+			}
+
+			.ui-icon.status-red {
+				background-image: url("../images/status-red.png") !important;
+				background-size: contain;
+			}
+		}
+	}
 }
diff --git a/assets/css/sass/styles.scss b/assets/css/sass/styles.scss
@@ -1,10 +1,11 @@
 /**
  * WP Cloudflare Dashboard
- * https://tacticalwp.com
+ * https://tylerkemme.com
  *
  * Copyright (c) 2017 Tyler Kemme
  * Licensed under the GPLv2+ license.
  */
 @import "cmb2";
 @import "tabs";
 @import "selectmenu";
+@import "wpcd";