Merge pull request #25 from AyeCode/master

pull
AyeCode · Apr 24, 2018 · 5974553 · 5974553
2 parents 1dcabc1 + 85efe48
commit 5974553
Show file tree

Hide file tree

Showing 28 changed files with 1,406 additions and 2,776 deletions.
diff --git a/assets/css/admin.css b/assets/css/admin.css
diff --git a/assets/css/admin.css.map b/assets/css/admin.css.map
diff --git a/assets/css/gd_core_frontend.css b/assets/css/gd_core_frontend.css
diff --git a/assets/css/gd_core_frontend.css.map b/assets/css/gd_core_frontend.css.map
diff --git a/assets/css/partials/_admin_cpt_settings.scss b/assets/css/partials/_admin_cpt_settings.scss
@@ -1,13 +1,15 @@
-//.gd-tabs-layout { // a wrapper makes the drag not appear
-
-  ///////////// imported styles
-  /**
-				 * Nestable
-				 */
-
 .gd-tabs-sortable{
   ul{
     padding-left: 25px;
+
+
+  }
+
+  li{
+    margin: 5px 0 !important;
+    form{
+      border: 1px #DFDFDF solid;
+    }
   }
 
   .dd-item,
@@ -25,12 +27,10 @@
   .dd-handle {
     display: block;
     height: 37px;
-    margin: 5px 0;
     padding: 5px 10px;
     color: #333;
     text-decoration: none;
     font-weight: bold;
-    border: 1px #DFDFDF solid;
     background: #F1F1F1;
     box-sizing: border-box;
     -moz-box-sizing: border-box;
@@ -43,14 +43,35 @@
     outline: 1px dashed #4183C4;
   }
 
+  li{
+    li{
+      .placeholder{
+        outline-color: red;
+      }
+    }
+
+  }
+
   .dd-item{
+
+    .dd-item{
+      .dd-setting{
+        &:not(.dd-type-fieldset)
+        .gd-notification.gd-warn{
+          display: block;
+        }
+      }
+
+    }
+
     &.ui-sortable-handle{
       background: none !important;
     }
-    i.fa{
+    i.fa-caret-down,i.fa-caret-up{
       position: absolute;
       right: 0;
       padding: 12px;
+      cursor: pointer;
     }
     .dd-key{
       float: right;
@@ -65,257 +86,38 @@
     }
     .dd-setting{
       display: none;
-    }
-
-  }
-}
-
-
-
-  .dd {
-    position: relative;
-    display: block;
-    margin: 0;
-    padding: 0;
-    max-width: 600px;
-    list-style: none;
-    font-size: 13px;
-    line-height: 20px;
-  }
 
-  .dd-list {
-    display: block;
-    position: relative;
-    margin: 0;
-    padding: 0;
-    list-style: none;
-  }
-  .dd-list .dd-list {
-    padding-left: 30px;
-  }
-  .dd-collapsed .dd-list {
-    display: none;
-  }
-
-  .dd-item,
-  .dd-empty,
-  .dd-placeholder {
-    display: block;
-    position: relative;
-    margin: 0;
-    padding: 0;
-    min-height: 20px;
-    font-size: 13px;
-    line-height: 25px;
-  }
-
-
-
-
-  .dd-item > button {
-    display: block;
-    position: relative;
-    cursor: pointer;
-    float: left;
-    width: 25px;
-    height: 20px;
-    margin: 5px 0;
-    padding: 0;
-    text-indent: 100%;
-    white-space: nowrap;
-    overflow: hidden;
-    border: 0;
-    background: transparent;
-    font-size: 12px;
-    line-height: 1;
-    text-align: center;
-    font-weight: bold;
-  }
-  .dd-item > button:before {
-    content: '+';
-    display: block;
-    position: absolute;
-    width: 100%;
-    text-align: center;
-    text-indent: 0;
-  }
-  .dd-item > button[data-action="collapse"]:before {
-    content: '-';
-  }
-
-  .dd-placeholder,
-  .dd-empty {
-    margin: 5px 0;
-    padding: 0;
-    min-height: 30px;
-    background: #f2fbff;
-    border: 1px dashed #b6bcbf;
-    box-sizing: border-box;
-    -moz-box-sizing: border-box;
-  }
-  .dd-empty {
-    border: 1px dashed #bbb;
-    min-height: 100px;
-    background-color: #e5e5e5;
-    background-image: -webkit-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff),
-    -webkit-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
-    background-image: -moz-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff),
-    -moz-linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
-    background-image: linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff),
-    linear-gradient(45deg, #fff 25%, transparent 25%, transparent 75%, #fff 75%, #fff);
-    background-size: 60px 60px;
-    background-position: 0 0, 30px 30px;
-  }
-
-  .dd-dragel {
-    position: absolute;
-    pointer-events: none;
-    z-index: 9999;
-  }
-  .dd-dragel > .dd-item .dd-handle {
-    margin-top: 0;
-  }
-  .dd-dragel .dd-handle {
-    -webkit-box-shadow: 2px 4px 6px 0 rgba(0, 0, 0, .1);
-    box-shadow: 2px 4px 6px 0 rgba(0, 0, 0, .1);
-  }
-
-  /**
-   * Nestable Extras
-   */
-
-  .nestable-lists {
-    display: block;
-    clear: both;
-    padding: 30px 0;
-    width: 100%;
-    border: 0;
-    border-top: 2px solid #ddd;
-    border-bottom: 2px solid #ddd;
-  }
-
-  #nestable-menu {
-    padding: 0;
-    margin: 20px 0;
-  }
-
-  #nestable-output,
-  #nestable2-output {
-    width: 100%;
-    height: 7em;
-    font-size: 0.75em;
-    line-height: 1.333333em;
-    font-family: Consolas, monospace;
-    padding: 5px;
-    box-sizing: border-box;
-    -moz-box-sizing: border-box;
-  }
-
-  #nestable2 .dd-handle {
-    color: #fff;
-    border: 1px solid #999;
-    background: #bbb;
-    background: -webkit-linear-gradient(top, #bbb 0%, #999 100%);
-    background: -moz-linear-gradient(top, #bbb 0%, #999 100%);
-    background: linear-gradient(top, #bbb 0%, #999 100%);
-  }
-  #nestable2 .dd-handle:hover {
-    background: #bbb;
-  }
-  #nestable2 .dd-item > button:before {
-    color: #fff;
-  }
+      .gd-notification.gd-warn{
+        display: none;
+      }
+      .gd-tab-actions{
+        a{
+          color: #a00;
+        }
+        input{
+          float: right;
+        }
+      }
 
-  @media only screen and (min-width: 700px) {
+      label{
+        width: 100%;
+        input,select,textarea{
+          width: 100%;
+        }
+      }
 
-    //.dd { float: left; width: 48%; }
-    .dd + .dd {
-      margin-left: 2%;
     }
 
   }
+}
 
-  .dd-hover > .dd-handle {
-    background: #2ea8e5 !important;
-  }
-
-  /**
-   * Nestable Draggable Handles
-   */
-
-  .dd3-content {
-    display: block;
-    height: 30px;
-    margin: 5px 0;
-    padding: 5px 10px 5px 40px;
-    color: #333;
-    text-decoration: none;
-    font-weight: bold;
-    border: 1px solid #ccc;
-    background: #fafafa;
-    background: -webkit-linear-gradient(top, #fafafa 0%, #eee 100%);
-    background: -moz-linear-gradient(top, #fafafa 0%, #eee 100%);
-    background: linear-gradient(top, #fafafa 0%, #eee 100%);
-    -webkit-border-radius: 3px;
-    border-radius: 3px;
-    box-sizing: border-box;
-    -moz-box-sizing: border-box;
-  }
-  .dd3-content:hover {
-    color: #2ea8e5;
-    background: #fff;
-  }
-
-  .dd-dragel > .dd3-item > .dd3-content {
-    margin: 0;
-  }
-
-  .dd3-item > button {
-    margin-left: 30px;
-  }
-
-  .dd3-handle {
-    position: absolute;
-    margin: 0;
-    left: 0;
-    top: 0;
-    cursor: pointer;
-    width: 30px;
-    text-indent: 100%;
-    white-space: nowrap;
-    overflow: hidden;
-    border: 1px solid #aaa;
-    background: #ddd;
-    background: -webkit-linear-gradient(top, #ddd 0%, #bbb 100%);
-    background: -moz-linear-gradient(top, #ddd 0%, #bbb 100%);
-    background: linear-gradient(top, #ddd 0%, #bbb 100%);
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-  }
-  .dd3-handle:before {
-    content: '≡';
-    display: block;
-    position: absolute;
-    left: 0;
-    top: 3px;
-    width: 100%;
-    text-align: center;
-    text-indent: 0;
-    color: #fff;
-    font-size: 20px;
-    font-weight: normal;
-  }
-  .dd3-handle:hover {
-    background: #ddd;
+.side-sortables {
+  &:first-child{
+    .gd-tabs-panel {
+      .super-duper-content-open {
+        display: none;
+      }
+    }
   }
+}
 
-  /**
-   * Socialite
-   */
-
-  .socialite {
-    display: block;
-    float: left;
-    height: 35px;
-  }
-//}
diff --git a/assets/css/partials/_notifications.scss b/assets/css/partials/_notifications.scss
@@ -38,10 +38,14 @@
   }
 
   // @todo we need to add different types here
-  .gd-info{
+  &.gd-info{
 
   }
 
+  &.gd-warn{
+    background: #fb887b;
+  }
+
   &.noti-white{
     background: white;
     color: #555;