Skip to content

Commit

Permalink
Run prettier, fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
justinbhopper committed Nov 29, 2024
1 parent 33146e7 commit ebd1024
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 14 deletions.
16 changes: 3 additions & 13 deletions packages/table-dev-app/src/_main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,12 @@
@use "@blueprintjs/core/src/common/variables" as *;

body {

background-color: $pt-app-background-color;
bottom: 0;
left: 0;
inset: 0;

margin: 0;
padding: 0;
position: absolute;
right: 0;
top: 0;

.#{$ns}-dark {
background-color: $pt-dark-app-background-color;
Expand All @@ -24,11 +20,8 @@ body {

/* stylelint-disable-next-line selector-max-id */
#page-content {
bottom: 0;
left: 0;
inset: $pt-navbar-height 0 0;
position: absolute;
right: 0;
top: $pt-navbar-height;
}

/**
Expand All @@ -46,13 +39,10 @@ body {
* See: http://wilsonpage.co.uk/introducing-layout-boundaries/
*/
.layout-boundary {
bottom: 0;
display: block;
left: 0;
inset: 0;
overflow: hidden;
position: absolute;
right: 0;
top: 0;
}

.container {
Expand Down
1 change: 0 additions & 1 deletion packages/table-dev-app/src/index.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright 2017 Palantir Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0.


@import "normalize.css/normalize.css";

@import "@blueprintjs/core/lib/css/blueprint.css";
Expand Down

0 comments on commit ebd1024

Please sign in to comment.