Reorganize docs assets #12505

Merged
merged 1 commit into from Mar 7, 2014

Projects

None yet

4 participants

@zdroid
zdroid commented Feb 1, 2014

No description provided.

@cvrebert cvrebert and 2 others commented on an outdated diff Feb 2, 2014
@@ -53,7 +53,7 @@ module.exports = function (grunt) {
src: 'js/tests/unit/*.js'
},
assets: {
- src: ['docs/assets/js/application.js', 'docs/assets/js/customizer.js']
+ src: 'docs/assets/js/{application,customizer,ie8-responsive-file-warning}.js'
@cvrebert
cvrebert Feb 2, 2014 Bootstrap member

I'm onboard with trying to lint everything, but using brace expansion seems kinda messy.
Maybe we could move the minified assets into a subdirectory so that simple *.js globbing would work here?

@zdroid
zdroid Feb 2, 2014

That was my original thought. But there is another solution: move *.js to the docs/assets/js/src and ignore docs/assets/js/ when build Jekyll site (like for docs/assets/js/vendor), but keep the *.min.js ones.

@XhmikosR
XhmikosR Feb 6, 2014 Bootstrap member

@ZDroid: I'm not sure you can ignore that folder due to a Jekyll bug.

@zdroid
zdroid Feb 6, 2014

Are you sure? I tested directory ignore locally and it worked, I didn't catch any bug.

@XhmikosR
XhmikosR Feb 6, 2014 Bootstrap member

What exactly did you add in the exclude array in _config.yml?

@zdroid
zdroid Feb 6, 2014

You should move source js files to src/ then exclude src, like vendor.

@XhmikosR
XhmikosR Feb 7, 2014 Bootstrap member

It shouldn't be too hard to separate the minified JS files. But we really need to stop generating raw-files.min since it's being minified again.

@cvrebert
cvrebert Feb 7, 2014 Bootstrap member

There's no raw-files.js. raw-files.min.js isn't truly minified, its just not human-readable.

@XhmikosR
XhmikosR Feb 7, 2014 Bootstrap member

That's what I meant. I know it's not truly minified but it is not used since it's just concatenated and minified to customize.min.js.

@zdroid
zdroid commented Feb 6, 2014

@cvrebert Any news?

@cvrebert
Member
cvrebert commented Feb 6, 2014

This is blocked until the minified vs. non-minified directory structure is sorted out.

@cvrebert cvrebert added this to the v3.2.0 milestone Feb 11, 2014
@zdroid
zdroid commented Feb 17, 2014

@cvrebert @XhmikosR I reorganized them now, on the simplest way. Tell me if I missed something.

@zdroid
zdroid commented Feb 17, 2014

Maybe to move pygments-manni.css into vendor, not source (it's vendor CSS but it's modified)?

@XhmikosR
Member

About pygment_manni.css, I was thinking to move it to vendor.

Now for the rest, I will have a closer look tomorrow, but I guess this does the job.

@zdroid
zdroid commented Feb 17, 2014

Good then.

@cvrebert
Member

Perhaps we should move the outputs into dist, rather than moving the inputs into source?
(Or if not, at least rename source to src for brevity+consistency?)

@XhmikosR
Member

I think those make sense, too @cvrebert. But I'm not sure which one of the two ways I prefer myself to be honest :P

@zdroid
zdroid commented Feb 18, 2014

Yes, src/ should be used as we're using dist/.

2014-02-18 7:01 GMT+01:00 XhmikosR notifications@github.com:

I think those make sense, too @cvrebert https://github.com/cvrebert.
But I'm not sure which one of the two ways I prefer myself to be honest :P


Reply to this email directly or view it on GitHubhttps://github.com/twbs/bootstrap/pull/12505#issuecomment-35355224
.

Zlatan Vasović - ZDroid

@zdroid
zdroid commented Feb 18, 2014

Done.

@XhmikosR
Member

LGTM. We can't use dist because that would ignore all dist folders in jekyll.

So I think this is good to merge. @cvrebert: waiting for your final word on this. :)

@mdo
Member
mdo commented Mar 7, 2014

This will need a rebase I think before we can merge.

@cvrebert
Member
cvrebert commented Mar 7, 2014

@XhmikosR LGTM.

@zdroid
zdroid commented Mar 7, 2014

Awww the hell. I have to rebase this.

@zdroid
zdroid commented Mar 7, 2014

@cvrebert What will we do with raw-files.min.js? It should also be ignored from Jekyll.

@cvrebert
Member
cvrebert commented Mar 7, 2014

@ZDroid That's not much of a priority right now. I wouldn't worry about it.

@zdroid
zdroid commented Mar 7, 2014

Okay.

2014-03-07 17:24 GMT+01:00 Chris Rebert notifications@github.com:

@ZDroid https://github.com/ZDroid That's not much of a priority right
now. I wouldn't worry about it.


Reply to this email directly or view it on GitHubhttps://github.com/twbs/bootstrap/pull/12505#issuecomment-37039704
.

Zlatan Vasović - ZDroid

Zlatan Vasovi�� Reorganize docs assets d08bbdc
@zdroid
zdroid commented Mar 7, 2014

Everything should be fine now.

@cvrebert cvrebert merged commit b9a0d1e into twbs:master Mar 7, 2014

1 check passed

Details default The Travis CI build passed
@zdroid zdroid deleted the unknown repository branch Mar 7, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment