Merge pull request #28 from gjovanovicst/main

Cosmetics - Add new default themes purple, violet dark and light version
adaleks · Nov 28, 2021 · d8a746c · d8a746c
2 parents 6e0db23 + 9f6c410
commit d8a746c
Show file tree

Hide file tree

Showing 14 changed files with 736 additions and 17 deletions.
diff --git a/packages/angular/package.json b/packages/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@anywhere-ui/angular",
-  "version": "0.2.0+6",
+  "version": "0.2.0+7",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -42,5 +42,5 @@
     "tslint": "~6.1.0",
     "typescript": "~4.4.4"
   },
-  "buildnum": "6"
+  "buildnum": "7"
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@anywhere-ui/core",
-  "version": "0.2.0+6",
+  "version": "0.2.0+7",
   "description": "AnywhereUI",
   "main": "dist/index.cjs.js",
   "module": "dist/index.js",
@@ -62,5 +62,5 @@
     "build": "^0.1.4",
     "run": "^1.4.0"
   },
-  "buildnum": "6"
+  "buildnum": "7"
 }
diff --git a/packages/core/src/app/components/app-config.js b/packages/core/src/app/components/app-config.js
@@ -175,6 +175,24 @@ template.innerHTML = `
                         </button>
                         <span>Violet</span>
                     </div>
+                    <div class="any-col-3">
+                        <button class="any-link" data-select-theme="anywhere-default-light-purple">
+                            <img src="assets/images/themes/anywhere-light-purple.png" alt="Adaleks Light Purple" />
+                        </button>
+                        <span>Purple</span>
+                    </div>
+                    <div class="any-col-3">
+                        <button class="any-link" data-select-theme="anywhere-default-dark-violet">
+                            <img src="assets/images/themes/anywhere-dark-violet.png" alt="Adaleks Dark Violet" />
+                        </button>
+                        <span>Violet</span>
+                    </div>
+                    <div class="any-col-3">
+                        <button class="any-link" data-select-theme="anywhere-default-dark-purple">
+                            <img src="assets/images/themes/anywhere-dark-purple.png" alt="Adaleks Dark Purple" />
+                        </button>
+                        <span>Purple</span>
+                    </div>
                 </div>
                 <h5>Bootstrap</h5>
                 <div class="any-grid free-themes">
@@ -213,6 +231,9 @@ class AppConfig extends HTMLElement {
     super();
     this.logoMap = {
       'anywhere-default': 'anywhere-default-violet.png',
+      'anywhere-default-dark-violet': 'anywhere-dark-violet.png',
+      'anywhere-default-dark-purple': 'anywhere-dark-purple.png',
+      'anywhere-default-light-purple': 'anywhere-light-purple.png',
       'bootstrap4-light-blue': 'bootstrap4-light-blue.svg',
       'bootstrap4-light-purple': 'bootstrap4-light-purple.svg',
       'bootstrap4-dark-blue': 'bootstrap4-dark-blue.svg',

diff --git a/packages/core/src/components/badge/badge.scss b/packages/core/src/components/badge/badge.scss
@@ -48,27 +48,27 @@
 
   .any-badge.any-badge-secondary {
     background-color: var(--secondaryButtonBg) !important;
-    color: var(--badgeTextColor) !important;
+    color: var(--secondaryButtonTextColor) !important;
   }
 
   .any-badge.any-badge-success {
     background-color: var(--successButtonBg) !important;
-    color: var(--badgeTextColor) !important;
+    color: var(--successButtonTextColor) !important;
   }
 
   .any-badge.any-badge-info {
     background-color: var(--infoButtonBg) !important;
-    color: var(--badgeTextColor) !important;
+    color: var(--infoButtonTextColor) !important;
   }
 
   .any-badge.any-badge-warning {
     background-color: var(--warningButtonBg) !important;
-    color: var(--textColor) !important;
+    color: var(--warningButtonTextColor) !important;
   }
 
   .any-badge.any-badge-danger {
     background-color: var(--dangerButtonBg) !important;
-    color: var(--badgeTextColor) !important;
+    color: var(--dangerButtonTextColor) !important;
   }
 
   .any-badge.any-badge-lg {

diff --git a/packages/core/src/components/button/button.scss b/packages/core/src/components/button/button.scss
@@ -775,7 +775,7 @@
 
   .any-button.any-button-link:enabled:active {
     background: transparent;
-    color: var(--buttonActiveBg);
+    color: var(--buttonBg);
     border-color: transparent;
   }
 }
diff --git a/packages/core/src/components/input-text/input-text.scss b/packages/core/src/components/input-text/input-text.scss
@@ -20,6 +20,10 @@
     margin: 0;
     outline: medium none;
 
+    &::placeholder {
+      color: var(--inputPlaceholderTextColor);
+    }
+
     &:not([disabled]) {
       &:hover {
         border-color: var(--inputHoverBorderColor);

diff --git a/packages/core/src/index.html b/packages/core/src/index.html
@@ -100,7 +100,7 @@
       <script type="module" src="/app/App.js"></script>
     </div>
     <div class="layout-footer">
-      <div class="layout-footer-left">AnywhereUI v<span id="any-ui-version">0.2.0+6</span> by <b>AdaleksTech</b></div>
+      <div class="layout-footer-left">AnywhereUI v<span id="any-ui-version">0.2.0+7</span> by <b>AdaleksTech</b></div>
       <div class="layout-footer-right">
         <a href="https://github.com/adaleks/anywhere-ui">
           <span class="iconify" data-icon="fa-brands:github" data-width="21" data-height="21"></span>

diff --git a/packages/core/src/themes/anywhere.global.scss b/packages/core/src/themes/anywhere.global.scss
@@ -1,4 +1,7 @@
 @import "./anywhere.theme.default.scss";
+@import "./anywhere.theme.default.dark-violet.scss";
+@import "./anywhere.theme.default.dark-purple.scss";
+@import "./anywhere.theme.default.light-purple.scss";
 @import "./anywhere.theme.bootstrap4-light-blue.scss";
 @import "./anywhere.theme.bootstrap4-light-purple.scss";
 @import "./anywhere.theme.bootstrap4-dark-blue.scss";