You've already forked matrix-react-sdk
mirror of
https://github.com/matrix-org/matrix-react-sdk.git
synced 2025-08-09 08:42:50 +03:00
Rename dharma theme to light theme
This commit is contained in:
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
/* TODO: Consider unifying with general input styles in _dharma.scss */
|
||||
/* TODO: Consider unifying with general input styles in _light.scss */
|
||||
|
||||
.mx_Field {
|
||||
position: relative;
|
||||
|
@@ -1,5 +1,5 @@
|
||||
@import "../../dharma/css/_paths.scss";
|
||||
@import "../../dharma/css/_fonts.scss";
|
||||
@import "../../dharma/css/_dharma.scss";
|
||||
@import "../../light/css/_paths.scss";
|
||||
@import "../../light/css/_fonts.scss";
|
||||
@import "../../light/css/_light.scss";
|
||||
@import "_dark.scss";
|
||||
@import "../../../../res/css/_components.scss";
|
||||
|
@@ -1,4 +1,4 @@
|
||||
@import "_paths.scss";
|
||||
@import "_fonts.scss";
|
||||
@import "_dharma.scss";
|
||||
@import "_light.scss";
|
||||
@import "../../../../res/css/_components.scss";
|
@@ -145,7 +145,7 @@ export default class GeneralUserSettingsTab extends React.Component {
|
||||
<span className="mx_SettingsTab_subheading">{_t("Theme")}</span>
|
||||
<Field id="theme" label={_t("Theme")} element="select"
|
||||
value={this.state.theme} onChange={this._onThemeChange}>
|
||||
<option value="dharma">{_t("Default theme")}</option>
|
||||
<option value="light">{_t("Default theme")}</option>
|
||||
<option value="dark">{_t("Dark theme")}</option>
|
||||
</Field>
|
||||
<SettingsFlag name="useCompactLayout" level={SettingLevel.ACCOUNT} />
|
||||
|
@@ -233,7 +233,7 @@ export const SETTINGS = {
|
||||
},
|
||||
"theme": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
default: "dharma",
|
||||
default: "light",
|
||||
controller: new ThemeController(),
|
||||
},
|
||||
"webRtcForcePeerToPeer": {
|
||||
|
@@ -17,7 +17,7 @@ limitations under the License.
|
||||
import SettingController from "./SettingController";
|
||||
|
||||
const SUPPORTED_THEMES = [
|
||||
"dharma",
|
||||
"light",
|
||||
"dark",
|
||||
];
|
||||
|
||||
@@ -25,7 +25,7 @@ export default class ThemeController extends SettingController {
|
||||
getValueOverride(level, roomId, calculatedValue, calculatedAtLevel) {
|
||||
// Override in case some no longer supported theme is stored here
|
||||
if (!SUPPORTED_THEMES.includes(calculatedValue)) {
|
||||
return "dharma";
|
||||
return "light";
|
||||
}
|
||||
|
||||
return null; // no override
|
||||
|
Reference in New Issue
Block a user