Skip to content

Commit

Permalink
Merge branch 'lint-css' into lint-css-test
Browse files Browse the repository at this point in the history
# Conflicts:
#	new-log-viewer/src/index.css
  • Loading branch information
junhaoliao committed Sep 11, 2024
2 parents 9663f87 + bf6b072 commit b328858
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 13 deletions.
22 changes: 14 additions & 8 deletions new-log-viewer/src/components/DropFileContainer/index.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.drop-file-container {
position: relative;
width: 100%;
height: 100%;
position: relative;
}

.drop-file-children {
Expand All @@ -11,21 +11,27 @@

.hover-mask {
position: absolute;
z-index: var(--ylv-drop-file-container-hover-mask-z-index);
top: 0;
width: 100%;
height: 100%;
background-color: rgba(2, 88, 168, 0.2);

display: flex;
align-items: center;
justify-content: center;
z-index: var(--ylv-drop-file-container-hover-mask-z-index);

width: 100%;
height: 100%;

background-color: rgb(2 88 168 / 20%);
}

.hover-message {
z-index: var(--ylv-drop-file-container-hover-message-z-index);

padding: 8px;
color: #616161;
font-size: 0.875rem;

font-family: var(--ylv-ui-font-family), sans-serif;
font-size: 0.875rem;
color: #616161;

background-color: #f3f3f3;
z-index: var(--ylv-drop-file-container-hover-message-z-index);
}
12 changes: 7 additions & 5 deletions new-log-viewer/src/index.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
html, body, #root {
margin: 0;
height: 100%;
html,
body,
#root {
width: 100%;
height: 100%;
margin: 0;
}

html {
Expand All @@ -10,8 +12,8 @@ html {

:root {
/* font-family globals */
--ylv-ui-font-family: -apple-system, "BlinkMacSystemFont", system-ui, Ubuntu, "Droid Sans",
Roboto;
--ylv-ui-font-family: -apple-system, "BlinkMacSystemFont", system-ui, "Ubuntu", "Droid Sans",
"Roboto";

/* z-index globals
*
Expand Down

0 comments on commit b328858

Please sign in to comment.