Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

change bg color of body and make the widget box like a primer border box

Behrokh Satarnejad75ebbc1744f8
diff --git a/app/views/custom_styles/_primer_color_mapping.erb b/app/views/custom_styles/_primer_color_mapping.erb
index 26cc1677655..9644cc6ce7a 100644
--- a/app/views/custom_styles/_primer_color_mapping.erb
+++ b/app/views/custom_styles/_primer_color_mapping.erb
@@ -41,7 +41,6 @@
--ck-color-panel-background: var(--overlay-bgColor);
--ck-color-input-background: var(--overlay-bgColor);
--status-selector-border-color: var(--button-default-borderColor-rest);
- --grid-background-color: var(--bgColor-inset);
--button--active-border-color: var(--button-default-borderColor-rest);
--button--font-color: var(--button-default-fgColor-rest);
--button--background-hover-color: var(--button-default-bgColor-hover);
diff --git a/frontend/src/app/shared/components/grids/grid/grid.component.html b/frontend/src/app/shared/components/grids/grid/grid.component.html
index b6ae6f2af04..f0ddf4de332 100644
--- a/frontend/src/app/shared/components/grids/grid/grid.component.html
+++ b/frontend/src/app/shared/components/grids/grid/grid.component.html
@@ -22,13 +22,6 @@
(cdkDragDropped)="drag.drop()"
[cdkDragDisabled]="isMobileDevice || !drag.isDraggable">
- <span *ngIf="drag.isDraggable"
- class="grid--area-drag-handle
- icon
- icon-drag-handle
- hidden-for-mobile"
- [hidden]="isMobileDevice"
- cdkDragHandle></span>
<ndc-dynamic [ndcDynamicComponent]="widgetComponent(area)"
[ndcDynamicInputs]="widgetComponentInput(area)"
@@ -83,11 +76,14 @@
[style.grid-column-start]="gap.gridStartColumn"
[style.grid-column-end]="gap.gridEndColumn"
[id]="gap.guid"
- (mouseover)="layout.setMousedOverArea(gap)">
+ >
<div class="grid--widget-add -gap"
*ngIf="add.isAllowed"
[title]="add.addText"
(click)="addWidget(gap)">
+ <span
+ [textContent]="add.addText"></span>
+ {{ add.addText }}
</div>
</div>
diff --git a/frontend/src/app/shared/components/grids/widgets/header/header.component.html b/frontend/src/app/shared/components/grids/widgets/header/header.component.html
index b01c2e3b927..b1a30c63b4f 100644
--- a/frontend/src/app/shared/components/grids/widgets/header/header.component.html
+++ b/frontend/src/app/shared/components/grids/widgets/header/header.component.html
@@ -1,7 +1,12 @@
<h3 class="op-widget-box--header"
data-test-selector="op-widget-box--header"
[ngClass]="{ '-editable': isRenameable }">
-
+ <span
+ class="grid--area-drag-handle
+ icon
+ icon-drag-handle
+ hidden-for-mobile"
+ cdkDragHandle></span>
<ng-content select="[slot=prepend]"></ng-content>
<editable-toolbar-title [title]="name"
diff --git a/frontend/src/global_styles/content/_grid.sass b/frontend/src/global_styles/content/_grid.sass
index 018d401efa6..811d67a7ce6 100644
--- a/frontend/src/global_styles/content/_grid.sass
+++ b/frontend/src/global_styles/content/_grid.sass
@@ -8,10 +8,6 @@ $grid--widget-padding: 20px 20px 20px 20px
@mixin grid--commons
display: grid
-body.widget-grid-layout
- #content, page-header
- background-color: var(--grid-background-color)
-
.grid--container
@include grid--commons
@@ -35,10 +31,6 @@ body.widget-grid-layout
.widget-box
min-height: 200px
- padding: $grid--widget-padding
-
- &:hover icon-triggered-context-menu
- visibility: visible
&.-resizing
@include modifying--placeholder
@@ -49,6 +41,7 @@ body.widget-grid-layout
flex-direction: column
justify-content: center
align-items: center
+ border: 1px dashed var(--borderColor-default)
&.-placeholder
@include modifying--placeholder
@@ -73,9 +66,6 @@ body.widget-grid-layout
display: flex
gap: var(--base-size-6)
- icon-triggered-context-menu
- visibility: hidden
-
&.-drop-target,
&.-passive
border-width: 1px
@@ -106,21 +96,12 @@ body.widget-grid-layout
opacity: 1
.grid--area-drag-handle
- margin-left: -19px
- padding-right: 1px
- padding-top: 4px
- margin-top: 4px
- opacity: 0
cursor: grab
- float: left
&:before
padding: 0
color: var(--fgColor-muted)
- .grid--area.-widgeted:hover &
- opacity: 1
-
.grid--area-content
height: 100%
@@ -143,6 +124,7 @@ body.widget-grid-layout
.grid--widget-content
height: 100%
+ padding: var(--stack-padding-normal)
overflow-x: auto
overflow-y: auto
@@ -205,10 +187,6 @@ body.widget-grid-layout
border-radius: 50%
opacity: 0
- &:before
- @include icon-font-common
- @include icon-mixin-add
-
&.-gap
width: 100%
height: 100%
@@ -221,7 +199,7 @@ body.widget-grid-layout
&:before
font-size: 0.75rem
- .grid--area.-addable:hover &, .grid--area.-addable.-help-mode &
+ .grid--area.-addable &, .grid--area.-addable.-help-mode &
opacity: 1
transition: opacity 1s ease
@@ -244,7 +222,6 @@ body.widget-grid-layout
padding: 20px 5px
cursor: pointer
background: none
- transition: background 4s ease
&:hover
background: var(--gray-light)
diff --git a/frontend/src/global_styles/content/_widget_box.sass b/frontend/src/global_styles/content/_widget_box.sass
index ca0106b346d..be06b412737 100644
--- a/frontend/src/global_styles/content/_widget_box.sass
+++ b/frontend/src/global_styles/content/_widget_box.sass
@@ -64,7 +64,6 @@ $widget-box--enumeration-width: 20px
.widget-box
position: relative
@include widget-box--style
- padding: 20px
min-height: 250px
word-wrap: break-word
overflow: hidden
@@ -109,12 +108,11 @@ $widget-box--enumeration-width: 20px
.op-widget-box--header
font-weight: var(--base-text-weight-bold)
- font-size: 1.25rem
display: flex
- margin-top: 4px
- margin-bottom: 13px
- border-bottom: none
- padding-bottom: 0
+ align-items: center
+ border-bottom: var(--borderWidth-thin) solid var(--borderColor-default)
+ padding: var(--stack-padding-normal)
+ background-color: var(--bgColor-muted)
.help-text--entry
vertical-align: 2px
diff --git a/frontend/src/global_styles/openproject/_mixins.sass b/frontend/src/global_styles/openproject/_mixins.sass
index 575c7180be7..d8baacbfddd 100644
--- a/frontend/src/global_styles/openproject/_mixins.sass
+++ b/frontend/src/global_styles/openproject/_mixins.sass
@@ -83,8 +83,9 @@
@mixin widget-box--style
background: var(--body-background)
margin: 10px
- border: 1px solid var(--borderColor-default)
+ border: var(--borderWidth-thin) solid var(--borderColor-default)
box-shadow: 0px 1px 5px 0px rgba(0,0,0,0.1)
+ border-radius: var(--borderRadius-medium)
@mixin widget-box--hover-style
box-shadow: 0px 1px 20px 0px rgba(0,0,0,0.1)
diff --git a/frontend/src/global_styles/openproject/_variable_defaults.scss b/frontend/src/global_styles/openproject/_variable_defaults.scss
index 84782baec2e..e513cd636cf 100644
--- a/frontend/src/global_styles/openproject/_variable_defaults.scss
+++ b/frontend/src/global_styles/openproject/_variable_defaults.scss
@@ -123,7 +123,6 @@
--status-selector-bg-color: #F99601;
--status-selector-border-color: transparent;
--warn:#C92A2A;
- --grid-background-color: #F3F6F8;
--avatar-border-color: transparent;
--list-item-hover--border-color: transparent;
--list-item-hover--color: var(--accent-color);