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
9d825258
Commit
9d825258
authored
Feb 08, 2021
by
Martin Wortschack
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'jnnkl-validate-startup-css' into 'master'
Validate Startup CSS See merge request gitlab-org/gitlab!53605
parents
7bf372c1
b6aadfe3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
4 deletions
+1
-4
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+0
-2
app/assets/stylesheets/startup/startup-general.scss
app/assets/stylesheets/startup/startup-general.scss
+0
-1
app/views/layouts/_startup_css.haml
app/views/layouts/_startup_css.haml
+1
-1
No files found.
app/assets/stylesheets/framework/buttons.scss
View file @
9d825258
...
@@ -95,8 +95,6 @@
...
@@ -95,8 +95,6 @@
&
:active
,
&
:active
,
&
.active
{
&
.active
{
box-shadow
:
$gl-btn-active-background
;
background-color
:
$dark
;
background-color
:
$dark
;
border-color
:
$border-dark
;
border-color
:
$border-dark
;
color
:
$color
;
color
:
$color
;
...
...
app/assets/stylesheets/startup/startup-general.scss
View file @
9d825258
...
@@ -736,7 +736,6 @@ body {
...
@@ -736,7 +736,6 @@ body {
white-space
:
nowrap
;
white-space
:
nowrap
;
}
}
.btn
:active
,
.btn.active
{
.btn
:active
,
.btn.active
{
box-shadow
:
rgba
(
0
,
0
,
0
,
0
.16
);
background-color
:
#eaeaea
;
background-color
:
#eaeaea
;
border-color
:
#e3e3e3
;
border-color
:
#e3e3e3
;
color
:
#303030
;
color
:
#303030
;
...
...
app/views/layouts/_startup_css.haml
View file @
9d825258
-
startup_filename
=
current_path?
(
"sessions#new"
)
?
'signin'
:
user_application_theme
==
'gl-dark'
?
'dark'
:
'general'
-
startup_filename
=
current_path?
(
"sessions#new"
)
?
'signin'
:
user_application_theme
==
'gl-dark'
?
'dark'
:
'general'
%style
{
type:
"text/css"
}
%style
=
Rails
.
application
.
assets_manifest
.
find_sources
(
"themes/
#{
user_application_theme_css_filename
}
.css"
).
first
.
to_s
.
html_safe
if
user_application_theme_css_filename
=
Rails
.
application
.
assets_manifest
.
find_sources
(
"themes/
#{
user_application_theme_css_filename
}
.css"
).
first
.
to_s
.
html_safe
if
user_application_theme_css_filename
=
Rails
.
application
.
assets_manifest
.
find_sources
(
"startup/startup-
#{
startup_filename
}
.css"
).
first
.
to_s
.
html_safe
=
Rails
.
application
.
assets_manifest
.
find_sources
(
"startup/startup-
#{
startup_filename
}
.css"
).
first
.
to_s
.
html_safe
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