Skip to content

Commit 2f47297

Browse files
author
Jason van Zyl
committed
Update
1 parent 0a7d16c commit 2f47297

16 files changed

+359
-72
lines changed

Icon

Whitespace-only changes.

assets/css/m2eclipse.css

+56-4
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,35 @@ blockquote:hover,.hero {
129129
.container {
130130
max-width: 1270px; }
131131

132+
/* ------------------------------ MARGIN BOTTOM ------------------------------ */
133+
134+
.margin-bottom-5,.margin-bottom-10,.margin-bottom-20,.margin-bottom-30,.margin-bottom-40,.margin-bottom-50 {
135+
clear: both; }
136+
137+
.margin-bottom-5 {
138+
margin-bottom: 5px; }
139+
140+
.margin-bottom-10 {
141+
margin-bottom: 10px; }
142+
143+
.margin-bottom-20 {
144+
margin-bottom: 20px; }
145+
146+
.margin-bottom-30 {
147+
margin-bottom: 30px; }
148+
149+
.margin-bottom-40 {
150+
margin-bottom: 40px; }
151+
152+
.margin-bottom-50 {
153+
margin-bottom: 50px; }
154+
155+
.margin-bottom-100 {
156+
margin-bottom: 100px; }
157+
158+
.md-margin-bottom-40 {
159+
margin-bottom: 40px; }
160+
132161
/* ------------------------------ BUTTONS ------------------------------ */
133162

134163
.btn-u {
@@ -184,12 +213,19 @@ blockquote:hover,.hero {
184213
z-index: 2;
185214
position: relative;
186215
padding: 0; }
216+
217+
.header .navbar-brand img {
218+
margin:20px 0px 20px; }
187219

220+
.header .navbar-inner {
221+
background-color: rgba(2, 32, 91, 0.9);
222+
border-bottom: solid 2px #FFD34D; }
223+
188224
.header .navbar-default .navbar-nav > li > a {
189-
color: #777;
225+
color: #fff;
190226
font-size: 14px;
191227
font-weight: 400;
192-
padding: 40px 10px 15px;
228+
padding: 40px 5px 15px;
193229
text-transform: uppercase; }
194230

195231
.header .navbar-default .navbar-nav > li > a:hover {
@@ -231,7 +267,8 @@ ul.nav li {
231267
border-bottom: solid 4px transparent; }
232268

233269
.header .navbar-default .navbar-nav > li > a:hover,.header .navbar-default .navbar-nav > .active > a {
234-
border-bottom: solid 4px #FFD34D; }
270+
border-bottom: solid 5px #FFD34D;
271+
padding-bottom: 26px; }
235272

236273
.header .navbar-default .navbar-nav > li > a,.header .navbar-default .navbar-nav > li > a:hover,.header .navbar-default .navbar-nav > li > a:focus,.header .navbar-default .navbar-nav > .active > a,.header .navbar-default .navbar-nav > .active > a:hover,.header .navbar-default .navbar-nav > .active > a:focus {
237274
background: none; }
@@ -366,4 +403,19 @@ tbody > tr:nth-child(even) > th {
366403
text-decoration:none; }
367404

368405
.doc img {
369-
text-align:center; }
406+
text-align:center; }
407+
408+
.docNavigation.affix {
409+
position: fixed; }
410+
411+
@media(max-width:992px){
412+
.docNavigation.affix {
413+
position: static;
414+
width: auto;
415+
top: 0;
416+
}
417+
}
418+
419+
.anchor {
420+
padding-top: 120px;
421+
margin-top: -100px; }

assets/img/m2e_logo.png

-22 Bytes
Loading

assets/plugins/affix.js

+162
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
/* ========================================================================
2+
* Bootstrap: affix.js v3.3.1
3+
* http://getbootstrap.com/javascript/#affix
4+
* ========================================================================
5+
* Copyright 2011-2014 Twitter, Inc.
6+
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
7+
* ======================================================================== */
8+
9+
10+
+function ($) {
11+
'use strict';
12+
13+
// AFFIX CLASS DEFINITION
14+
// ======================
15+
16+
var Affix = function (element, options) {
17+
this.options = $.extend({}, Affix.DEFAULTS, options)
18+
19+
this.$target = $(this.options.target)
20+
.on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
21+
.on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this))
22+
23+
this.$element = $(element)
24+
this.affixed =
25+
this.unpin =
26+
this.pinnedOffset = null
27+
28+
this.checkPosition()
29+
}
30+
31+
Affix.VERSION = '3.3.1'
32+
33+
Affix.RESET = 'affix affix-top affix-bottom'
34+
35+
Affix.DEFAULTS = {
36+
offset: 0,
37+
target: window
38+
}
39+
40+
Affix.prototype.getState = function (scrollHeight, height, offsetTop, offsetBottom) {
41+
var scrollTop = this.$target.scrollTop()
42+
var position = this.$element.offset()
43+
var targetHeight = this.$target.height()
44+
45+
if (offsetTop != null && this.affixed == 'top') return scrollTop < offsetTop ? 'top' : false
46+
47+
if (this.affixed == 'bottom') {
48+
if (offsetTop != null) return (scrollTop + this.unpin <= position.top) ? false : 'bottom'
49+
return (scrollTop + targetHeight <= scrollHeight - offsetBottom) ? false : 'bottom'
50+
}
51+
52+
var initializing = this.affixed == null
53+
var colliderTop = initializing ? scrollTop : position.top
54+
var colliderHeight = initializing ? targetHeight : height
55+
56+
if (offsetTop != null && colliderTop <= offsetTop) return 'top'
57+
if (offsetBottom != null && (colliderTop + colliderHeight >= scrollHeight - offsetBottom)) return 'bottom'
58+
59+
return false
60+
}
61+
62+
Affix.prototype.getPinnedOffset = function () {
63+
if (this.pinnedOffset) return this.pinnedOffset
64+
this.$element.removeClass(Affix.RESET).addClass('affix')
65+
var scrollTop = this.$target.scrollTop()
66+
var position = this.$element.offset()
67+
return (this.pinnedOffset = position.top - scrollTop)
68+
}
69+
70+
Affix.prototype.checkPositionWithEventLoop = function () {
71+
setTimeout($.proxy(this.checkPosition, this), 1)
72+
}
73+
74+
Affix.prototype.checkPosition = function () {
75+
if (!this.$element.is(':visible')) return
76+
77+
var height = this.$element.height()
78+
var offset = this.options.offset
79+
var offsetTop = offset.top
80+
var offsetBottom = offset.bottom
81+
var scrollHeight = $('body').height()
82+
83+
if (typeof offset != 'object') offsetBottom = offsetTop = offset
84+
if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element)
85+
if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element)
86+
87+
var affix = this.getState(scrollHeight, height, offsetTop, offsetBottom)
88+
89+
if (this.affixed != affix) {
90+
if (this.unpin != null) this.$element.css('top', '')
91+
92+
var affixType = 'affix' + (affix ? '-' + affix : '')
93+
var e = $.Event(affixType + '.bs.affix')
94+
95+
this.$element.trigger(e)
96+
97+
if (e.isDefaultPrevented()) return
98+
99+
this.affixed = affix
100+
this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null
101+
102+
this.$element
103+
.removeClass(Affix.RESET)
104+
.addClass(affixType)
105+
.trigger(affixType.replace('affix', 'affixed') + '.bs.affix')
106+
}
107+
108+
if (affix == 'bottom') {
109+
this.$element.offset({
110+
top: scrollHeight - height - offsetBottom
111+
})
112+
}
113+
}
114+
115+
116+
// AFFIX PLUGIN DEFINITION
117+
// =======================
118+
119+
function Plugin(option) {
120+
return this.each(function () {
121+
var $this = $(this)
122+
var data = $this.data('bs.affix')
123+
var options = typeof option == 'object' && option
124+
125+
if (!data) $this.data('bs.affix', (data = new Affix(this, options)))
126+
if (typeof option == 'string') data[option]()
127+
})
128+
}
129+
130+
var old = $.fn.affix
131+
132+
$.fn.affix = Plugin
133+
$.fn.affix.Constructor = Affix
134+
135+
136+
// AFFIX NO CONFLICT
137+
// =================
138+
139+
$.fn.affix.noConflict = function () {
140+
$.fn.affix = old
141+
return this
142+
}
143+
144+
145+
// AFFIX DATA-API
146+
// ==============
147+
148+
$(window).on('load', function () {
149+
$('[data-spy="affix"]').each(function () {
150+
var $spy = $(this)
151+
var data = $spy.data()
152+
153+
data.offset = data.offset || {}
154+
155+
if (data.offsetBottom != null) data.offset.bottom = data.offsetBottom
156+
if (data.offsetTop != null) data.offset.top = data.offsetTop
157+
158+
Plugin.call($spy, data)
159+
})
160+
})
161+
162+
}(jQuery);

