diff options
| author | mehekj <mehek.jethani@gmail.com> | 2021-07-31 15:39:27 -0400 |
|---|---|---|
| committer | mehekj <mehek.jethani@gmail.com> | 2021-07-31 15:39:27 -0400 |
| commit | 2e1f7c626306a054c036c91a98e5dabee3b39ef8 (patch) | |
| tree | 9a08876f93ecffbcc5f2cbd31b0797289fb188d2 /src/client/views/global | |
| parent | 11e95e35cde6e0c2390380975327f20eb5f3d1a4 (diff) | |
| parent | 41ccf50f2b551edd6827c9fd6296b9ff87a65915 (diff) | |
Merge branch 'master' into temporalmedia-mehek
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..a9f33c4da 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; +$logout-red: #ca4444; + $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 |