Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-10 08:50:57 -05:00
Code Issues Activity

✨ Fix new styles leaking for scroll

Browse source
This commit is contained in:
alonso.torres 2023-06-13 11:18:21 +02:00
parent b73ab97556
commit c74ccfaa8d
7 changed files with 46 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frontend/resources/styles/common/framework.scss
View file

@ -914,9 +914,12 @@ input[type="range"]:focus::-ms-fill-upper {
height: 8px;
width: 8px;
}
::-webkit-scrollbar-track {
::-webkit-scrollbar-track,
::-webkit-scrollbar-corner {
background-color: transparent;
}
::-webkit-scrollbar-thumb {
background-color: $color-gray-20;

20
frontend/resources/styles/common/refactor/common-refactor.scss
View file

@ -16,23 +16,3 @@
@import "common/refactor/z-index.scss";
@import "common/refactor/mixins.scss";
@import "common/refactor/basic-rules.scss";
::-webkit-scrollbar {
background-color: transparent;
cursor: pointer;
height: $s-8;
width: $s-12;
}
::-webkit-scrollbar-track {
background-color: transparent;
}
::-webkit-scrollbar-thumb {
background-color: rgba(170, 181, 186, 0.3);
background-clip: content-box;
border: $s-2 solid transparent;
border-radius: $br-8;
&:hover {
background-color: rgba(170, 181, 186, 0.7);
outline: none;
}
}

8
frontend/resources/styles/common/refactor/fonts.scss
View file

@ -29,11 +29,3 @@ $fs-44: math.div(44, $fs-base) + rem;
$fw400: 400; // Regular (CSS value: 'normal')
$fw500: 500; // Medium
$fw700: 700; // Bold (CSS value: 'bold')
// Work Sans
@include font-face("worksans", "WorkSans-Regular", normal);
@include font-face("worksans", "WorkSans-Medium", "500");
@include font-face("worksans", "WorkSans-Bold", bold);
// Space mono
@include font-face("spacemono", "SpaceMono-Regular", normal);

5
frontend/resources/styles/common/refactor/spacing.scss
View file

@ -6,11 +6,6 @@
@use "sass:math";
:root {
--s-4: 0.25rem;
--layer-indentation-size: calc(var(--s-4) * 5);
}
$s-0: 0px;
$s-2: math.div(0.25rem, 2);
$s-4: var(--s-4);

4
frontend/src/app/main/ui/workspace.cljs
View file

@ -5,6 +5,7 @@
;; Copyright (c) KALEIDOS INC
(ns app.main.ui.workspace
(:require-macros [app.main.style :refer [css]])
(:require
[app.common.data.macros :as dm]
[app.main.data.modal :as modal]
@ -193,7 +194,8 @@
[:& (mf/provider ctx/components-v2) {:value components-v2?}
[:& (mf/provider ctx/new-css-system) {:value new-css?}
[:& (mf/provider ctx/workspace-read-only?) {:value read-only?}
[:section#workspace {:style {:background-color background-color
[:section#workspace {:class (when new-css? (css :workspace))
:style {:background-color background-color
:touch-action "none"}}
(when (not (:hide-ui layout))
[:& header {:file file

1
frontend/src/app/main/ui/workspace.css.json Normal file
View file

@ -0,0 +1 @@
{"button-primary":"ui_workspace_button-primary_FZJ-T","button-secondary":"ui_workspace_button-secondary_oDzCJ","button-icon":"ui_workspace_button-icon_L5y8h","button-icon-small":"ui_workspace_button-icon-small_Ppp3W","workspace":"ui_workspace_workspace_xutJr"}

38
frontend/src/app/main/ui/workspace.scss Normal file
View file

@ -0,0 +1,38 @@
@import "refactor/common-refactor.scss";
// Work Sans
@include font-face("worksans", "WorkSans-Regular", normal);
@include font-face("worksans", "WorkSans-Medium", "500");
@include font-face("worksans", "WorkSans-Bold", bold);
// Space mono
@include font-face("spacemono", "SpaceMono-Regular", normal);
:global(:root) {
--s-4: 0.25rem;
--layer-indentation-size: calc(var(--s-4) * 5);
}
.workspace {
::-webkit-scrollbar {
background-color: transparent;
cursor: pointer;
height: $s-12;
width: $s-12;
}
::-webkit-scrollbar-track,
::-webkit-scrollbar-corner {
background-color: transparent;
}
::-webkit-scrollbar-thumb {
background-color: rgba(170, 181, 186, 0.3);
background-clip: content-box;
border: $s-2 solid transparent;
border-radius: $br-8;
&:hover {
background-color: rgba(170, 181, 186, 0.7);
outline: none;
}
}
}