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
47eaadec
Commit
47eaadec
authored
Dec 18, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix formatting
parent
322643e7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
app/assets/stylesheets/framework/markdown_area.scss
app/assets/stylesheets/framework/markdown_area.scss
+11
-11
app/controllers/concerns/with_performance_bar.rb
app/controllers/concerns/with_performance_bar.rb
+1
-1
No files found.
app/assets/stylesheets/framework/markdown_area.scss
View file @
47eaadec
...
@@ -74,7 +74,7 @@
...
@@ -74,7 +74,7 @@
}
}
.md-header-tab
{
.md-header-tab
{
@media
(
max-width
:
$screen-xs-max
)
{
@media
(
max-width
:
$screen-xs-max
)
{
flex
:
1
;
flex
:
1
;
width
:
100%
;
width
:
100%
;
border-bottom
:
1px
solid
$border-color
;
border-bottom
:
1px
solid
$border-color
;
...
@@ -89,15 +89,15 @@
...
@@ -89,15 +89,15 @@
&
.active
{
&
.active
{
display
:
block
;
display
:
block
;
}
@media
(
max-width
:
$screen-xs-max
)
{
@media
(
max-width
:
$screen-xs-max
)
{
flex
:
none
;
flex
:
none
;
display
:
flex
;
display
:
flex
;
justify-content
:
center
;
justify-content
:
center
;
width
:
100%
;
width
:
100%
;
padding-top
:
$gl-padding-top
;
padding-top
:
$gl-padding-top
;
padding-bottom
:
$gl-padding-top
;
padding-bottom
:
$gl-padding-top
;
}
}
}
}
}
}
}
...
@@ -183,7 +183,7 @@
...
@@ -183,7 +183,7 @@
margin-left
:
$gl-padding
;
margin-left
:
$gl-padding
;
margin-right
:
-5px
;
margin-right
:
-5px
;
@media
(
max-width
:
$screen-xs-max
)
{
@media
(
max-width
:
$screen-xs-max
)
{
margin-left
:
0
;
margin-left
:
0
;
margin-right
:
0
;
margin-right
:
0
;
}
}
...
@@ -247,7 +247,7 @@
...
@@ -247,7 +247,7 @@
}
}
}
}
@media
(
max-width
:
$screen-xs-max
)
{
@media
(
max-width
:
$screen-xs-max
)
{
.atwho-view-ul
{
.atwho-view-ul
{
width
:
350px
;
width
:
350px
;
}
}
...
...
app/controllers/concerns/with_performance_bar.rb
View file @
47eaadec
...
@@ -6,7 +6,7 @@ module WithPerformanceBar
...
@@ -6,7 +6,7 @@ module WithPerformanceBar
end
end
def
peek_enabled?
def
peek_enabled?
#
return true if Rails.env.development?
return
true
if
Rails
.
env
.
development?
return
false
unless
Gitlab
::
PerformanceBar
.
enabled?
(
current_user
)
return
false
unless
Gitlab
::
PerformanceBar
.
enabled?
(
current_user
)
if
RequestStore
.
active?
if
RequestStore
.
active?
...
...
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