Skip to content

Commit 8193a44

Browse files
committed
Merge pull request #128 from sourcejs/0.5.1-rc
0.5.1 rc
2 parents 39c90dc + 548e9bd commit 8193a44

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1270
-655
lines changed

README.md

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,25 @@ Our main goal is to provide flexible, modular environment for managing reusable
1515
___
1616

1717

18-
[**Source engine project page**](http://sourcejs.com)     [**Documentation**](http://sourcejs.com/docs)     [**Quick Start**](http://sourcejs.com/docs/base)     [**Examples**](http://sourcejs.com/docs/base/#examples)    [**FAQ**](https://github.com/sourcejs/Source/issues?q=is%3Aissue+label%3Afaq+)    
18+
[**Source engine project page**](http://sourcejs.com)     [**Documentation**](http://sourcejs.com/docs)     [**Quick Start**](http://sourcejs.com/docs/base)     [**Examples**](http://sourcejs.com/docs/base/#examples)    [**How-to's**](https://github.com/sourcejs/blog-howto)
1919

2020
___
2121

2222
SourceJS component management engine was originally developed in [OK.ru](http://corp.mail.ru/en/communications/odnoklassniki) front-end development team and is recommended for big and middle sized projects. Especially for fast growing web portals, outsource teams with similar project and companies with multiple services.
2323

24-
## Things that SourceJS is NOT
24+
## SourceJS is NOT
25+
26+
To clear some confusion around Living Style Guide Platforms comparison, let us define few main differences.
2527

2628
### Static site builder
2729

2830
**SourceJS is a dynamic Node.js application**, and does not build static website as Pattern Lab, KSS, StyleDocco are doing. Dynamic environment allows to connect unlimited number of plugins and middlewares for compiling docs, styles, text right on the flight.
2931

3032
### CSS Documentation parser
3133

32-
Engine is based on gathering special documentation files (`index.src` by default), where you leave your HTML examples, template calls and description. All Specs are located in `sourcejs/user/specs` folder, and could contain any catalogue structure, with focus on component folders.
34+
Engine is based on gathering special documentation templates (`index.src`, `readme.md` and others), where you leave your HTML examples, template includes and description. All Specs are located in `sourcejs/user/specs` folder, and could contain any catalogue structure, with focus on component folders.
3335

34-
**But** engine will support [DSS](https://github.com/darcyclarke/DSS) as a plugin, which is universal CSS Documentation parser. So it will be possible to document your components both in CSS, Markdown and native `index.src`.
36+
**But** you can use official SourceJS plugin based on DSS, CSS Documentation parser - https://github.com/sourcejs/sourcejs-contrib-dss.
3537

3638
## Join the community
3739

@@ -40,7 +42,8 @@ Many teams are already using SourceJS for building and managing Front-end compon
4042
If you notice some bugs, or need to help finding a better solution in your process, feel free to create an issue, and we will solve your problem together.
4143

4244
## Updates
43-
* 15.03.15. New example [Specs showcase](http://sourcejs.com/specs/examples/) ([source code](https://github.com/sourcejs/examples))
45+
* 28.03.15. SourceJS [Bootstrap example bundle](https://github.com/sourcejs/example-bootstrap-bundle) and [How-to articles blog](https://github.com/sourcejs/blog-howto)
46+
* 15.03.15. New example [Specs showcase](http://sourcejs.com/specs/examples/) ([source code](https://github.com/sourcejs/examples))
4447
* 15.03.15. CSS Documentation support with DSS https://github.com/sourcejs/sourcejs-contrib-dss
4548
* 12.03.15. **[0.5.0](https://github.com/sourcejs/Source/releases/tag/0.5.0) release** with full Markdown support, GitHub auth, `info.json` watchers and other improvements
4649
* 24.02.15. [0.4.1](https://github.com/sourcejs/Source/releases/tag/0.4.1) patch release
@@ -52,17 +55,25 @@ If you notice some bugs, or need to help finding a better solution in your proce
5255
* 31.07.14. 0.4.0-beta release
5356
* 01.05.14. Engine presentation from [Front-end Ops Conf](http://www.feopsconf.com/), San Francisco - [Taking Development Tools To The Next Level](http://rhr.me/pres/ime/) with [video](https://www.youtube.com/watch?v=cMIad0zl00I)
5457
* 31.01.14. [Preview](http://youtu.be/cefy_U5NU4o) of Source companion tool for prototyping interfaces using existing components
55-
* 31.12.13. **0.3.2** release
58+
* 31.12.13. **0.3.2 release**
5659
* 09.10.13. Engine [presentation](http://rhr.me/pres/source-min/) on [Fronteers Jam](http://fronteers.nl/congres/2013/jam-session) ([video](https://vimeo.com/77989211))
5760
* 23.09.13. Published [video recording](http://www.youtube.com/watch?v=3HNW5Bru0Ws) of Source engine presentation from [RIT++](http://ritconf.ru/) 2013 (RU)
5861

5962
## Upcoming updates
6063

61-
* Support of multiple documentation projects in one environment
62-
* Screencasts and engine usage demos
63-
* Full english documentation stack for core API
64-
* Test coverage
65-
* Stable v1.0.0 version
64+
Respecting open source community, we track all our tasks publicly on GitHub. Follow our [milestones](https://github.com/sourcejs/example-bootstrap-bundle) and twitter announcements [@SourceJS](http://sourcejs.com) to keep in sync with latest plans.
65+
66+
List of few global upcoming features
67+
68+
* Refactored code snippets API
69+
* Integrations with JSDoc and drop-in replacement setup for other Style Guide tools like KSS/Pattern Lab
70+
* More screencasts and engine usage demos
71+
* Wider support of multiple documentation projects in one environment
72+
* Full documentation stack for core API for writing plugins
73+
74+
SourceJS follows semantic versioning and we do our best to keep as less breaking changes as possible.
75+
76+
Preparing to 1.0 release, we plan to keep migration path very smooth and painless. So if you will keep in sync with minor releases and API deprecation announcements, you won't face any problems setting up major release updates.
6677

6778
## Useful information
6879

app.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ try {
151151

152152

153153
// Watchers
154-
if (global.opts.core.watch.enabled && global.MODE !== 'presentation') {
154+
if (global.opts.core.watch.enabled && global.MODE === 'development') {
155155
require('./core/watchNewSpecs');
156156
}
157157

@@ -187,7 +187,7 @@ var logErrors = function(err, req, res, next) {
187187
var url = req.url || '';
188188

189189
log.debug(req.method, req.headers);
190-
log.error(url.red, ('Error: ' + err.stack).red);
190+
log.error(('Requested url: ' + url).red, ('Error: ' + err.stack).red);
191191

192192
if (req.xhr) {
193193
res.status(500).json({msg: 'Server error'});

assets/css/base/grids.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
display: inline-block;
1313

1414
vertical-align: top;
15-
width: 33.1%;
15+
width: 33%;
1616
padding-right: 25px;
1717

1818
box-sizing: border-box;

assets/css/cosmetic/highlights.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
background: @light-gray;
66
font-family: Menlo, Monaco, Consolas, monospace;
77
font-size: .85em;
8-
padding: 2px 4px 1px;
8+
padding: 0 3px;
99
border-radius: 3px;
1010
border: 1px solid #dfe2e4;
1111
white-space: normal;

assets/css/project/catalog.less

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,24 @@
1515
font-size: @fz-size-m;
1616
line-height: 1.5;
1717

18+
color: @gray !important;
19+
1820
&_h2,
1921
h2 {
22+
line-height: 1.5 !important;
2023
font-size: 22px !important;
2124
color: @black !important;
2225
margin: 20px 0 5px 0 !important;
2326
font-weight: normal !important;
27+
28+
a {
29+
color: @black;
30+
text-decoration: underline;
31+
32+
&:hover {
33+
text-decoration: none;
34+
}
35+
}
2436
}
2537

2638
&.__show-preview {
@@ -55,6 +67,7 @@
5567
}
5668
}
5769

70+
.source_catalog > p,
5871
.source_catalog_tx {
5972
margin: 0 0 20px !important;
6073

@@ -70,6 +83,7 @@
7083
}
7184
}
7285

86+
.source_subhead > p,
7387
.source_subhead .source_catalog_tx {
7488
margin: 0 0 10px !important;
7589
min-height: 0;

assets/css/project/clarify-in-spec.less

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22
display: block !important;
33
width: 18px;
44
height: 18px;
5-
background: url("/source/assets/i/link-external.svg") !important;
6-
background-size: 100% 100% !important;
5+
background: url("/source/assets/i/link-external.svg") 50% no-repeat !important;
6+
background-size: contain !important;
77
float: right !important;
88
margin-right: -15px !important;
99
margin-top: 5px !important;
1010
}
1111

1212
.source_section > h3 > .source_clarify-in-spec_link {
13-
width: 26px;
13+
width: 27px;
1414
margin-top: 3px !important;
15+
margin-right: -19px !important;
1516
background-color: #fff !important;
1617
z-index: 1 !important;
1718
position: relative !important;

assets/css/project/info.less

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@
2929
margin-bottom: 0 !important;
3030
}
3131
}
32+
33+
th, td {
34+
border-color: #868686 !important;
35+
}
36+
37+
> *:last-child {
38+
margin-bottom: 0 !important;
39+
}
3240
}
3341

3442
.source_info {
@@ -37,55 +45,80 @@
3745
padding: 15px 25px !important;
3846
min-height: 50px !important;
3947
margin: 15px 0 !important;
40-
margin-right: @layout_spec--inner-margin-right !important;
48+
49+
@media @media_min-step-m {
50+
margin-right: @layout_spec--inner-margin-right !important;
51+
}
4152

4253
.source_section & {
4354
margin-right: 0 !important;
4455
}
4556
}
4657

4758
.source_warn {
48-
margin: 20px @layout_spec--inner-margin-right 20px 0 !important;
59+
margin: 20px 0 !important;
4960
padding: 10px 10px 10px 35px !important;
5061

5162
background: #ffe2e5 url(/source/assets/i/warn.png) no-repeat 13px 13px !important;
5263

64+
@media @media_min-step-m {
65+
margin-right: @layout_spec--inner-margin-right !important;
66+
}
67+
5368
.source_section & {
5469
margin-right: 0 !important;
5570
}
5671
}
5772

5873
.source_note {
59-
margin: 20px @layout_spec--inner-margin-right 20px 0 !important;
74+
margin: 20px 0 !important;
6075
padding: 10px 10px 10px 35px !important;
6176

6277
background: #DCF1FA url(/source/assets/i/note.png) no-repeat 13px 13px !important;
6378

79+
@media @media_min-step-m {
80+
margin-right: @layout_spec--inner-margin-right !important;
81+
}
82+
6483
.source_section & {
6584
margin-right: 0 !important;
6685
}
6786
}
6887

6988
.source_doc {
70-
margin: 20px @layout_spec--inner-margin-right 20px 0 !important;
89+
margin: 20px 0 !important;
7190
padding: 10px 25px !important;
7291

7392
background: #DCFCDA !important;
7493
font-family: Menlo, Monaco, Consolas, monospace !important;
7594

95+
@media @media_min-step-m {
96+
margin-right: @layout_spec--inner-margin-right !important;
97+
}
98+
99+
& code,
100+
& p {
101+
font-family: Menlo, Monaco, Consolas, monospace !important;
102+
}
103+
76104
.source_section & {
77105
margin-right: 0 !important;
78106
}
79107
}
80108

81109
.source_data {
82-
margin: 20px @layout_spec--inner-margin-right 20px 0 !important;
110+
margin: 20px 0 !important;
83111
padding: 10px 25px !important;
84112

85113
border: 1px dotted #ccc !important;
86114
background: #f9f9f9 !important;
87115
font-size: 11px !important;
88116

117+
118+
@media @media_min-step-m {
119+
margin-right: @layout_spec--inner-margin-right !important;
120+
}
121+
89122
.source_section & {
90123
margin-right: 0 !important;
91124
}

assets/css/project/layout.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575

7676
font-family: @font-family-main;
7777
font-size: @fz-size-m;
78+
color: @gray;
7879
line-height: 1.5;
7980

8081
// Clearfix

assets/css/project/navigation.less

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,12 @@
8888
.source_main_nav_li2 {
8989
color: #666;
9090
overflow: hidden;
91+
display: none;
9192
text-overflow: ellipsis;
9293
white-space: nowrap;
93-
line-height: 0;
94-
transition: line-height 0.2s;
9594
}
9695
.source_main_nav_li.__active .source_main_nav_li2 {
97-
line-height: 20px;
96+
display: block;
9897
}
9998

10099
.source_nav_ul .source_main_nav_a {

assets/css/project/section.less

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -86,39 +86,9 @@
8686
margin: 15px 0;
8787
}
8888

89-
& > table {
90-
margin: 20px 0 30px;
91-
border-collapse: collapse;
92-
border-spacing: 0;
93-
font-size: @fz-size-m;
94-
font-family: @font-family-main;
95-
line-height: 1.5;
96-
}
97-
98-
& > table td,
99-
& > table th {
100-
padding: 0;
101-
}
102-
103-
& > table th,
104-
& > table td {
105-
padding: 6px 13px;
106-
border: 1px solid #ddd;
107-
}
108-
109-
& > table th,
110-
& > table td {
111-
padding: 6px 13px;
112-
border: 1px solid #ddd;
113-
}
114-
11589
& > pre {
11690
.reset();
11791
}
118-
119-
& > table tr {
120-
border-top: 1px solid #ccc;
121-
}
12292
}
12393

12494
/* Dynamics

0 commit comments

Comments
 (0)