Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
idp
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Operate
Terraform modules
Monitor
Service Desk
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
smol
idp
Commits
24e6ed5c
Commit
24e6ed5c
authored
1 year ago
by
ale
Browse files
Options
Downloads
Patches
Plain Diff
Clean up merge mistake
parent
884f110f
No related branches found
No related tags found
1 merge request
!6
Draft: Replace Bootstrap with Material Design For Bootstrap
Pipeline
#65808
passed
1 year ago
Stage: test
Stage: build
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
ui/templates/inc/page.html
+0
-4
0 additions, 4 deletions
ui/templates/inc/page.html
with
0 additions
and
4 deletions
ui/templates/inc/page.html
+
0
−
4
View file @
24e6ed5c
...
...
@@ -33,12 +33,8 @@
{{end}}
{{define "header_login"}}{{template "header" .}}
<
<<<<<<
HEAD
<
body
class=
"d-flex align-items-center py-4 bg-body-tertiary vh-100"
>
=======
<body>
<div
class=
"d-flex align-items-center py-4 bg-body-tertiary vh-100"
>
>>>>>>> 0f7aea3 (Replace Bootstrap with Material Design For Bootstrap)
<main
class=
"form-signin w-50 m-auto"
>
<div
class=
"d-flex flex-row"
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment