diff --git a/src/components/ChatMessage.jsx b/src/components/ChatMessage.jsx index c99fc06..31786fd 100644 --- a/src/components/ChatMessage.jsx +++ b/src/components/ChatMessage.jsx @@ -38,8 +38,6 @@ function ChatMessage({ className += ' redtext'; } - console.log('RENDER MESSAGE'); - const pArray = parseParagraph(msg); return ( diff --git a/src/components/UIPopUp.jsx b/src/components/UIPopUp.jsx index d4c8fba..f3d21df 100644 --- a/src/components/UIPopUp.jsx +++ b/src/components/UIPopUp.jsx @@ -32,12 +32,7 @@ const UIPopUp = () => { return (
{(windowType) diff --git a/src/ssr/PopUp.jsx b/src/ssr/PopUp.jsx index 69c2836..a572864 100644 --- a/src/ssr/PopUp.jsx +++ b/src/ssr/PopUp.jsx @@ -64,7 +64,7 @@ function generatePopUpPage(lang) { -
+ diff --git a/src/store/actions/index.js b/src/store/actions/index.js index 974345a..7976fbd 100644 --- a/src/store/actions/index.js +++ b/src/store/actions/index.js @@ -95,7 +95,7 @@ export function toggleOpenPalette() { export function selectStyle(style) { return { - type: 'SELECT_STYLE', + type: 's/SELECT_STYLE', style, }; } diff --git a/src/store/middleware/parent.js b/src/store/middleware/parent.js index bebcf4f..318e2bc 100644 --- a/src/store/middleware/parent.js +++ b/src/store/middleware/parent.js @@ -1,6 +1,9 @@ /* * send and receive actions from parent window */ + +/* eslint-disable no-console */ + import { load, unload } from '../actions'; const { origin } = window.location; @@ -41,7 +44,6 @@ export default (store) => (next) => (action) => { } }, 3000); } - console.log('GOT', action.data); return next(action.data); } diff --git a/src/store/middleware/popUps.js b/src/store/middleware/popUps.js index 66ac908..98eab20 100644 --- a/src/store/middleware/popUps.js +++ b/src/store/middleware/popUps.js @@ -1,6 +1,9 @@ /* * send and receive actions from popups */ + +/* eslint-disable no-console */ + import { propagateMe } from '../actions'; import popUps from '../../core/popUps'; @@ -31,6 +34,5 @@ export default (store) => (next) => (action) => { popUps.dispatch(action); } - console.log(action); return next(action); }; diff --git a/src/store/reducers/gui.js b/src/store/reducers/gui.js index 30ec71a..88b33c9 100644 --- a/src/store/reducers/gui.js +++ b/src/store/reducers/gui.js @@ -85,7 +85,7 @@ export default function gui( }; } - case 'SELECT_STYLE': { + case 's/SELECT_STYLE': { const { style } = action; return { ...state, diff --git a/src/styles/default.css b/src/styles/default.css index e1b4648..40968f9 100644 --- a/src/styles/default.css +++ b/src/styles/default.css @@ -523,6 +523,12 @@ tr:nth-child(even) { opacity: 0; } +.popup { + width: 100%; + height: 100%; + background-color: rgba(252, 252, 252, 0.95); +} + .modal-content { position: relative; width: calc(100% - 3px); @@ -537,7 +543,13 @@ tr:nth-child(even) { overflow-y: auto; } -.modal-content, .win-content { +.popup-content { + width: 100%; + height: 100%; + overflow-y: auto; +} + +.modal-content, .win-content, .popup-content { color: hsla(0, 0%, 0%, 0.6); font-size: 14px; font-weight: 500; diff --git a/src/styles/theme-arkeros.css b/src/styles/theme-arkeros.css index b6405f2..52c0d20 100644 --- a/src/styles/theme-arkeros.css +++ b/src/styles/theme-arkeros.css @@ -22,7 +22,7 @@ tr:nth-child(odd) { color: #ff91a6; } -.window { +.window, .popup { background: linear-gradient(1deg,#61dcea ,#ffb1e1,#ecffec,#fff9b1,#61dcea); } diff --git a/src/styles/theme-dark-round.css b/src/styles/theme-dark-round.css index 424ee8f..3fa36a9 100644 --- a/src/styles/theme-dark-round.css +++ b/src/styles/theme-dark-round.css @@ -22,25 +22,34 @@ a:hover { border-color: #d5d5d5; } -.tab-list-active { +.tab-list-item { + color: #e2e2e2; +} +.tab-list-item.active { background-color: #7b7b7b; + color: white; +} +.tab-list-item:not(.active):hover { + background-color: #636363; } tr:nth-child(even) { background-color: #505050; } -.window { +.window, .popup { background-color: rgba(59, 59, 59, 0.98); - border-radius: 5px; color: #f4f4f4; } +.window { + border-radius: 5px; +} .win-title { background-color: #c1c1c1; } -.win-topbar { +.win-topbar, .modal-topbtn { color: black; } @@ -48,11 +57,11 @@ tr:nth-child(even) { background-color: #dedede; } -.win-topbtn { +.win-topbtn, .modal-topbtn { background-color: #a6a4a4; } -.win-topbtn:hover { +.win-topbtn:hover, .modal-topbtn:hover { background-color: #8b8b8b; } @@ -99,7 +108,7 @@ tr:nth-child(even) { border-radius: 12px; } -.content { +.modal-content, .win-content, .popup-content { color: #f4f4f4; } @@ -123,15 +132,6 @@ h3, h4 { color: hsla(220, 100%, 95.3%, 0.6); } -.ModalClose, .ModalRestore { - background-color: #55555d; - border-color: #dcddde; -} - -.ModalClose:hover, .ModalRestore:hover { - background-color: #6f6f75; -} - .overlay { background-color: rgba(187, 187, 187, 0.75); } diff --git a/src/styles/theme-dark-sstraight.css b/src/styles/theme-dark-sstraight.css index 8cb2650..4a9a7d0 100644 --- a/src/styles/theme-dark-sstraight.css +++ b/src/styles/theme-dark-sstraight.css @@ -22,21 +22,30 @@ a:hover { border-color: #d5d5d5; } -.tab-list-active { +.tab-list-item { + color: #e2e2e2; +} +.tab-list-item.active { background-color: #7b7b7b; + color: white; +} +.tab-list-item:not(.active):hover { + background-color: #636363; } tr:nth-child(even) { background-color: #505050; } -.window { +.window, .popup { background-color: rgba(59, 59, 59, 0.98); - border-radius: 4px; color: #ff8c22; } +.window { + border-radius: 4px; +} -.win-topbar { +.win-topbar, .modal-topbtn { color: black; } @@ -49,11 +58,11 @@ tr:nth-child(even) { background-color: #dedede; } -.win-topbtn { +.win-topbtn, .modal-topbtn { background-color: #a6a4a4; } -.win-topbtn:hover { +.win-topbtn:hover, .modal-topbtn:hover { background-color: #8b8b8b; } @@ -104,7 +113,7 @@ tr:nth-child(even) { border-radius: 10px; } -.content { +.modal-content, .win-content, .popup-content { color: #f8f8f8; } @@ -128,15 +137,6 @@ h3, h4 { color: hsla(220, 100%, 95.3%, 0.6); } -.ModalClose, .ModalRestore { - background-color: #55555d; - border-color: #dcddde; -} - -.ModalClose:hover, .ModalRestore:hover { - background-color: #6f6f75; -} - .overlay { background-color: rgba(187, 187, 187, 0.75); } diff --git a/src/styles/theme-dark.css b/src/styles/theme-dark.css index 88cb09a..af0a1b5 100644 --- a/src/styles/theme-dark.css +++ b/src/styles/theme-dark.css @@ -22,15 +22,22 @@ a:hover { border-color: #d5d5d5; } -.tab-list-active { +.tab-list-item { + color: #e2e2e2; +} +.tab-list-item.active { background-color: #7b7b7b; + color: white; +} +.tab-list-item:not(.active):hover { + background-color: #636363; } tr:nth-child(even) { background-color: #505050; } -.window { +.window, .popup { background-color: rgba(59, 59, 59, 0.98); color: #f4f4f4; } @@ -39,7 +46,7 @@ tr:nth-child(even) { background-color: #c1c1c1; } -.win-topbar { +.win-topbar, .modal-topbtn { color: black; } @@ -47,11 +54,11 @@ tr:nth-child(even) { background-color: #dedede; } -.win-topbtn { +.win-topbtn, .modal-topbtn { background-color: #a6a4a4; } -.win-topbtn:hover { +.win-topbtn:hover, .modal-topbtn:hover { background-color: #8b8b8b; } @@ -70,7 +77,7 @@ tr:nth-child(even) { color: #f4f4f4; } -.content { +.modal-content, .win-content, .popup-content { color: #f4f4f4; } @@ -108,15 +115,6 @@ h3, h4 { color: hsla(220, 100%, 95.3%, 0.6); } -.ModalClose, .ModalRestore { - background-color: #55555d; - border-color: #dcddde; -} - -.ModalClose:hover, .ModalRestore:hover { - background-color: #6f6f75; -} - .overlay { background-color: rgba(187, 187, 187, 0.75); }