Merge pull request #4936 from mempool/natsoni/add-wiz-theme
Add wiz theme
This commit is contained in:
		
						commit
						a4753769d2
					
				| @ -175,6 +175,11 @@ | |||||||
|                 "bundleName": "contrast", |                 "bundleName": "contrast", | ||||||
|                 "inject": false |                 "inject": false | ||||||
|               }, |               }, | ||||||
|  |               { | ||||||
|  |                 "input": "src/theme-wiz.scss", | ||||||
|  |                 "bundleName": "wiz", | ||||||
|  |                 "inject": false | ||||||
|  |               }, | ||||||
|               "node_modules/@fortawesome/fontawesome-svg-core/styles.css" |               "node_modules/@fortawesome/fontawesome-svg-core/styles.css" | ||||||
|             ], |             ], | ||||||
|             "vendorChunk": true, |             "vendorChunk": true, | ||||||
|  | |||||||
| @ -69,7 +69,7 @@ export default class BlockScene { | |||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   setColorFunction(colorFunction: ((tx: TxView) => Color) | null): void { |   setColorFunction(colorFunction: ((tx: TxView) => Color) | null): void { | ||||||
|     this.theme.theme !== 'default' ? this.getColor = colorFunction || contrastColorFunction : this.getColor = colorFunction || defaultColorFunction; |     this.theme.theme === 'contrast' ? this.getColor = colorFunction || contrastColorFunction : this.getColor = colorFunction || defaultColorFunction; | ||||||
|     this.updateAllColors(); |     this.updateAllColors(); | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
| @ -246,7 +246,7 @@ export default class BlockScene { | |||||||
|     this.flip = flip; |     this.flip = flip; | ||||||
|     this.vertexArray = vertexArray; |     this.vertexArray = vertexArray; | ||||||
|     this.highlightingEnabled = highlighting; |     this.highlightingEnabled = highlighting; | ||||||
|     theme.theme !== 'default' ? this.getColor = colorFunction || contrastColorFunction : this.getColor = colorFunction || defaultColorFunction; |     theme.theme === 'contrast' ? this.getColor = colorFunction || contrastColorFunction : this.getColor = colorFunction || defaultColorFunction; | ||||||
|     this.theme = theme; |     this.theme = theme; | ||||||
| 
 | 
 | ||||||
|     this.scene = { |     this.scene = { | ||||||
|  | |||||||
| @ -2,5 +2,6 @@ | |||||||
|     <select formControlName="theme" class="custom-select custom-select-sm form-control-secondary form-control mx-auto" (change)="changeTheme()"> |     <select formControlName="theme" class="custom-select custom-select-sm form-control-secondary form-control mx-auto" (change)="changeTheme()"> | ||||||
|         <option value="default" i18n="mempool-goggles.classic">Classic</option> |         <option value="default" i18n="mempool-goggles.classic">Classic</option> | ||||||
|         <option value="contrast">BlueMatt</option> |         <option value="contrast">BlueMatt</option> | ||||||
|  |         <option value="wiz">wiz</option> | ||||||
|     </select> |     </select> | ||||||
| </div> | </div> | ||||||
|  | |||||||
| @ -10,7 +10,7 @@ import { ThemeService } from '../../services/theme.service'; | |||||||
| }) | }) | ||||||
| export class ThemeSelectorComponent implements OnInit { | export class ThemeSelectorComponent implements OnInit { | ||||||
|   themeForm: UntypedFormGroup; |   themeForm: UntypedFormGroup; | ||||||
|   themes = ['default', 'contrast']; |   themes = ['default', 'contrast', 'wiz']; | ||||||
| 
 | 
 | ||||||
|   constructor( |   constructor( | ||||||
|     private formBuilder: UntypedFormBuilder, |     private formBuilder: UntypedFormBuilder, | ||||||
|  | |||||||
| @ -22,9 +22,7 @@ export class ThemeService { | |||||||
|   apply(theme) { |   apply(theme) { | ||||||
|     this.theme = theme; |     this.theme = theme; | ||||||
|     if (theme !== 'default') { |     if (theme !== 'default') { | ||||||
|       if (theme === 'contrast') { |       theme === 'contrast' ? this.mempoolFeeColors = contrastMempoolFeeColors : this.mempoolFeeColors = defaultMempoolFeeColors; | ||||||
|         this.mempoolFeeColors = contrastMempoolFeeColors; |  | ||||||
|       } |  | ||||||
|       try { |       try { | ||||||
|         if (!this.style) { |         if (!this.style) { | ||||||
|           this.style = document.createElement('link'); |           this.style = document.createElement('link'); | ||||||
|  | |||||||
							
								
								
									
										100
									
								
								frontend/src/theme-wiz.scss
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										100
									
								
								frontend/src/theme-wiz.scss
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,100 @@ | |||||||
|  | /* Theme */ | ||||||
|  | $bg: #11131f; | ||||||
|  | $active-bg: #000000; | ||||||
|  | $hover-bg: #12131e; | ||||||
|  | $fg: #fff; | ||||||
|  | $title-fg: #2055e3; | ||||||
|  | 
 | ||||||
|  | $taproot: #eba814; | ||||||
|  | $taproot-light: #d5a90a; | ||||||
|  | $taproot-dark: #9d7c05; | ||||||
|  | 
 | ||||||
|  | /* Bootstrap */ | ||||||
|  | $body-bg: $bg; | ||||||
|  | $body-color: $fg; | ||||||
|  | $gray-800: $bg; | ||||||
|  | $gray-700: $fg; | ||||||
|  | 
 | ||||||
|  | $nav-tabs-link-active-bg: $active-bg; | ||||||
|  | 
 | ||||||
|  | $primary: #007cfa; | ||||||
|  | $secondary: #272f4e; | ||||||
|  | $tertiary: #6225b2; | ||||||
|  | $success: #0aab2f; | ||||||
|  | $info: #10e0ff; | ||||||
|  | 
 | ||||||
|  | $h5-font-size: 1.15rem !default; | ||||||
|  | 
 | ||||||
|  | $pagination-bg: $body-bg; | ||||||
|  | $pagination-border-color: $gray-800; | ||||||
|  | $pagination-disabled-bg:           $fg; | ||||||
|  | $pagination-disabled-border-color: $bg; | ||||||
|  | $pagination-active-color:          $fg; | ||||||
|  | $pagination-active-bg:             $tertiary; | ||||||
|  | $pagination-hover-bg:              $hover-bg; | ||||||
|  | $pagination-hover-border-color:     $bg; | ||||||
|  | $pagination-disabled-bg:          $bg; | ||||||
|  | 
 | ||||||
|  | $custom-select-indicator-color: $fg; | ||||||
|  | 
 | ||||||
|  | .input-group-text { | ||||||
|  |   background-color: #1c2031 !important; | ||||||
|  |   border: 1px solid #20263e !important; | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | $link-color:                $info; | ||||||
|  | $link-decoration:           none !default; | ||||||
|  | $link-hover-color:          darken($link-color, 15%) !default; | ||||||
|  | $link-hover-decoration:     underline !default; | ||||||
|  | 
 | ||||||
|  | $dropdown-bg: $bg; | ||||||
|  | $dropdown-link-color: $fg; | ||||||
|  | 
 | ||||||
|  | $dropdown-link-hover-color: $fg; | ||||||
|  | $dropdown-link-hover-bg: $active-bg; | ||||||
|  | 
 | ||||||
|  | $dropdown-link-active-color: $fg; | ||||||
|  | $dropdown-link-active-bg: $active-bg; | ||||||
|  | 
 | ||||||
|  | :root { | ||||||
|  |   --bg: #{$bg}; | ||||||
|  |   --active-bg: #{$active-bg}; | ||||||
|  |   --hover-bg: #{$hover-bg}; | ||||||
|  |   --fg: #{$fg}; | ||||||
|  |   --color-fg: #fff; | ||||||
|  |   --title-fg: #{$title-fg}; | ||||||
|  | 
 | ||||||
|  |   --primary: #{$primary}; | ||||||
|  |   --secondary: #{$secondary}; | ||||||
|  |   --tertiary: #{$tertiary}; | ||||||
|  |   --success: #{$success}; | ||||||
|  |   --info: #{$info}; | ||||||
|  | 
 | ||||||
|  |   --box-bg: #171c2a; | ||||||
|  |   --stat-box-bg: #0b1018; | ||||||
|  |   --alert-bg: #3a1c61; | ||||||
|  |   --navbar-bg: #212121; | ||||||
|  |   --transparent-fg: #ffffffbb; | ||||||
|  |   --fade-out-box-bg-start: rgba(23, 28, 42, 0); | ||||||
|  |   --fade-out-box-bg-end: rgba(23, 28, 42, 1); | ||||||
|  | 
 | ||||||
|  |   --testnet: #1d486f; | ||||||
|  |   --signet: #6f1d5d; | ||||||
|  |   --liquid: #116761; | ||||||
|  |   --liquidtestnet: #494a4a; | ||||||
|  | 
 | ||||||
|  |   --mainnet-alt: #9339f4; | ||||||
|  |   --testnet-alt: #183550; | ||||||
|  |   --signet-alt: #471850; | ||||||
|  |   --liquidtestnet-alt: #272e46; | ||||||
|  | 
 | ||||||
|  |   --taproot: #eba814; | ||||||
|  |   --taproot-light: #d5a90a; | ||||||
|  |   --taproot-dark: #9d7c05; | ||||||
|  | 
 | ||||||
|  |   --green: #83fd00; | ||||||
|  |   --red: #ff3d00; | ||||||
|  |   --yellow: #ffcc00; | ||||||
|  |   --grey: #7e7e7e; | ||||||
|  |   --tooltip-grey: #b1b1b1; | ||||||
|  | } | ||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user