Merge pull request #154 from MachoThemes/cosmin-working-branch

[sync] Cosmin working branch
WPChill · Jul 30, 2018 · e7a5d5f · e7a5d5f
2 parents 7cf142a + 757e6c7
commit e7a5d5f
Show file tree

Hide file tree

Showing 62 changed files with 3,809 additions and 3,079 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/README.md b/README.md
@@ -1,4 +1,6 @@
-# Epsilon Framework v1.2.2
+# Epsilon Framework v1.2.3
 
-MachoThemes' theme framework.
+Built by Macho Themes.
+
+Special credits: @c0sm1n87
 
diff --git a/assets/css/scss/controls/color-picker.scss b/assets/css/scss/controls/color-picker.scss
@@ -24,7 +24,7 @@
         line-height: 24px;
     }
     .minicolors-panel {
-        top: 28px;
+        top: 23px;
         left: 37px;
     }
 }
@@ -58,8 +58,8 @@
     .epsilon-color-picker {
         z-index: 100;
         position: absolute;
-        top: -20px;
-        left: 50px;
+        top: 0;
+        left: 40px;
         opacity: 0;
         visibility: hidden;
         width: 153px !important;
@@ -88,5 +88,5 @@
 }
 
 .minicolors-position-left .minicolors-panel {
-    left: 50px;
+    left: 40px;
 }
diff --git a/assets/css/scss/controls/field-repeater.scss b/assets/css/scss/controls/field-repeater.scss
@@ -62,22 +62,13 @@
     }
     .repeater-row-header {
         position: relative;
-        padding: 12px 0 12px 26px;
+        padding: 12px 0 12px 12px;
         height: 20px;
         line-height: 20px;
         font-weight: 600;
         transition: .15s background-color ease-in-out;
         cursor: all-scroll;
-        &:before {
-            content: "";
-            width: 10px;
-            height: 20px;
-            background: url('../img/epsilon-section-hover-indicator.png');
-            position: absolute;
-            top: 12px;
-            left: 8px;
-            opacity: 0;
-        }
+
         .repeater-minimize,
         .repeater-row-remove {
             float: right;
@@ -94,10 +85,15 @@
             }
         }
         .repeater-row-remove {
-            border-left: 1px solid $repeater_row_separator_color;
+            border-right: 1px solid $repeater_row_separator_color;
             margin-top: -12px;
             padding: 12px;
         }
+	    .repeater-minimize {
+		    margin-top: -12px;
+		    padding: 12px;
+	    }
+
         &:hover {
             &:before {
                 opacity: 1;
@@ -115,12 +111,10 @@
         clear: both;
         padding: 18px 0 6px 0;
         .customize-control-title {
-            font-size: 13px;
             line-height: initial;
             display: inline-block;
         }
         .customize-control-description {
-            font-size: 13px;
             line-height: initial;
         }
         &.repeater-field-hidden {
@@ -146,7 +140,7 @@
     }
     .repeater-row-label {
         display: block;
-        width: calc(100% - 75px);
+        width: calc(100% - 100px);
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
@@ -209,22 +203,15 @@
     .customize-control-title {
         display: inline-block;
         float: left;
-        margin-bottom: 0;
+        margin-bottom: 10px;
         padding-bottom: 0;
-        position: relative;
-        top: 5px;
-    }
-}
 
-.customize-control-epsilon-text-editor {
-    .customize-control-title {
-        top: 2px;
     }
 }
 
 .repeater-field-epsilon-color-picker {
     .epsilon-color-picker-title {
-        margin-left: 37px;
+        margin-left: 42px;
     }
     .minicolors-input {
         top: 0;

diff --git a/assets/css/scss/controls/image.scss b/assets/css/scss/controls/image.scss
@@ -1,42 +1,45 @@
 .epsilon-controller-image-container {
-    .placeholder {
-        width: 100%;
-        position: relative;
-        text-align: center;
-        cursor: default;
-        border: 1px dashed #b4b9be;
-        -webkit-box-sizing: border-box;
-        -moz-box-sizing: border-box;
-        box-sizing: border-box;
-        padding: 6px 0;
-        line-height: 20px;
-        min-height: 40px;
-        margin-bottom: 6px;
-        .recommended-size {
-            display: block;
-            font-style: italic;
-        }
-    }
-    .epsilon-image {
-        border: 1px dashed #EEE;
-        padding: 6px;
-        margin-bottom: 6px;
-        min-height: 40px;
-        img {
-            width: 100%;
-            display: block;
-        }
-    }
-    .actions {
-        display: block;
-        text-align: center;
-        padding-bottom: 1px;
-        .image-upload-remove-button,
-        .image-upload-button,
-        .image-default-button {
-            margin: 0;
-            display: inline-block;
-            min-width: 30%;
-        }
-    }
+	.placeholder {
+		width: 100%;
+		position: relative;
+		text-align: center;
+		cursor: default;
+		border: 1px dashed #b4b9be;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+		padding: 6px 0;
+		line-height: 20px;
+		min-height: 40px;
+		margin-bottom: 6px;
+		.recommended-size {
+			display: block;
+			font-style: italic;
+		}
+	}
+	.epsilon-image {
+		border: 1px dashed #eee;
+		padding: 6px;
+		margin-bottom: 6px;
+		min-height: 40px;
+		img {
+			width: 100%;
+			display: block;
+		}
+	}
+	.actions {
+		display: block;
+		text-align: center;
+		padding-bottom: 1px;
+		.image-upload-button,
+		.image-default-button {
+			margin: 0;
+			display: inline-block;
+			min-width: 30%;
+		}
+		.image-upload-remove-button {
+			margin: 0;
+			display: inline-block;
+		}
+	}
 }