Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
fdeea407
Commit
fdeea407
authored
Oct 16, 2020
by
Miguel Rincon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move terminal CSS to page bundle
Created a new file for the terminal styles to be held.
parent
2ae8ab3a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
24 deletions
+9
-24
app/assets/stylesheets/page_bundles/terminal.scss
app/assets/stylesheets/page_bundles/terminal.scss
+3
-0
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+0
-20
app/views/projects/environments/terminal.html.haml
app/views/projects/environments/terminal.html.haml
+2
-2
app/views/projects/jobs/terminal.html.haml
app/views/projects/jobs/terminal.html.haml
+3
-2
config/application.rb
config/application.rb
+1
-0
No files found.
app/assets/stylesheets/page_bundles/terminal.scss
0 → 100644
View file @
fdeea407
#terminal
>
div
{
min-height
:
450px
;
}
app/assets/stylesheets/pages/pipelines.scss
View file @
fdeea407
...
...
@@ -89,26 +89,6 @@
}
}
/**
* Terminal
*/
[
data-page
=
'projects:jobs:terminal'
],
[
data-page
=
'projects:environments:terminal'
]
{
.terminal-container
{
.content-block
{
border-bottom
:
0
;
}
#terminal
{
margin-top
:
10px
;
>
div
{
min-height
:
450px
;
}
}
}
}
.pipelines-container
.top-area
.nav-controls
>
.btn
:last-child
{
float
:
none
;
}
...
...
app/views/projects/environments/terminal.html.haml
View file @
fdeea407
-
page_title
_
(
"Terminal for environment"
),
@environment
.
name
-
add_page_specific_style
'page_bundles/terminal'
-
content_for
:page_specific_javascripts
do
=
stylesheet_link_tag
"xterm.css"
...
...
@@ -18,4 +18,4 @@
=
render
'projects/deployments/actions'
,
deployment:
@environment
.
last_deployment
.terminal-container
{
class:
container_class
}
#terminal
{
data:
{
project_path:
"#{terminal_project_environment_path(@project, @environment)}.ws"
}
}
#terminal
.gl-mt-4
{
data:
{
project_path:
"#{terminal_project_environment_path(@project, @environment)}.ws"
}
}
app/views/projects/jobs/terminal.html.haml
View file @
fdeea407
...
...
@@ -2,9 +2,10 @@
-
add_to_breadcrumbs
"#
#{
@build
.
id
}
"
,
project_job_path
(
@project
,
@build
)
-
breadcrumb_title
_
(
'Terminal'
)
-
page_title
_
(
'Terminal'
),
"
#{
@build
.
name
}
(#
#{
@build
.
id
}
)"
,
_
(
'Jobs'
)
-
add_page_specific_style
'page_bundles/terminal'
-
content_for
:page_specific_javascripts
do
=
stylesheet_link_tag
"xterm.css"
.terminal-container
#terminal
{
data:
{
project_path:
terminal_project_job_path
(
@project
,
@build
,
format: :ws
)
}
}
#terminal
.gl-mt-4
{
data:
{
project_path:
terminal_project_job_path
(
@project
,
@build
,
format: :ws
)
}
}
config/application.rb
View file @
fdeea407
...
...
@@ -190,6 +190,7 @@ module Gitlab
config
.
assets
.
precompile
<<
"page_bundles/pipeline.css"
config
.
assets
.
precompile
<<
"page_bundles/pipelines.css"
config
.
assets
.
precompile
<<
"page_bundles/productivity_analytics.css"
config
.
assets
.
precompile
<<
"page_bundles/terminal.css"
config
.
assets
.
precompile
<<
"page_bundles/todos.css"
config
.
assets
.
precompile
<<
"page_bundles/reports.css"
config
.
assets
.
precompile
<<
"page_bundles/xterm.css"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment