Skip to content
This repository has been archived by the owner on Nov 16, 2018. It is now read-only.

Markup cleanup #118

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Markup cleanup #118

wants to merge 7 commits into from

Conversation

unthunk
Copy link

@unthunk unthunk commented Oct 26, 2015

Since this is a port of a jQuery plugin, updated markup in plugin to more closely match. Replaced the custom CSS for this plugin with the CSS from the jQuery plugin and added the origin plugin as a dependency. Also fixed/removed positioning CSS in plugin (no changes to positioning logic). These changes should be useful for anyone porting from the jQuery plugin to React or supporting both versions.

Replaced CSS files with those from eonasdan-bootstrap-datetimepicker for better feature parity
Updated Examples to use eonasdan-bootstrap-datetimepicker CSS
…and fixed/removed positioning styles etiher included in CSS or not needed
<!doctype html public "embarassment">
<!doctype html>
<html>
<head>
<title>Basic Example</title>
<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
<link href="../bootstrap-datetimepicker.min.css" rel="stylesheet">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like because you removed the minified version, this won't work anymore

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what you are referring to being removed? If you mean the style sheet it was replaced with the current one from eonasdan-bootstrap-datetimepicker in commit 7aca80be75649f4987f0b62b61f61646ef63dd34.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my bad I didn't look at github's diff correctly

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah ok, no prob.

@chollier
Copy link
Member

Thanks @unthunk for your contribution. I don't think there was anything custom in the CSS, I simply copied it from the plugin, however it is possible I did this for the version 3 of the plugin not 4.

Is there a specific reason you removed the minified version ?

@unthunk
Copy link
Author

unthunk commented Oct 26, 2015

Hi @chollier,

If you are referring to the minified stylesheet is should still be there, just with the current version from eonasdan-bootstrap-datetimepicker. If it's a different file you are referring to let me, I didn't intentionally remove/omit any files and can make an update if needed.

@unthunk
Copy link
Author

unthunk commented Oct 28, 2015

Just added fixes for the broken tests.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants