fix(fe/styles): clean up incorrect styles

This commit is contained in:
hexxa 2022-03-19 17:51:06 +08:00 committed by Hexxa
parent 18aa61a0f8
commit c8c7450583
8 changed files with 17 additions and 28 deletions

View file

@ -164,7 +164,7 @@
.theme-dark input { .theme-dark input {
font-size: 1.2rem; font-size: 1.2rem;
color: #999; color: #999;
background-color: rgb(64 64 64); background-color: #404040;
border: solid 1px #95a5a6; border: solid 1px #95a5a6;
} }
@ -348,10 +348,10 @@
color: #f1c40f; color: #f1c40f;
} }
.theme-dark .major-bg { .theme-dark .major-bg {
background-color: #242424; background-color: #404040;
} }
.theme-dark .normal-bg { .theme-dark .normal-bg {
background-color: #697384; background-color: #242424;
} }
.theme-dark .focus-bg { .theme-dark .focus-bg {
background-color: #16a085; background-color: #16a085;
@ -374,5 +374,5 @@
} }
.theme-dark .button-default { .theme-dark .button-default {
color: #999; color: #999;
background-color: rgb(64 64 64); background-color: #404040;
} }

View file

@ -258,7 +258,6 @@
padding: 1rem; padding: 1rem;
color: #697384; color: #697384;
margin: 1rem 0 0 0; margin: 1rem 0 0 0;
background-color: #f6f6f6;
white-space: nowrap; white-space: nowrap;
overflow: auto; overflow: auto;
} }
@ -347,23 +346,17 @@
color: #f1c40f; color: #f1c40f;
} }
.theme-default .lightest-bg {
background-color: white;
}
.theme-default .major-bg { .theme-default .major-bg {
background-color: #f6f6f6; background-color: #f6f6f6;
} }
.theme-default .normal-bg { .theme-default .normal-bg {
background-color: #ecf0f6; background-color: white;
} }
.theme-default .focus-bg { .theme-default .focus-bg {
background-color: #16a085; background-color: #16a085;
} }
.theme-default .minor-bg { .theme-default .minor-bg {
background-color: #2c3e50; background-color: #ecf0f6;
}
.theme-default button {
background-color: rgba(0, 0, 0, 0.3);
} }
.theme-default ::placeholder { .theme-default ::placeholder {
color: #95a5a6; color: #95a5a6;
@ -374,9 +367,6 @@
.theme-default a:hover { .theme-default a:hover {
color: cc#2ecc71; color: cc#2ecc71;
} }
.theme-default input {
background-color: rgba(0, 0, 0, 0.15);
}
.theme-default input:focus { .theme-default input:focus {
opacity: 0.8; opacity: 0.8;
box-shadow: 0 0.1rem 1rem rgba(22, 160, 133, 0.1); box-shadow: 0 0.1rem 1rem rgba(22, 160, 133, 0.1);

View file

@ -43,7 +43,7 @@ export class Tabs extends React.Component<Props, State, {}> {
const titleIcon = const titleIcon =
this.props.titleIcon != null this.props.titleIcon != null
? getIcon(this.props.titleIcon, "2rem", "major") ? getIcon(this.props.titleIcon, "2rem", "normal")
: null; : null;
const options = this.props.ui.control.options.get(this.props.targetControl); const options = this.props.ui.control.options.get(this.props.targetControl);
const tabs = options.map((option: string) => { const tabs = options.map((option: string) => {
@ -51,10 +51,10 @@ export class Tabs extends React.Component<Props, State, {}> {
? this.props.tabIcons.get(option) ? this.props.tabIcons.get(option)
: defaultIconProps; : defaultIconProps;
const iconColor = displaying === option ? iconProps.color : "major"; const iconColor = displaying === option ? iconProps.color : "normal";
const icon = getIcon(iconProps.name, iconProps.size, iconColor); const icon = getIcon(iconProps.name, iconProps.size, iconColor);
const fontColor = const fontColor =
displaying === option ? `${colorClass(iconColor)}-font` : "major-font"; displaying === option ? `${colorClass(iconColor)}-font` : "normal-font";
return ( return (
<button <button

View file

@ -12,7 +12,6 @@ import { Container } from "./layout/container";
import { LoginProps } from "./pane_login"; import { LoginProps } from "./pane_login";
import { roleAdmin } from "../client"; import { roleAdmin } from "../client";
import { settingsTabsCtrl } from "../common/controls"; import { settingsTabsCtrl } from "../common/controls";
import { Title } from "./visual/title";
export interface Props { export interface Props {
admin: AdminProps; admin: AdminProps;

View file

@ -101,7 +101,7 @@ export class Layers extends React.Component<Props, State, {}> {
children={List([ children={List([
<Title <Title
title={this.props.msg.pkg.get("pane.settings")} title={this.props.msg.pkg.get("pane.settings")}
iconColor="black" iconColor="major"
iconName="RiListSettingsFill" iconName="RiListSettingsFill"
/>, />,
<button <button

View file

@ -247,7 +247,7 @@ export class UserForm extends React.Component<
<div></div> <div></div>
<div className={`info ${foldedClass}`}> <div className={`info major-bg ${foldedClass}`}>
<div> <div>
<Flexbox <Flexbox
children={List([ children={List([

View file

@ -552,7 +552,7 @@ export class FilesPanel extends React.Component<Props, State, {}> {
? "margin-t-m padding-m" ? "margin-t-m padding-m"
: "no-height"; : "no-height";
const desc = ( const desc = (
<div className={`${descStateClass} desc major-font minor-bg`}> <div className={`${descStateClass} major-font major-bg`}>
<div className="column"> <div className="column">
<div className="card"> <div className="card">
<span className="title-m minor-font">{pathTitle}</span> <span className="title-m minor-font">{pathTitle}</span>
@ -584,7 +584,7 @@ export class FilesPanel extends React.Component<Props, State, {}> {
])} ])}
childrenStyles={List([{}, { justifyContent: "flex-end" }])} childrenStyles={List([{}, { justifyContent: "flex-end" }])}
/> />
<div className="info">{item.sha1}</div> <div className="info minor-bg">{item.sha1}</div>
</div> </div>
</div> </div>
</div> </div>
@ -645,7 +645,7 @@ export class FilesPanel extends React.Component<Props, State, {}> {
<Container> <Container>
<Title <Title
title={this.props.msg.pkg.get("endpoints")} title={this.props.msg.pkg.get("endpoints")}
iconColor="major" iconColor="normal"
iconName="RiGridFill" iconName="RiGridFill"
/> />
<div className="hr"></div> <div className="hr"></div>

View file

@ -55,7 +55,7 @@ export class TopBar extends React.Component<Props, State, {}> {
: ""; : "";
return ( return (
<div id="top-bar" className="focus-font major-bg"> <div id="top-bar" className="focus-font normal-bg">
<Flexbox <Flexbox
children={List([ children={List([
<a <a