documentation/committers/website.html

+10-5
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
<div class="wrap">
3535

3636
<div class="header">
37-
<div class="navbar navbar-default" role="navigation">
37+
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
38+
<div class="navbar-inner">
3839
<div class="container">
3940
<!-- Brand and toggle get grouped for better mobile display -->
4041
<div class="navbar-header">
@@ -45,7 +46,7 @@
4546
<span class="icon-bar"></span>
4647
</button>
4748
<a class="navbar-brand" href="/m2e/index.html">
48-
<img id="logo-header" src="/m2e/assets/img/m2e_logo@2x.svg" alt="M2Eclipse" width="150" height="61" style="margin:20px 0px 10px;"/>
49+
<img id="logo-header" src="/m2e/assets/img/m2e_logo.png" alt="M2Eclipse" width="150" height="61" />
4950
</a>
5051
</div>
5152

@@ -80,12 +81,15 @@
8081
</ul>
8182
</div>
8283
</div>
84+
</div>
8385
</div>
8486
</div><!-- END header -->
8587

8688
<div class="margin-bottom-20"></div>
87-
<div class="container">
88-
<h1><a href="#m2eclipse-website" name="m2eclipse-website">M2Eclipse Website</a></h1><p>The M2Eclipse website is a Jekyll-based website. This means the sources are a standard looking Jekyll-based site, and the website we publish for the outside world is what Jekyll generates. Currently at Eclipse websites are checked into a Git repository in their final form and that&rsquo;s what is served as our public website. There is no mechanism, currently, to run a transformation process so the M2Eclipse website is in one Git repository and then we push the final version to another Git repository. This is not idea but that&rsquo;s what we have. </p><p>To try and make it as simple as possible the Git repository with the sources contains a submodule that contains the final site. To get the sources and the module containing the <code>_site</code> directory do the following:</p>
89+
<div class="container">
90+
<div class="margin-bottom-100"></div>
91+
92+
<h1><a href="#m2eclipse-website" name="m2eclipse-website">M2Eclipse Website</a></h1><p>The M2Eclipse website is a Jekyll-based website. This means the sources are a standard looking Jekyll-based site, and the website we publish for the outside world is what Jekyll generates. Currently at Eclipse websites are checked into a Git repository in their final form and that&rsquo;s what is served as our public website. There is no mechanism, currently, to run a transformation process so the M2Eclipse website is in one Git repository and then we push the final version to another Git repository. This is not idea but that&rsquo;s what we have. </p><p>To try and make it as simple as possible the Git repository with the sources contains a submodule that contains the final site. To get the sources and the module containing the <code>_site</code> directory do the following:</p>
8993
<pre class="prettyprint linenums">
9094
git clone --recursive git@github.com:takari/m2eclipse-website.git
9195
</pre><p>Now you should have something that looks like the following:</p>
@@ -132,7 +136,8 @@ <h1><a href="#m2eclipse-website" name="m2eclipse-website">M2Eclipse Website</a><
132136
138 [main] INFO org.eclipse.jetty.server.handler.ContextHandler - Started o.e.j.s.h.ContextHandler@77dcf9f4{/m2e,file:/Users/jvanzyl/Dropbox/takari-website-m2e/_site/,AVAILABLE}
133137
151 [main] INFO org.eclipse.jetty.server.ServerConnector - Started ServerConnector@69317d48{HTTP/1.1}{0.0.0.0:4000}
134138
</pre><p>Now you can add and edit content for the website, reload your browser, edit, rinse, repeat. The content will be generated in the <code>_site</code> directory as you make changes. Once you are finish working on content, you can go into the <code>_site</code> directory, add, commit, and then push changes to the production website. They should appear on <a href="http://eclipse.org/m2e">http://eclipse.org/m2e</a> fairly soon after.</p><p>NOTE: Ideally we will eventually have a process on the Eclipse host that will the transformation for us, or possibly ask the Webmaster to pull the final site from a directory within the Git repository. In a standard Jekyll-based build the default location of the generated site is <code>_site</code>. If we can ask to have our public facing website pulled from the <code>_site</code> directory in out website&rsquo;s Git repository we can probably put it all in a single repository.</p>
135-
</div><!-- END container -->
139+
140+
</div>
136141
</div><!-- END wrap -->
137142

