-fixed some colors in themes

-fixed udapp and solidity activation
pull/5370/head
lianahus 3 years ago
parent e528784aff
commit 1d7e0d6834
  1. 5
      apps/remix-ide/src/app.js
  2. 2
      apps/remix-ide/src/assets/css/themes/remix-black_undtds.css
  3. 2
      apps/remix-ide/src/assets/css/themes/remix-candy_ikhg4m.css
  4. 4
      apps/remix-ide/src/assets/css/themes/remix-dark_tvx1s2.css
  5. 2
      apps/remix-ide/src/assets/css/themes/remix-light_powaqg.css
  6. 1
      libs/remix-ui/debugger-ui/src/lib/vm-debugger/assembly-items.tsx
  7. 20
      libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
  8. 2
      libs/remix-ui/editor/src/lib/syntax.ts

@ -505,11 +505,10 @@ class App {
} }
} }
}).catch(console.error) }).catch(console.error)
} else {
// activate solidity plugin
appManager.activatePlugin(['solidity', 'udapp'])
} }
}) })
// activate solidity plugin
appManager.activatePlugin(['solidity', 'udapp'])
// Load and start the service who manager layout and frame // Load and start the service who manager layout and frame
const framingService = new FramingService(sidePanel, menuicons, mainview, this._components.resizeFeature) const framingService = new FramingService(sidePanel, menuicons, mainview, this._components.resizeFeature)

@ -2,7 +2,7 @@
:root { :root {
--blue: #28282D; --blue: #28282D;
--indigo: #6610f2; --indigo: #6610f2;
--purple: #6f42c1; --purple: #9e77f6;
--pink: #e83e8c; --pink: #e83e8c;
--red: #823a3a; --red: #823a3a;
--orange: #8a5026; --orange: #8a5026;

@ -14,7 +14,7 @@
--gray-dark: #343a40; --gray-dark: #343a40;
--primary: #fc58a3; --primary: #fc58a3;
--secondary: #e2f5f2; --secondary: #e2f5f2;
--success: #84e5c2; --success: #24b882;
--info: #69c7e9; --info: #69c7e9;
--warning: #fbdf9f; --warning: #fbdf9f;
--danger: #f80b0b; --danger: #f80b0b;

@ -2,7 +2,7 @@
:root { :root {
--blue: #007aa6; --blue: #007aa6;
--indigo: #6610f2; --indigo: #6610f2;
--purple: #6f42c1; --purple: #9e77f6;
--pink: #e83e8c; --pink: #e83e8c;
--red: #b84040; --red: #b84040;
--orange: #c97539; --orange: #c97539;
@ -5651,7 +5651,7 @@ button.bg-success:hover {
background-color: #27926b !important; background-color: #27926b !important;
} }
.bg-info { .bg-info {
background-color: #355f7d !important; background-color: #274458 !important;
} }
a.bg-info:focus, a.bg-info:focus,
a.bg-info:hover, a.bg-info:hover,

@ -1,7 +1,7 @@
:root { :root {
--blue: #007bff; --blue: #007bff;
--indigo: #6610f2; --indigo: #6610f2;
--purple: #d145a7; --purple: #7c47b9;
--pink: #e83e8c; --pink: #e83e8c;
--red: #dc3545; --red: #dc3545;
--orange: #fd7e14; --orange: #fd7e14;

@ -98,7 +98,6 @@ export const AssemblyItems = ({ registerEvent }) => {
const currentItem = codeView.children[index] const currentItem = codeView.children[index]
if (currentItem) { if (currentItem) {
currentItem.style.setProperty('border-color', 'var(--warning)')
currentItem.style.setProperty('border-style', 'dotted') currentItem.style.setProperty('border-style', 'dotted')
currentItem.setAttribute('selected', 'selected') currentItem.setAttribute('selected', 'selected')
} }

@ -104,6 +104,7 @@ export const EditorUI = (props: EditorUIProps) => {
const locationColor = '#9e7e08' const locationColor = '#9e7e08'
const purpleColor = formatColor('--purple') const purpleColor = formatColor('--purple')
const dangerColor = formatColor('--danger') const dangerColor = formatColor('--danger')
const greenColor = formatColor('--green')
monaco.editor.defineTheme(themeName, { monaco.editor.defineTheme(themeName, {
base: themeType, base: themeType,
@ -148,14 +149,14 @@ export const EditorUI = (props: EditorUIProps) => {
{ token: 'keyword.storage', foreground: locationColor }, { token: 'keyword.storage', foreground: locationColor },
{ token: 'keyword.calldata', foreground: locationColor }, { token: 'keyword.calldata', foreground: locationColor },
// // forf functions and modifiers // for functions and modifiers
{ token: 'keyword.virtual', foreground: purpleColor }, { token: 'keyword.virtual', foreground: purpleColor },
// // for Events // for Events
{ token: 'keyword.indexed', foreground: yellowColor }, { token: 'keyword.indexed', foreground: yellowColor },
{ token: 'keyword.anonymous', foreground: yellowColor }, { token: 'keyword.anonymous', foreground: yellowColor },
// // for functions // for functions
{ token: 'keyword.external', foreground: successColor }, { token: 'keyword.external', foreground: successColor },
{ token: 'keyword.internal', foreground: successColor }, { token: 'keyword.internal', foreground: successColor },
{ token: 'keyword.private', foreground: successColor }, { token: 'keyword.private', foreground: successColor },
@ -172,7 +173,18 @@ export const EditorUI = (props: EditorUIProps) => {
// special functions // special functions
{ token: 'keyword.fallback', foreground: pinkColor }, { token: 'keyword.fallback', foreground: pinkColor },
{ token: 'keyword.receive', foreground: pinkColor }, { token: 'keyword.receive', foreground: pinkColor },
{ token: 'keyword.constructor', foreground: pinkColor } { token: 'keyword.constructor', foreground: pinkColor },
// identifiers
{ token: 'keyword.identifier', foreground: purpleColor },
{ token: 'keyword.for', foreground: purpleColor },
{ token: 'keyword.if', foreground: purpleColor },
{ token: 'keyword.else', foreground: purpleColor },
{ token: 'keyword.else', foreground: purpleColor },
{ token: 'keyword.else', foreground: purpleColor },
// returns
{ token: 'keyword.returns', foreground: greenColor }
], ],
colors: { colors: {

@ -1269,8 +1269,6 @@ export const language = {
'if', 'if',
'else', 'else',
'for', 'for',
'else',
'for',
'while', 'while',
'do', 'do',
'break', 'break',

Loading…
Cancel
Save