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
d916dcb0
Commit
d916dcb0
authored
Jun 07, 2018
by
Paul Slaughter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix styling of admin/appearance form
parent
ab92643a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
9 deletions
+13
-9
app/assets/stylesheets/bootstrap_migration.scss
app/assets/stylesheets/bootstrap_migration.scss
+4
-0
ee/app/views/admin/appearances/_system_header_footer_form.html.haml
...ws/admin/appearances/_system_header_footer_form.html.haml
+9
-9
No files found.
app/assets/stylesheets/bootstrap_migration.scss
View file @
d916dcb0
...
@@ -261,3 +261,7 @@ pre code {
...
@@ -261,3 +261,7 @@ pre code {
color
:
$white-light
;
color
:
$white-light
;
}
}
}
}
input
[
type
=
color
]
.form-control
{
height
:
$input-height
;
}
ee/app/views/admin/appearances/_system_header_footer_form.html.haml
View file @
d916dcb0
...
@@ -3,22 +3,22 @@
...
@@ -3,22 +3,22 @@
%fieldset
.system_header_footer
%fieldset
.system_header_footer
%legend
%legend
=
_
(
'System header and footer:'
)
=
_
(
'System header and footer:'
)
.form-group
.form-group
.row
=
form
.
label
:header_message
,
_
(
'Header message'
),
class:
'col-form-label'
=
form
.
label
:header_message
,
_
(
'Header message'
),
class:
'col-
sm-2 col-
form-label'
.col-sm-10
.col-sm-10
=
form
.
text_area
:header_message
,
placeholder:
_
(
'State your message to activate'
),
class:
"form-control js-autosize"
=
form
.
text_area
:header_message
,
placeholder:
_
(
'State your message to activate'
),
class:
"form-control js-autosize"
.form-group
.form-group
.row
=
form
.
label
:footer_message
,
_
(
'Footer message'
),
class:
'col-form-label'
=
form
.
label
:footer_message
,
_
(
'Footer message'
),
class:
'col-
sm-2 col-
form-label'
.col-sm-10
.col-sm-10
=
form
.
text_area
:footer_message
,
placeholder:
_
(
'State your message to activate'
),
class:
"form-control js-autosize"
=
form
.
text_area
:footer_message
,
placeholder:
_
(
'State your message to activate'
),
class:
"form-control js-autosize"
.form-group.js-toggle-colors-container
.form-group.
row.
js-toggle-colors-container
.col-sm-10.offset-sm-2
.col-sm-10.offset-sm-2
=
link_to
_
(
'Customize colors'
),
'#'
,
class:
'js-toggle-colors-link'
=
link_to
_
(
'Customize colors'
),
'#'
,
class:
'js-toggle-colors-link'
.form-group.js-toggle-colors-container.hide
.form-group.
row.
js-toggle-colors-container.hide
=
form
.
label
:message_background_color
,
_
(
'Background Color'
),
class:
'col-form-label'
=
form
.
label
:message_background_color
,
_
(
'Background Color'
),
class:
'col-
sm-2 col-
form-label'
.col-sm-10
.col-sm-10
=
form
.
color_field
:message_background_color
,
class:
"form-control"
=
form
.
color_field
:message_background_color
,
class:
"form-control"
.form-group.js-toggle-colors-container.hide
.form-group.
row.
js-toggle-colors-container.hide
=
form
.
label
:message_font_color
,
_
(
'Font Color'
),
class:
'col-form-label'
=
form
.
label
:message_font_color
,
_
(
'Font Color'
),
class:
'col-
sm-2 col-
form-label'
.col-sm-10
.col-sm-10
=
form
.
color_field
:message_font_color
,
class:
"form-control"
=
form
.
color_field
:message_font_color
,
class:
"form-control"
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