138143
<div class="stickyFooter">

documentation/m2e-development-environment.html

+13-6
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
<div class="wrap">
3535

3636
<div class="header">
37-
<div class="navbar navbar-default" role="navigation">
37+
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
38+
<div class="navbar-inner">
3839
<div class="container">
3940
<!-- Brand and toggle get grouped for better mobile display -->
4041
<div class="navbar-header">
@@ -45,7 +46,7 @@
4546
<span class="icon-bar"></span>
4647
</button>
4748
<a class="navbar-brand" href="/m2e/index.html">
48-
<img id="logo-header" src="/m2e/assets/img/m2e_logo@2x.svg" alt="M2Eclipse" width="150" height="61" style="margin:20px 0px 10px;"/>
49+
<img id="logo-header" src="/m2e/assets/img/m2e_logo.png" alt="M2Eclipse" width="150" height="61" />
4950
</a>
5051
</div>
5152

@@ -80,13 +81,17 @@
8081
</ul>
8182
</div>
8283
</div>
84+
</div>
8385
</div>
8486
</div><!-- END header -->
8587

8688
<div class="margin-bottom-20"></div>
87-
<div class="container">
88-
<div class="row">
89+
<div class="container">
90+
<div class="margin-bottom-100"></div>
91+
92+
<div class="row">
8993
<div class="col-md-3">
94+
<div class="docNavigation affix">
9095
<div class="margin-bottom-30"></div>
9196
<h4 class="headline">Users</h2>
9297
<ul class="unstyled">
@@ -105,7 +110,8 @@ <h4 class="headline">Extension Developers</h2>
105110
<h4 class="headline">Release Notes</h2>
106111
<ul class="unstyled">
107112
<li><a href="/m2e/documentation/release-notes-15.html">M2Eclipse 1.5</a></li>
108-
</ul>
113+
</ul>
114+
</div>
109115
</div>
110116
<div class="col-md-9 docs">
111117
<h1><a href="#development-environment-setup" name="development-environment-setup">Development Environment Setup</a></h1><p>Download and unpack Eclipse latest SDK build from <a href="http://download.eclipse.org/eclipse/downloads/">http://download.eclipse.org/eclipse/downloads/</a> . The instructions below assume fresh/clean Eclipse installation.</p><p>Install M2Eclipse 1.5 or newer from <a href="http://download.eclipse.org/technology/m2e/releases">http://download.eclipse.org/technology/m2e/releases</a> . This is a P2 repository URL, use Eclipse Install UI to use it as explained in <a href="http://help.eclipse.org/topic//org.eclipse.platform.doc.user/tasks/tasks-127.htm">http://help.eclipse.org/topic//org.eclipse.platform.doc.user/tasks/tasks-127.htm</a></p><p>Clone the M2Eclipse Core repository, see <a href="https://git.eclipse.org/r/#/admin/projects/m2e/m2e-core">https://git.eclipse.org/r/#/admin/projects/m2e/m2e-core</a> for the list of available protocols.</p><p>Clone M2Eclipse Tests repository, see <a href="https://github.com/tesla/m2e-core-tests">https://github.com/tesla/m2e-core-tests</a> for the list of available protocols.</p><p>Import org.eclipse.m2e.workspace, m2e-core and m2e-core-tests as existing maven projects. Follow onscreen instructions, allow M2Eclipse to install additional software and restart eclipse when requested. Give Eclipse some time to update project configuration after restart. You may need to do Project/Clean&hellip;/Clean_all_projects to clear all compilation errors.</p><h2><a href="#running-m2eclipse-automated-regression-tests-from-eclipse" name="running-m2eclipse-automated-regression-tests-from-eclipse">Running M2Eclipse Automated Regression Tests from Eclipse</a></h2><p>Add the following memory configuration parameters to JVM startup options</p>
@@ -127,7 +133,8 @@ <h1><a href="#development-environment-setup" name="development-environment-setup
127133
</pre><h2><a href="#submitting-patches" name="submitting-patches">Submitting Patches</a></h2><h3>M2Eclipse Core Sources at Eclipse.org</h3><p>M2Eclipse only accepts changes contributed via Gerrit. Here is the wiki that explains how to use it <a href="http://wiki.eclipse.org/Gerrit">http://wiki.eclipse.org/Gerrit</a> . Good luck.</p><p>According to <a href="http://www.eclipse.org/legal/EclipseLegalProcessPoster.pdf">eclipse legal poster</a>, all contributors must have signed Eclipse CLA and their bugzilla email and git commit author must match (otherwise Eclipse git server refuses contribution).</p><p>Note that M2Eclipse developers do NOT watch Gerrit submissions directly. All contributions must be referenced from corresponding bugzilla records.</p><h3><a href="#m2eclipse-core-tests-at-github" name="m2eclipse-core-tests-at-github">M2Eclipse Core Tests at Github</a></h3><p>In most cases m2e core patches will require corresponding regression tests. Changes to m2e core tests repository must be submitted as github pull requests and must be linked to bugzilla record, along with corresponding Gerrit change set.</p>
128134
</div>
129135
</div>
130-
</div><!-- END container -->
136+
137+
</div>
131138
</div><!-- END wrap -->
132139

133140
<div class="stickyFooter">

0 commit comments

Comments
 (0)