mirrors/mue
1
0
Fork 0
mirror of https://github.com/mue/mue.git synced 2026-07-16 13:34:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Solved padding issue

Browse Source 
* Solved margin and colour issue of text
* Addressed some small code-style tweaks that need doing as well before this can be merged
This commit is contained in:
MrOnosa
2020-10-30 19:36:40 -05:00
parent 1245d58b7e
commit 492b3b6715
7 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/modals/settings/Section.jsx
View File

@@ -20,7 +20,7 @@ export default class Section extends React.PureComponent {
transform: transform
});
if(this.props.onToggle) {
if (this.props.onToggle) {
this.props.onToggle(display);
}
}

11
src/components/modals/settings/sections/BackgroundSettings.jsx
View File

@@ -4,9 +4,8 @@ import Checkbox from '../Checkbox';
import Dropdown from '../Dropdown';
import Section from '../Section';
import { ColorPicker } from 'react-color-gradient-picker';
import 'react-color-gradient-picker/dist/index.css';
import hexToRgb from '../../../../helpers/hexToRgb'
import rgbToHex from '../../../../helpers/rgbToHex'
import hexToRgb from '../../../../helpers/hexToRgb';
import rgbToHex from '../../../../helpers/rgbToHex';
export default class BackgroundSettings extends React.PureComponent {
DefaultGradientSettings = { "angle": "180", "gradient": [{ "colour": this.props.language.background.disabled, "stop": 0 }], "type": "linear" };
@@ -42,7 +41,7 @@ export default class BackgroundSettings extends React.PureComponent {
toast(this.props.toastLanguage.reset);
}
mapFromGradientSettingsToColorPickerInitalState(gradientSettings) {
InitializeColorPickerState(gradientSettings) {
this.GradientPickerInitalState = {
points: gradientSettings.gradient.map((g) => {
const rgb = hexToRgb(g.colour);
@@ -137,7 +136,7 @@ export default class BackgroundSettings extends React.PureComponent {
}
onColorPickerChange = (attrs, name) => {
if(process.env.NODE_ENV == 'development'){
if (process.env.NODE_ENV == 'development'){
console.log(attrs, name);
}
this.setState({
@@ -160,7 +159,7 @@ export default class BackgroundSettings extends React.PureComponent {
let gradientInputs;
if (gradientHasMoreThanOneColour) {
if (this.GradientPickerInitalState === undefined) {
this.mapFromGradientSettingsToColorPickerInitalState(this.state.gradientSettings);
this.InitializeColorPickerState(this.state.gradientSettings);
}
gradientInputs = (<ColorPicker
onStartChange={color => this.onColorPickerChange(color, 'start')}

4
src/components/widgets/Background.jsx
View File

@@ -6,7 +6,7 @@ export default class Background extends React.PureComponent {
const { type, angle, gradient } = gradientSettings;
let style = `background: ${gradient[0].colour};`;
if (gradient.length > 1) {
//Note: Append the gradient for additional browser support.
// Note: Append the gradient for additional browser support.
const stepStyles = gradient.map(g => ` ${g.colour} ${g.stop}%`).join();
style += ` background: ${type}-gradient(${(type === 'linear' ? (`${angle}deg,`) : '')}${stepStyles})`;
}
@@ -20,7 +20,7 @@ export default class Background extends React.PureComponent {
} catch (e) {
const hexColorRegex = /#[0-9a-fA-F]{6}/s;
if (hexColorRegex.exec(colour)) {
//colour use to be simply a hex colour or a NULL value before it was a JSON object. This automatically upgrades the hex colour value to the new standard. (NULL would not trigger an exception)
// Colour use to be simply a hex colour or a NULL value before it was a JSON object. This automatically upgrades the hex colour value to the new standard. (NULL would not trigger an exception)
gradientSettings = { "type": "linear", "angle": "180", "gradient": [{ "colour": colour, "stop": 0 }] };
localStorage.setItem('customBackgroundColour', JSON.stringify(gradientSettings));
}