Skip to content

The Unified and Autonomous Development Platform

Minor css bug fixes

Robin Shen85dbfdf3ecb7
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
index def8d851ff..fd443b53a9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
@@ -146,7 +146,7 @@ public abstract class BasePage extends WebPage {
clazz = clazz.getSuperclass();
}
- String script = String.format("$('body').addClass('%s');", builder.toString());
+ String script = String.format("$('html').addClass('%s');", builder.toString());
add(new Label("script", script).setEscapeModelStrings(false));
sessionFeedback = new SessionFeedbackPanel("sessionFeedback");
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css
index f2072ade2b..12fd81602e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/layout.css
@@ -5,7 +5,7 @@
--transition-duration: 0.3s;
--brand-size: 30px;
}
-body {
+.LayoutPage>body {
position: static !important;
}
.sidebar {
@@ -28,7 +28,8 @@ body {
.sidebar a {
color: #5c5e81;
}
-.sidebar a:hover, .sidebar a:focus, .sidebar a.open, .sidebar a.active {
+.sidebar a:hover, .sidebar a:focus,
+.sidebar a.open, .sidebar a.active {
color: var(--primary) !important;
}
@@ -250,7 +251,7 @@ body {
background: rgba(77, 89, 149, 0.06);
}
-body>.main {
+.LayoutPage>body>.main {
transition: all var(--transition-duration) ease;
position: absolute;
top: var(--topbar-height);
@@ -318,10 +319,10 @@ body>.main {
.sidebar-minimized ~ .topbar .topbar-brand {
display: inline;
}
- body>.main {
+ .LayoutPage>body>.main {
left: var(--sidebar-width);
}
- .sidebar-minimized ~ .main {
+ .LayoutPage>body>.sidebar-minimized ~ .main {
left: var(--sidebar-mini-width);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css b/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css
index 7a0b1182e3..e8d5320062 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css
@@ -1,67 +1,66 @@
-html {
+.SimplePage {
background: url(/img/mesh.jpg) no-repeat left top fixed;
background-size: cover;
}
-body {
+.SimplePage>body {
background: transparent;
display: flex;
}
-.main {
+.SimplePage .main {
padding: 1.75rem;
- max-width: 500px;
- width: 100%;
+ width: 400px;
margin: auto;
}
-.GeneralErrorPage .main {
- max-width: 900px;
+.SimplePage.GeneralErrorPage .main {
+ width: 900px;
}
-.main .logo.icon {
+.SimplePage .main .logo.icon {
color: var(--primary);
margin-bottom: 3rem;
}
-.main .title {
+.SimplePage .main .title {
margin-bottom: 5rem;
}
-.main .btn {
+.SimplePage .main .btn:not(.btn-block) {
padding: 1rem 2.25rem;
margin: 0.75rem 1rem;
}
-.main .signup {
+.SimplePage .main .signup {
margin-top: 2.5rem;
}
-.main .sso {
+.SimplePage .main .sso {
margin-top: 6rem;
}
-.main .sso img {
+.SimplePage .main .sso img {
width: 24px;
height: 24px;
}
-.main .feedbackPanel {
+.SimplePage .main .feedbackPanel {
text-align: left;
margin-bottom: 1.5rem;
}
-.main .form-group {
+.SimplePage .main .form-group {
margin-bottom: 1.5rem;
text-align: left;
}
-.main .form-control {
+.SimplePage .main .form-control {
padding: 1rem 2rem;
background-color: var(--light);
border-color: var(--light);
color: var(--gray-dark);
height: auto;
}
-.main .form-control:focus {
+.SimplePage .main .form-control:focus {
background-color: var(--light-gray);
border-color: var(--light-gray);
}
-.main .wizard .title {
+.SimplePage .main .wizard .title {
margin-top: -6rem;
color: var(--muted);
}
-.main .error-detail {
+.SimplePage .main .error-detail {
margin-top: 2rem;
text-align: left;
white-space: pre-wrap;