diff options
| author | Aubrey-Li <63608597+Aubrey-Li@users.noreply.github.com> | 2021-07-31 22:16:18 -0700 |
|---|---|---|
| committer | Aubrey-Li <63608597+Aubrey-Li@users.noreply.github.com> | 2021-07-31 22:16:18 -0700 |
| commit | 871205c74367b333eb59c3941be000092cab5e0d (patch) | |
| tree | d367a8c9a9a4e9a2b4e8e793ff78e92ef994a514 /src/client/views/global | |
| parent | 7e11e24fcdd9c086d63c643d6ee092c952d2e327 (diff) | |
| parent | b1361eec6d3f554d4927931c339b5c169b9a54a7 (diff) | |
Merge branch 'master' into aubrey-bugfix
Diffstat (limited to 'src/client/views/global')
| -rw-r--r-- | src/client/views/global/globalCssVariables.scss | 9 | ||||
| -rw-r--r-- | src/client/views/global/globalEnums.tsx | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/client/views/global/globalCssVariables.scss b/src/client/views/global/globalCssVariables.scss index ead5e166e..1b881ba43 100644 --- a/src/client/views/global/globalCssVariables.scss +++ b/src/client/views/global/globalCssVariables.scss @@ -11,6 +11,8 @@ $medium-blue: #4476F7; $pink: #E0217D; $yellow: #F5D747; +$close-red: #e48282; + $drop-shadow: "#32323215"; //padding @@ -21,8 +23,6 @@ $large-padding: 32px; //icon sizes $icon-size: 28px; -$antimodemenu-height: 36px; - // fonts $sans-serif: "Noto Sans", sans-serif; $large-header: 16px; @@ -33,11 +33,16 @@ $small-text: 9px; // misc values $border-radius: 0.3em; $search-thumnail-size: 130; +$topbar-height: 32px; +$antimodemenu-height: 36px; // dragged items $contextMenu-zindex: 100000; // context menu shows up over everything $radialMenu-zindex: 100000; // context menu shows up over everything +// borders +$standard-border: solid 1px #9F9F9F; + $searchpanel-height: 32px; $mainTextInput-zindex: 999; // then text input overlay so that it's context menu will appear over decorations, etc $docDecorations-zindex: 998; // then doc decorations appear over everything else diff --git a/src/client/views/global/globalEnums.tsx b/src/client/views/global/globalEnums.tsx index 1e0381c33..2aeb8e338 100644 --- a/src/client/views/global/globalEnums.tsx +++ b/src/client/views/global/globalEnums.tsx @@ -31,4 +31,8 @@ export enum Padding { export enum IconSizes { ICON_SIZE = "28px", +} + +export enum Borders { + STANDARD = "solid 1px #9F9F9F" }
\ No newline at end of file |