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
508d479c
Commit
508d479c
authored
Oct 30, 2020
by
Jose Ivan Vargas
Committed by
Natalia Tepluhina
Oct 30, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move builds scss file to page_bundles
This moves the buids.scss file to the page_bundles folder
parent
b0b8f80a
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
55 additions
and
74 deletions
+55
-74
app/assets/stylesheets/_page_specific_files.scss
app/assets/stylesheets/_page_specific_files.scss
+0
-1
app/assets/stylesheets/framework/mixins.scss
app/assets/stylesheets/framework/mixins.scss
+32
-0
app/assets/stylesheets/page_bundles/build.scss
app/assets/stylesheets/page_bundles/build.scss
+1
-73
app/assets/stylesheets/pages/admin.scss
app/assets/stylesheets/pages/admin.scss
+8
-0
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+11
-0
app/views/ide/_show.html.haml
app/views/ide/_show.html.haml
+1
-0
app/views/projects/jobs/show.html.haml
app/views/projects/jobs/show.html.haml
+1
-0
config/application.rb
config/application.rb
+1
-0
No files found.
app/assets/stylesheets/_page_specific_files.scss
View file @
508d479c
@import
'./pages/admin'
;
@import
'./pages/branches'
;
@import
'./pages/builds'
;
@import
'./pages/ci_projects'
;
@import
'./pages/clusters'
;
@import
'./pages/commits'
;
...
...
app/assets/stylesheets/framework/mixins.scss
View file @
508d479c
...
...
@@ -3,6 +3,38 @@
* Mixins with fixed values
*/
@keyframes
blinking-dot
{
0
%
{
opacity
:
1
;
}
25
%
{
opacity
:
0
.4
;
}
75
%
{
opacity
:
0
.4
;
}
100
%
{
opacity
:
1
;
}
}
@keyframes
blinking-scroll-button
{
0
%
{
opacity
:
0
.2
;
}
50
%
{
opacity
:
1
;
}
100
%
{
opacity
:
0
.2
;
}
}
@mixin
str-truncated
(
$max-width
:
82%
)
{
display
:
inline-block
;
overflow
:
hidden
;
...
...
app/assets/stylesheets/page
s/builds
.scss
→
app/assets/stylesheets/page
_bundles/build
.scss
View file @
508d479c
@keyframes
fade-out-status
{
0
%
,
50
%
{
opacity
:
1
;
}
100
%
{
opacity
:
0
;
}
}
@keyframes
blinking-dot
{
0
%
{
opacity
:
1
;
}
25
%
{
opacity
:
0
.4
;
}
75
%
{
opacity
:
0
.4
;
}
100
%
{
opacity
:
1
;
}
}
@keyframes
blinking-scroll-button
{
0
%
{
opacity
:
0
.2
;
}
50
%
{
opacity
:
1
;
}
100
%
{
opacity
:
0
.2
;
}
}
@import
'mixins_and_variables_and_functions'
;
.build-page
{
.build-trace
{
...
...
@@ -325,29 +284,6 @@
}
}
.build-light-text
{
color
:
$gl-text-color-secondary
;
word-wrap
:
break-word
;
}
.build-gutter-toggle
{
position
:
absolute
;
top
:
50%
;
right
:
0
;
margin-top
:
-17px
;
}
@include
media-breakpoint-down
(
sm
)
{
.top-bar
{
.truncated-info
{
white-space
:
nowrap
;
overflow
:
hidden
;
max-width
:
220px
;
text-overflow
:
ellipsis
;
}
}
}
@include
media-breakpoint-down
(
md
)
{
.content-list
{
&
.builds-content-list
{
...
...
@@ -356,11 +292,3 @@
}
}
}
[
data-page
=
'admin:jobs:index'
]
{
.admin-builds-table
{
td
:last-child
{
min-width
:
120px
;
}
}
}
app/assets/stylesheets/pages/admin.scss
View file @
508d479c
...
...
@@ -8,3 +8,11 @@
.usage-data
{
max-height
:
400px
;
}
[
data-page
=
'admin:jobs:index'
]
{
.admin-builds-table
{
td
:last-child
{
min-width
:
120px
;
}
}
}
app/assets/stylesheets/pages/pipelines.scss
View file @
508d479c
...
...
@@ -86,3 +86,14 @@
color
:
$gl-text-color
;
}
}
@include
media-breakpoint-down
(
sm
)
{
.top-bar
{
.truncated-info
{
white-space
:
nowrap
;
overflow
:
hidden
;
max-width
:
220px
;
text-overflow
:
ellipsis
;
}
}
}
app/views/ide/_show.html.haml
View file @
508d479c
-
@body_class
=
'ide-layout'
-
page_title
_
(
'IDE'
)
-
add_page_specific_style
'page_bundles/build'
-
add_page_specific_style
'page_bundles/ide'
#ide
.ide-loading
{
data:
ide_data
}
...
...
app/views/projects/jobs/show.html.haml
View file @
508d479c
-
add_to_breadcrumbs
_
(
"Jobs"
),
project_jobs_path
(
@project
)
-
breadcrumb_title
"#
#{
@build
.
id
}
"
-
page_title
"
#{
@build
.
name
}
(#
#{
@build
.
id
}
)"
,
_
(
"Jobs"
)
-
add_page_specific_style
'page_bundles/build'
-
add_page_specific_style
'page_bundles/xterm'
-
add_page_specific_style
'page_bundles/ci_status'
...
...
config/application.rb
View file @
508d479c
...
...
@@ -176,6 +176,7 @@ module Gitlab
config
.
assets
.
precompile
<<
"page_bundles/_mixins_and_variables_and_functions.css"
config
.
assets
.
precompile
<<
"page_bundles/alert_management_details.css"
config
.
assets
.
precompile
<<
"page_bundles/boards.css"
config
.
assets
.
precompile
<<
"page_bundles/build.css"
config
.
assets
.
precompile
<<
"page_bundles/ci_status.css"
config
.
assets
.
precompile
<<
"page_bundles/cycle_analytics.css"
config
.
assets
.
precompile
<<
"page_bundles/dev_ops_report.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