#6: refactoring

timble · Jun 8, 2018 · 9678fe6 · 9678fe6
1 parent ca2bc08
commit 9678fe6
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 38 deletions.
diff --git a/dist/css/admin.css b/dist/css/admin.css
@@ -1845,6 +1845,13 @@ body.k-is-resizing {
    * 3. Set opacity to 0 by default
    * 4. Hide overlay when screen is wide enough
    */
+  /* Image
+     ========================================================================== */
+  /**
+   * 1. Responsive images
+   * 2. Eliminating line-height bug when used alone in container
+   * 3. No hidden borders on parents
+   */
   /* Anchor
      ========================================================================== */
   /* Backface visibility
@@ -1882,13 +1889,6 @@ body.k-is-resizing {
    * 3. Set basic font here. Other systems could set font on `<body>` element to override this.
    *    We're just making sure there's alwas a default font available
    */
-  /* Image
-     ========================================================================== */
-  /**
-   * 1. Responsive images
-   * 2. Eliminating line-height bug when used alone in container
-   * 3. No hidden borders on parents
-   */
   /* Normalize form controls
      ========================================================================== */
   /**
@@ -3946,6 +3946,26 @@ body.k-is-resizing {
   -webkit-backface-visibility: hidden;
 }
 
+.k-ui-namespace img {
+  max-width: 100%;
+  /* 1 */
+  height: auto;
+}
+
+.k-ui-namespace img:only-child {
+  vertical-align: middle;
+  /* 2 */
+  -webkit-backface-visibility: hidden;
+          backface-visibility: hidden;
+  /* 3 */
+}
+
+.k-ui-namespace .k-image-16 {
+  min-width: 16px;
+  width: 16px;
+  max-width: 16px;
+}
+
 .k-ui-namespace a {
   color: #222222;
   cursor: pointer;
@@ -4106,26 +4126,6 @@ body.k-is-resizing {
   -moz-osx-font-smoothing: grayscale;
 }
 
-.k-ui-namespace img {
-  max-width: 100%;
-  /* 1 */
-  height: auto;
-}
-
-.k-ui-namespace img:only-child {
-  vertical-align: middle;
-  /* 2 */
-  -webkit-backface-visibility: hidden;
-          backface-visibility: hidden;
-  /* 3 */
-}
-
-.k-ui-namespace .k-image-16 {
-  min-width: 16px;
-  width: 16px;
-  max-width: 16px;
-}
-
 .k-ui-namespace input[type="search"] {
   box-sizing: border-box;
   /* 1 */

diff --git a/dist/css/admin.min.css b/dist/css/admin.min.css
diff --git a/dist/css/site.css b/dist/css/site.css
@@ -3,8 +3,8 @@
      ========================================================================== */
 @font-face {
   font-family: "k-icons";
-  src: url("../../koowa/com_koowa/fonts/k-icons/k-icons.eot");
-  src: url("../../koowa/com_koowa/fonts/k-icons/k-icons.eot?#iefix") format("embedded-opentype"), url("../../koowa/com_koowa/fonts/k-icons/k-icons.woff") format("woff"), url("../../koowa/com_koowa/fonts/k-icons/k-icons.ttf") format("truetype"), url("../../koowa/com_koowa/fonts/k-icons/k-icons.svg#k-icons") format("svg");
+  src: url("../fonts/k-icons/k-icons.eot");
+  src: url("../fonts/k-icons/k-icons.eot?#iefix") format("embedded-opentype"), url("../fonts/k-icons/k-icons.woff") format("woff"), url("../fonts/k-icons/k-icons.ttf") format("truetype"), url("../fonts/k-icons/k-icons.svg#k-icons") format("svg");
   font-weight: normal;
   font-style: normal;
 }
@@ -17,7 +17,7 @@
 @media screen and (-webkit-min-device-pixel-ratio: 0) {
   @font-face {
     font-family: "k-icons";
-    src: url("../../koowa/com_koowa/fonts/k-icons/k-icons.svg#k-icons") format("svg");
+    src: url("../fonts/k-icons/k-icons.svg#k-icons") format("svg");
   }
 }
 

diff --git a/dist/css/site.min.css b/dist/css/site.min.css
diff --git a/src/scss/admin/core/_core.scss b/src/scss/admin/core/_core.scss
@@ -29,7 +29,7 @@
 
   // Base
 
-  @import "../atoms/boxsizing";
+  @import "../../shared/atoms/boxsizing";
   @import "../3rdparty/normalize";
 
 
@@ -51,14 +51,14 @@
 
   // Atoms
 
+  @import "../../shared/atoms/img";
   @import "../atoms/a";
   @import "../atoms/backface-visibility";
   @import "../atoms/body";
   @import "../atoms/dl";
   @import "../atoms/fieldset";
   @import "../atoms/heading";
   @import "../atoms/html";
-  @import "../atoms/img";
   @import "../atoms/input";
   @import "../atoms/label";
   @import "../atoms/legend";

diff --git a/src/scss/admin/atoms/_boxsizing.scss → src/scss/shared/atoms/_boxsizing.scss b/src/scss/admin/atoms/_boxsizing.scss → src/scss/shared/atoms/_boxsizing.scss
diff --git a/src/scss/admin/atoms/_img.scss → src/scss/shared/atoms/_img.scss b/src/scss/admin/atoms/_img.scss → src/scss/shared/atoms/_img.scss
diff --git a/src/scss/site/core/_core.scss b/src/scss/site/core/_core.scss
@@ -8,7 +8,8 @@
 // This file is being generated by grunt-webfont
 // To change this file, change the src/icons/template.css file
 
-$k-icon-path: '../../koowa/com_koowa/fonts';
+//$k-icon-path: '../../koowa/com_koowa/fonts';
+$k-icon-path: '../fonts';
 @import "../../admin/generated/k-icons";
 
 
@@ -32,13 +33,13 @@ $k-icon-path: '../../koowa/com_koowa/fonts';
 
   // Base
 
-  @import "../../admin/atoms/boxsizing";
+  @import "../../shared/atoms/boxsizing";
   @import "../utilities/reset";
 
 
-  // Custom selected admin atoms (@TODO: place in shared folder?)
+  // Custom selected admin atoms
 
-  @import "../../admin/atoms/img";
+  @import "../../shared/atoms/img";
 
 
   // Custom selected admin molecules (@TODO: place in shared folder?)