Skip to content

The Unified and Autonomous Development Platform

Minor css fix

Robin Shen8026bf0d0ad2
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.js b/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.js
index 83eb720052..7cb53a0add 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.js
@@ -29,8 +29,8 @@
$this.css("position", "absolute");
}
- var thisOldWidth = $this[0].offsetWidth;
- var thisOldHeight = $this[0].offsetHeight;
+ var thisOldWidth = $this.outerWidth();
+ var thisOldHeight = $this.outerHeight();
var $autosuit = $this.find(".autosuit:visible:not(:has('.autosuit:visible'))");
if ($autosuit.length == 0)
@@ -76,7 +76,7 @@
if (alignment.target.element) {
var $targetEl = jQuery(alignment.target.element);
if (noNarrowThanTarget)
- $this.css("minWidth", $targetEl[0].offsetWidth);
+ $this.css("minWidth", $targetEl.outerWidth());
if (alignment.target.index != undefined) {
var coord = getCaretCoordinates(alignment.target.element, alignment.target.index);
@@ -92,8 +92,8 @@
} else {
targetLeft = $targetEl.offset().left;
targetTop = $targetEl.offset().top;
- targetWidth = $targetEl[0].offsetWidth;
- targetHeight = $targetEl[0].offsetHeight;
+ targetWidth = $targetEl.outerWidth();
+ targetHeight = $targetEl.outerHeight();
}
} else {
targetLeft = alignment.target.left;
@@ -214,8 +214,8 @@
$this.css({left:left-$parent.offset().left, top:top-$parent.offset().top});
- $autosuit.outerWidth($autosuit[0].offsetWidth+width-thisWidth);
- $autosuit.outerHeight($autosuit[0].offsetHeight+height-thisHeight);
+ $autosuit.outerWidth($autosuit.outerWidth()+width-thisWidth);
+ $autosuit.outerHeight($autosuit.outerHeight()+height-thisHeight);
$this.outerWidth(width);
$this.outerHeight(height);
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/titleandstatus/TitleAndStatusCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/titleandstatus/TitleAndStatusCssResourceReference.java
deleted file mode 100644
index a61e98da8c..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/asset/titleandstatus/TitleAndStatusCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.asset.titleandstatus;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class TitleAndStatusCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public TitleAndStatusCssResourceReference() {
- super(TitleAndStatusCssResourceReference.class, "title-and-status.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/titleandstatus/title-and-status.css b/server-core/src/main/java/io/onedev/server/web/asset/titleandstatus/title-and-status.css
deleted file mode 100644
index 374c402f08..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/asset/titleandstatus/title-and-status.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.title-and-status {
- position: relative;
-}
-
-.title-and-status>.title {
- padding-right: 48px;
-}
-.title-and-status>.status {
- position: absolute;
- right: 0;
- top: 0;
-}
-.title-and-status .label {
- line-height: inherit;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.html
index 8114f86924..ad8b0b9746 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.html
@@ -1,6 +1,6 @@
<wicket:panel>
- <div class="referenced-from title-and-status">
- <div wicket:id="title" class="title"></div>
- <div wicket:id="state" class="status"></div>
+ <div class="referenced-from d-flex align-items-start">
+ <div wicket:id="title" class="title mr-3"></div>
+ <div wicket:id="state" class="status ml-auto flex-shrink-0"></div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java
index 101545b59e..c853630b92 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java
@@ -1,7 +1,5 @@
package io.onedev.server.web.component.issue.referencedfrom;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.LoadableDetachableModel;
@@ -13,7 +11,6 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.asset.emoji.Emojis;
-import io.onedev.server.web.asset.titleandstatus.TitleAndStatusCssResourceReference;
import io.onedev.server.web.component.issue.IssueStateBadge;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
@@ -69,10 +66,4 @@ public class ReferencedFromIssuePanel extends GenericPanel<Issue> {
}
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new TitleAndStatusCssResourceReference()));
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html
index 733194024f..6a413cf053 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html
@@ -37,7 +37,7 @@
</div>
<wicket:fragment wicket:id="projectFrag">
<div class="d-flex align-items-center flex-wrap row-gap-2 font-size-h5">
- <a wicket:id="path" class="text-nowrap mr-3">
+ <a wicket:id="path" class="mr-3">
<img wicket:id="avatar">
<span wicket:id="text"></span>
</a>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
index 6a0104c1be..86d6f41ef7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
@@ -35,7 +35,7 @@
<wicket:fragment wicket:id="contentFrag">
<div class="primary d-flex mb-2">
<div class="flex-grow-1 d-flex flex-wrap row-gap-2">
- <span class="text-nowrap mr-3">
+ <span class="mr-3">
<a wicket:id="number" class="number h6 mr-1 mb-0"></a>
<span wicket:id="title" class="title h6 mb-0"></span>
</span>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.html
index 609dabe0e7..e73522ced5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.html
@@ -1,6 +1,6 @@
<wicket:panel>
- <div class="referenced-from title-and-status">
- <span wicket:id="title" class="title"></span>
- <span wicket:id="state" class="status"></span>
+ <div class="referenced-from d-flex align-items-start">
+ <span wicket:id="title" class="title mr-3"></span>
+ <span wicket:id="state" class="status ml-auto flex-shrink-0"></span>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java
index 65c5939399..996e9e09c0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java
@@ -1,7 +1,5 @@
package io.onedev.server.web.component.pullrequest.referencedfrom;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.LoadableDetachableModel;
@@ -12,7 +10,6 @@ import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.asset.titleandstatus.TitleAndStatusCssResourceReference;
import io.onedev.server.web.component.pullrequest.RequestStatusBadge;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
@@ -67,10 +64,4 @@ public class ReferencedFromPullRequestPanel extends GenericPanel<PullRequest> {
}
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new TitleAndStatusCssResourceReference()));
- }
-
}