diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3979815b..7e6ef1f1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,7 +23,7 @@ Here's some quick bullet points as to what your code should be like on Mue: ### Features We prefer it if you implement features from our [projects board](https://github.com/mue/mue/projects). However, if you have an idea feel free to let us know first via a GitHub issue or our Discord server (see README for invite). Here's a quick list of things to look out for: -* External APIs - Please refrain from requesting to servers not on the ``muetab.com``, ``derpyenterprises.org`` or ``duckduckgo.com`` domains. Whenever possible, try to create +* External APIs - Please refrain from requesting to servers not on the ``muetab.com``, ``unsplash.com``, ``backblazeb2.com`` or ``duckduckgo.com`` domains. Whenever possible, try to create a "proxy" API service for requests to go through. Pull requests involving paid APIs or heavily limited free plans will be denied. * Clones - Please don't go blatantly copying features from the alternative extensions out there unless you have written permission from the original author of the project. Inspired features are fine. diff --git a/README.md b/README.md index 6743ca76..3e40984e 100644 --- a/README.md +++ b/README.md @@ -123,13 +123,12 @@ Please see our [roadmap](https://github.com/mue/mue/projects) ## Credits ### Core Team -#### Maintainers -[David Ralph (ohlookitsderpy)](https://github.com/ohlookitsderpy) - Lead development, photographer
- #### Developers +[David Ralph](https://github.com/davidjcralph) - Lead development, photographer
+ [Alex Sparkes](https://github.com/alexsparkes) - Name, lead design, photographer
-[Isaac (Eartharoid)](https://github.com/eartharoid) - QA, development, photographer
+[Isaac Saunders](https://github.com/eartharoid) - QA, development, photographer
[Wessel Tip](https://github.com/Wessel) - Development
diff --git a/src/components/modals/Main.jsx b/src/components/modals/Main.jsx index 3dd2840a..aca35d5c 100644 --- a/src/components/modals/Main.jsx +++ b/src/components/modals/Main.jsx @@ -4,7 +4,7 @@ import Settings from './tabs/Settings'; import Addons from './tabs/Addons'; import Marketplace from './tabs/Marketplace'; -import Navigation from './tabs-backend/Tabs'; +import Navigation from './tabs/backend/Tabs'; export default class MainModal extends React.PureComponent { render() { diff --git a/src/components/modals/tabs/Settings.jsx b/src/components/modals/tabs/Settings.jsx index 90439aad..5ef58822 100644 --- a/src/components/modals/tabs/Settings.jsx +++ b/src/components/modals/tabs/Settings.jsx @@ -9,7 +9,7 @@ import Quote from '../settings/sections/Quote'; import Appearance from '../settings/sections/Appearance'; import Background from '../settings/sections/Background'; -import SettingsTabs from '../tabs-backend/Tabs'; +import SettingsTabs from './backend/Tabs'; export default function Settings (props) { return ( diff --git a/src/components/modals/tabs-backend/Tab.jsx b/src/components/modals/tabs/backend/Tab.jsx similarity index 96% rename from src/components/modals/tabs-backend/Tab.jsx rename to src/components/modals/tabs/backend/Tab.jsx index 7422310c..c76c9482 100644 --- a/src/components/modals/tabs-backend/Tab.jsx +++ b/src/components/modals/tabs/backend/Tab.jsx @@ -1,22 +1,24 @@ import React from 'react'; -// navbar +// Navbar import Settings from '@material-ui/icons/Settings'; import Addons from '@material-ui/icons/Widgets'; import Marketplace from '@material-ui/icons/ShoppingBasket'; -// settings +// Settings import Time from '@material-ui/icons/AccessAlarm'; import Greeting from '@material-ui/icons/EmojiPeople'; import Quote from '@material-ui/icons/FormatQuote'; import Background from '@material-ui/icons/Photo'; import Search from '@material-ui/icons/Search'; -import About from '@material-ui/icons/Info'; -import Plugins from '@material-ui/icons/Widgets'; -import Added from '@material-ui/icons/AddCircle'; import Appearance from '@material-ui/icons/FormatPaint'; import Language from '@material-ui/icons/Translate'; import Changelog from '@material-ui/icons/NewReleasesRounded'; +import About from '@material-ui/icons/Info'; + +import Colors from '@material-ui/icons/ColorLens'; +import Plugins from '@material-ui/icons/Widgets'; +import Added from '@material-ui/icons/AddCircle'; export default class Tab extends React.PureComponent { onClick = () => { diff --git a/src/components/modals/tabs-backend/Tabs.jsx b/src/components/modals/tabs/backend/Tabs.jsx similarity index 99% rename from src/components/modals/tabs-backend/Tabs.jsx rename to src/components/modals/tabs/backend/Tabs.jsx index bbca6c87..0fbb2794 100644 --- a/src/components/modals/tabs-backend/Tabs.jsx +++ b/src/components/modals/tabs/backend/Tabs.jsx @@ -1,4 +1,5 @@ import React from 'react'; + import Tab from './Tab'; export default class Tabs extends React.PureComponent { diff --git a/src/scss/modules/modals/_main.scss b/src/scss/modules/modals/_main.scss index a2001fbd..728900c4 100644 --- a/src/scss/modules/modals/_main.scss +++ b/src/scss/modules/modals/_main.scss @@ -1,15 +1,14 @@ .Modal { - color: map-get($modal, "text"); - background-color: map-get($modal, "background"); + color: map-get($modal, 'text'); + background-color: map-get($modal, 'background'); box-shadow: 0 0 20px rgba(0, 0, 0, 0.3); border: none; opacity: 1; z-index: -2; padding: 25px; - cursor: hand; transition: 0.6s; transition-timing-function: ease-in; - border-radius: map-get($modal, "border-radius"); + border-radius: map-get($modal, 'border-radius'); -moz-user-select: none; -webkit-user-select: none; user-select: none; @@ -22,7 +21,6 @@ } } - .modalLink { color: #5352ed; cursor: pointer; @@ -149,8 +147,6 @@ ul.sidebar { padding-left: 0; height: 100%; background: #f0f0f0; - position: absolute; - overflow-y: show; left: 0; border-radius: 12px 0 0 12px; text-align: left; @@ -327,7 +323,7 @@ ul.sectionSelector { } .navbar-item-active { - background: map-get($theme-colours, "gradient"); + background: map-get($theme-colours, 'gradient'); -webkit-background-clip: text; background-clip: text; -webkit-text-fill-color: transparent; @@ -338,7 +334,7 @@ ul.sectionSelector { &:hover { opacity: .8; - background: map-get($theme-colours, "gradient"); + background: map-get($theme-colours, 'gradient'); -webkit-background-clip: text; background-clip: text; -webkit-text-fill-color: transparent;