8000 Sync changes from upstream repository · Ratts704/developer.github.com@402cb70 · GitHub
[go: up one dir, main page]
Skip to content

Commit 402cb70

Browse files
author
Hubot
committed
Sync changes from upstream repository
1 parent ee7e728 commit 402cb70

File tree

10 files changed

+48
-7
lines changed

10 files changed

+48
-7
lines changed

‎Rules‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ compile '/v3/*' do
3030
filter :search
3131
filter :erb
3232
filter :kramdown, :toc_levels => [2]
33-
filter :enterprise_purge_filter
33+
filter :enterprise_only_filter
34+
filter :not_enterprise_filter
3435
filter :tip_filter
3536
filter :colorize_syntax,
3637
:colorizers => {:javascript => :rouge}

‎layouts/api.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<%= render 'head' %>
22

3-
<body class="api">
3+
<body class="api <%= ENV['DEV_MODE'] ? 'dev-mode' : '' %>">
44
<%= render 'header' %>
55

66
<div class="sub-nav">

‎layouts/guides.html‎

Expand all lines: layouts/guides.html
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<%= render 'head' %>
22

3-
<body class="api">
3+
<body class="api <%= ENV['DEV_MODE'] ? 'dev-mode' : '' %>">
44
<%= render 'header' %>
55

66
<div class="sub-nav">

‎layouts/head.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,7 @@
1212
<link href="/css/pygments.css" media="screen" rel="stylesheet" type="text/css">
1313
<script src="/js/jquery.js" type="text/javascript"></script>
1414
<script src="/js/documentation.js" type="text/javascript"></script>
15+
<% if ENV['DEV_MODE'] %>
16+
<script src="/js/dev_mode.js" type="text/javascript"></script>
17+
<% end %>
1518
</head>

‎layouts/webhooks.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<%= render 'head' %>
22

3-
<body class="api">
3+
<body class="api <%= ENV['DEV_MODE'] ? 'dev-mode' : '' %>">
44
<%= render 'header' %>
55

66
<div class="sub-nav">

‎lib/enterprise-purge.rb‎ renamed to ‎lib/enterprise-only.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
class EnterprisePurgeFilter < Nanoc::Filter
2-
identifier :enterprise_purge_filter
1+
class EnterpriseOnlyFilter < Nanoc::Filter
2+
identifier :enterprise_only_filter
33
type :text
44

55
ENTERPRISE_START_STRING = '{{#enterprise-only}}'

‎lib/not-enterprise.rb‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
class NotEnterpriseFilter < Nanoc::Filter
2+
identifier :not_enterprise_filter
3+
type :text
4+
5+
ENTERPRISE_START_STRING = '{{#not-enterprise}}'
6+
ENTERPRISE_END_STRING = '{{/not-enterprise}}'
7+
8+
# if we're running in Dotcom mode, we'll be lazy and just hide the content.
9+
# otherwise, when running script/enterprise-cutter, we'll bring these sections back
10+
def run(content, params={})
11+
start_replacement = '<div class="not-enterprise">'
12+
end_replacement = '</div>'
13+
14+
content = content.gsub(%r{<p>#{ENTERPRISE_START_STRING}</p>}, start_replacement)
15+
content = content.gsub(%r{<p>#{ENTERPRISE_END_STRING}</p>}, end_replacement)
16+
17+
content
18+
end
19+
end

‎script/server‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ echo "*********************************************************************"
99
echo ""
1010
echo ""
1111

12-
bundle exec guard
12+
DEV_MODE=true bundle exec guard

‎static/css/documentation.css‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,15 @@ h1 {
2424
body:not(.enterprise) .enterprise-only {
2525
display: none;
2626
}
27+
body.dev-mode .enterprise-only {
28+
border: 3px solid red;
29+
}
30+
body.dev-mode .not-enterprise {
31+
border: 3px dashed blue;
32+
}
33+
body.dev-mode.enterprise .not-enterprise {
34+
display: none;
35+
}
2736

2837
.content h1 {
2938
font-weight: 300;

‎static/js/dev_mode.js‎

Lines changed: 9 additions & 0 deletions
< 476C td data-grid-cell-id="diff-043615b8b0445421d3993e967e686c3cb4c42fca34a6f1d9d8057e0b98feb4bf-empty-6-2" data-line-anchor="diff-043615b8b0445421d3993e967e686c3cb4c42fca34a6f1d9d8057e0b98feb4bfR6" data-selected="false" role="gridcell" style="background-color:var(--diffBlob-additionLine-bgColor, var(--diffBlob-addition-bgColor-line));padding-right:24px" tabindex="-1" valign="top" class="focusable-grid-cell diff-text-cell right-side-diff-cell left-side">+
$("body.dev-mode").toggleClass('enterprise')
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Init sidebar
2+
$(function() {
3+
$(window).keydown(function(e){
4+
// d
5+
if (e.keyCode == 68) {
6
7+
}
8+
});
9+
});

0 commit comments

Comments
 (0)
0