This repository was archived by the owner on Jun 21, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 529
Bootstrap 4 full support #122
Open
djibe
wants to merge
52
commits into
weareoutman:gh-pages
Choose a base branch
from
djibe:gh-pages
base: gh-pages
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 5 commits
Commits
Show all changes
52 commits
Select commit
Hold shift + click to select a range
d92d7ed
Bootstrap 4 compatible
djibe 729db5b
Bootstrap 4 css
djibe 0fa85ec
Bootstrap 4 minified CSS
djibe 3d4f617
Bootstrap 4 js
djibe a9b2ccd
Bootstrap 4 js minified
djibe c08a1e6
Update README.md
djibe 75ea345
Update bootstrap4-clockpicker.js
djibe 4204244
Update bootstrap4-clockpicker.min.js
djibe 9c65ca1
Update bootstrap4-clockpicker.css
djibe d82b693
Update bootstrap4-clockpicker.min.css
djibe 803c5b3
Update README.md
djibe acc7e17
Update README.md
djibe 07d021e
v0.2
djibe c1f94a0
v0.2
djibe 1769182
Update README.md
djibe d822380
BS4 + material design
djibe c8a560d
Add files via upload
djibe ae69e24
Update README.md
djibe 10fc511
Add files via upload
djibe 53ee5df
Delete clockpicker-bs4.png
djibe 2a69527
Add files via upload
djibe 1ccd50e
Update README.md
djibe 1b818a7
Update README.md
djibe d068634
Update README.md
djibe 556c524
Update README.md
djibe 2cf5795
Update bower.json
djibe 97c65e7
Delete bootstrap4-clockpicker.min.js
djibe 6d385d4
0.2.1
djibe 5dd5032
0.2.1
djibe 08adaf7
Delete clockpicker-bs4 (2).png
djibe 4045fac
Delete clockpicker-bs4-material (2).png
djibe 886a7c2
Delete clockpicker-bs4-material.png
djibe bf5382d
Delete clockpicker-bs4.png
djibe de69e28
0.2.1
djibe b85c251
0.2.1
djibe b334944
0.2.3
djibe 0839bbf
0.2.2
djibe 55f21b9
0.2.2
djibe 1d03466
0.2.2
djibe 1a57e60
0.2.2
djibe 2b9326f
0.2.2
djibe 204417a
Removed this.parseInputValue() from getTime function
poradz e7642a4
Prevented the popover position from overflowing outside the window
191ca92
Merge pull request #4 from poradz/poradz-position-fix
djibe 8ba67dd
Merge pull request #2 from poradz/poradz-callbacks-fix
djibe 0fab781
0.2.3
djibe 085b47b
Add files via upload
djibe 1d5a089
Fix on am/pm parsing on load
r3dqu33n 55f1413
Merge pull request #5 from r3dqu33n/gh-pages
djibe bad016b
0.2.3
djibe e87e0d3
Fixed #8 (minify)
rskrzypczak a9adcd8
Merge pull request #9 from rskrzypczak/gh-pages
djibe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,200 @@ | ||
| /*! | ||
| * ClockPicker v0.2.1 for Bootstrap (http://weareoutman.github.io/clockpicker/) | ||
| * Copyright 2014 Wang Shenwei. | ||
| * Licensed under MIT (https://github.com/weareoutman/clockpicker/blob/gh-pages/LICENSE) | ||
| * Bootstrap 4 compatibility by djibe | ||
| */ | ||
|
|
||
| :root { | ||
| /* Just set your primary color in decimal RGB */ | ||
| --primary-color: 19, 122, 249; | ||
| } | ||
|
|
||
| .clockpicker .input-group-addon { | ||
| cursor: pointer; | ||
| } | ||
|
|
||
| .clockpicker-moving { | ||
| cursor: move; | ||
| } | ||
|
|
||
| .clockpicker-align-left.popover > .arrow { | ||
| left: 25px; | ||
| } | ||
|
|
||
| .clockpicker-align-top.popover > .arrow { | ||
| top: 17px; | ||
| } | ||
|
|
||
| .clockpicker-align-right.popover > .arrow { | ||
| left: auto; | ||
| right: 25px; | ||
| } | ||
|
|
||
| .clockpicker-align-bottom.popover > .arrow { | ||
| top: auto; | ||
| bottom: 6px; | ||
| } | ||
|
|
||
| .clockpicker-popover .popover-title { | ||
| background-color: var(--primary); | ||
| color: #fff; | ||
| font-size: 24px; | ||
| font-weight: bold; | ||
| line-height: 30px; | ||
| text-align: center; | ||
| } | ||
|
|
||
| .clockpicker-popover .popover-title span { | ||
| cursor: pointer; | ||
| } | ||
|
|
||
| .clockpicker-popover .popover-content { | ||
| background-color: #fff; | ||
| padding: 12px; | ||
| } | ||
|
|
||
| .popover-content:last-child { | ||
| border-bottom-left-radius: 5px; | ||
| border-bottom-right-radius: 5px; | ||
| } | ||
|
|
||
| .clockpicker-plate { | ||
| background-color: #ededee; | ||
| border: 2px solid #dedede; | ||
| border-radius: 50%; | ||
|
||
| width: 200px; | ||
| height: 200px; | ||
| overflow: visible; | ||
| position: relative; | ||
| /* Disable text selection highlighting. Thanks to Hermanya */ | ||
| -webkit-touch-callout: none; | ||
| -webkit-user-select: none; | ||
| -moz-user-select: none; | ||
| -ms-user-select: none; | ||
| user-select: none; | ||
| } | ||
|
|
||
| .clockpicker-canvas, | ||
| .clockpicker-dial { | ||
| width: 200px; | ||
| height: 200px; | ||
| position: absolute; | ||
| left: -1px; | ||
| top: -1px; | ||
| } | ||
|
|
||
| .clockpicker-minutes { | ||
| visibility: hidden; | ||
| } | ||
|
|
||
| .clockpicker-tick { | ||
| border-radius: 50%; | ||
| color: #666; | ||
| line-height: 26px; | ||
| text-align: center; | ||
| width: 26px; | ||
| height: 26px; | ||
| position: absolute; | ||
| cursor: pointer; | ||
| } | ||
|
|
||
| .clockpicker-tick.active, | ||
| .clockpicker-tick:not(.disabled):hover { | ||
| background-color: rgba(var(--primary-color), 0.25); | ||
| } | ||
|
|
||
| .clockpicker-tick.disabled { | ||
| color: #eee; | ||
| cursor: default; | ||
| } | ||
|
|
||
| .clockpicker-button { | ||
| background-image: none; | ||
| background-color: #fff; | ||
| border-width: 1px 0 0; | ||
| border-top-left-radius: 0; | ||
| border-top-right-radius: 0; | ||
| margin: 0; | ||
| padding: 10px 0; | ||
| } | ||
|
|
||
| .clockpicker-button:hover { | ||
| background-image: none; | ||
| background-color: #ebebeb; | ||
| } | ||
|
|
||
| .clockpicker-button:focus { | ||
| outline: none!important; | ||
| } | ||
|
|
||
| .clockpicker-dial { | ||
| -webkit-transition: -webkit-transform 350ms, opacity 350ms; | ||
| -o-transition: -o-transform 350ms, opacity 350ms; | ||
| -webkit-transition: opacity 350ms, -webkit-transform 350ms; | ||
| transition: opacity 350ms, -webkit-transform 350ms; | ||
| -o-transition: transform 350ms, opacity 350ms; | ||
| transition: transform 350ms, opacity 350ms; | ||
| transition: transform 350ms, opacity 350ms, -webkit-transform 350ms; | ||
| } | ||
|
|
||
| .clockpicker-dial-out { | ||
| opacity: 0; | ||
| } | ||
|
|
||
| .clockpicker-hours.clockpicker-dial-out { | ||
| -webkit-transform: scale(1.2, 1.2); | ||
| -ms-transform: scale(1.2, 1.2); | ||
| transform: scale(1.2, 1.2); | ||
| } | ||
|
|
||
| .clockpicker-minutes.clockpicker-dial-out { | ||
| -webkit-transform: scale(.8, .8); | ||
| -ms-transform: scale(.8, .8); | ||
| transform: scale(.8, .8); | ||
| } | ||
|
|
||
| .clockpicker-canvas { | ||
| -webkit-transition: opacity 175ms; | ||
| -o-transition: opacity 175ms; | ||
| transition: opacity 175ms; | ||
| } | ||
|
|
||
| .clockpicker-canvas-out { | ||
| opacity: .25; | ||
| } | ||
|
|
||
| .clockpicker-canvas-bearing, | ||
| .clockpicker-canvas-fg { | ||
| stroke: none; | ||
| fill: #747474; | ||
| } | ||
|
|
||
| .clockpicker-canvas-bg { | ||
| stroke: none; | ||
| fill: var(--primary-light); | ||
| } | ||
|
|
||
| .clockpicker-canvas-bg-trans { | ||
| /*fill: rgba(0, 149, 221, .25);*/ | ||
| fill: rgba(var(--primary-color), .25); | ||
| } | ||
|
|
||
| .clockpicker-canvas line { | ||
| stroke: var(--primary); | ||
| stroke-width: 1; | ||
| stroke-linecap: round; | ||
| /*shape-rendering: crispEdges;*/ | ||
| } | ||
| .clockpicker-button.am-button { | ||
| /*margin: 1px; | ||
| padding: 5px; | ||
| border: 1px solid rgba(0, 0, 0, .2); | ||
| border-radius: 4px;*/ | ||
| } | ||
| .clockpicker-button.pm-button { | ||
| /*margin: 1px 1px 1px 136px; | ||
| padding: 5px; | ||
| border: 1px solid rgba(0, 0, 0, .2); | ||
| border-radius: 4px;*/ | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Has this default changed in the code as well?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In BS4 code yes