Skip to content

Commit

Permalink
Merged in adamalbrecht#61 without the show-week-numbers option.
Browse files Browse the repository at this point in the history
This option was removed to avoid having to use tested tables for layout.

Merge branch 'master' of https://github.com/tymarats/ngQuickDate

Conflicts:
	bower.json
	dist/ng-quick-date.js
	dist/ng-quick-date.min.js
	package.json
	spec/configuration-specs.coffee
	src/ng-quick-date.coffee
  • Loading branch information
Jon Yonker committed Oct 7, 2014
1 parent c6046a0 commit 6dfcb60
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 180 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ There are a number of options that be configured inline with attributes. Here ar
| default-time | null | Time that will be set when you click on a date on the calendar. Must be in 24-hour format. |
| init-value | null | Set the initial value of the date inline as a string. Will be immediately parsed and set as the value of your model.|
| date-filter | null | Set to a function to enable/disable dates. Useful for disabling weekends, etc. [See more below](#date-filter-function) |
| show-week-numbers | false | If true, show week numbers in the calendar. |
| min-date | null | If set, denotes the minimum date allowed to be selected. Dates before minDate will be disabled |
| max-date | null | If set, denotes the maximum date allowed to be selected. Dates after maxDate will be disabled |

Expand Down
1 change: 0 additions & 1 deletion demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
var app = angular.module("ngQuickDateDemo", ["ngQuickDate"]);
app.config(function(ngQuickDateDefaultsProvider) {
return ngQuickDateDefaultsProvider.set({
showWeekNumbers: true,
disableTimepicker: true,
disableOther: true
});
Expand Down
17 changes: 4 additions & 13 deletions dist/ng-quick-date-default-theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -47,23 +47,14 @@
.quickdate-prev-month i {
padding-right: 10px;
}
table.quickdate-calendar-wrapper {
width: 100%;
}
table.quickdate-calendar-weeks {
border: none;
}
table.quickdate-calendar-weeks td {
border: 1px solid #ccc;
background-color: #ffffff;
}
table.quickdate-calendar {
border: none;
border: solid 1px #ccc;
background-color: #ffffff;
}
table.quickdate-calendar th,
table.quickdate-calendar td {
background-color: #ffffff;
border: 1px solid #ccc;
border-right: 1px solid #ccc;
border-bottom: 1px solid #ccc;
}
table.quickdate-calendar td:hover {
background-color: #e6e6e6;
Expand Down
42 changes: 7 additions & 35 deletions dist/ng-quick-date-plus-default-theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -53,26 +53,17 @@ a.quickdate-next-month {
.quickdate-text-inputs {
text-align: left;
margin-bottom: 5px;
display: table;
table-layout: fixed;
width: 100%;
}
.quickdate-input-wrapper {
display: table-cell;
padding-left: 2px;
}
.quickdate-input-wrapper:first-child {
padding-left: 0;
width: 48%;
display: inline-block;
}
input.quickdate-date-input,
input.quickdate-time-input {
width: 100%;
width: 100px;
margin: 0;
height: auto;
padding: 2px 3px;
box-sizing: border-box;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
}
table.quickdate-calendar {
border-collapse: collapse;
Expand All @@ -87,16 +78,6 @@ table.quickdate-calendar td {
table.quickdate-calendar td:hover {
cursor: pointer;
}
table.quickdate-calendar-weeks {
border-collapse: collapse;
border-spacing: 0;
margin-top: 5px;
margin-right: 10px;
}
table.quickdate-calendar-weeks th,
table.quickdate-calendar-weeks td {
padding: 5px;
}
.quickdate-popup-footer {
text-align: right;
display: block;
Expand Down Expand Up @@ -157,23 +138,14 @@ table.quickdate-calendar-weeks td {
.quickdate-prev-month i {
padding-right: 10px;
}
table.quickdate-calendar-wrapper {
width: 100%;
}
table.quickdate-calendar-weeks {
border: none;
}
table.quickdate-calendar-weeks td {
border: 1px solid #ccc;
background-color: #ffffff;
}
table.quickdate-calendar {
border: none;
border: solid 1px #ccc;
background-color: #ffffff;
}
table.quickdate-calendar th,
table.quickdate-calendar td {
background-color: #ffffff;
border: 1px solid #ccc;
border-right: 1px solid #ccc;
border-bottom: 1px solid #ccc;
}
table.quickdate-calendar td:hover {
background-color: #e6e6e6;
Expand Down
25 changes: 3 additions & 22 deletions dist/ng-quick-date.css
Original file line number Diff line number Diff line change
Expand Up @@ -53,26 +53,17 @@ a.quickdate-next-month {
.quickdate-text-inputs {
text-align: left;
margin-bottom: 5px;
display: table;
table-layout: fixed;
width: 100%;
}
.quickdate-input-wrapper {
display: table-cell;
padding-left: 2px;
}
.quickdate-input-wrapper:first-child {
padding-left: 0;
width: 48%;
display: inline-block;
}
input.quickdate-date-input,
input.quickdate-time-input {
width: 100%;
width: 100px;
margin: 0;
height: auto;
padding: 2px 3px;
box-sizing: border-box;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
}
table.quickdate-calendar {
border-collapse: collapse;
Expand All @@ -87,16 +78,6 @@ table.quickdate-calendar td {
table.quickdate-calendar td:hover {
cursor: pointer;
}
table.quickdate-calendar-weeks {
border-collapse: collapse;
border-spacing: 0;
margin-top: 5px;
margin-right: 10px;
}
table.quickdate-calendar-weeks th,
table.quickdate-calendar-weeks td {
padding: 5px;
}
.quickdate-popup-footer {
text-align: right;
display: block;
Expand Down
34 changes: 12 additions & 22 deletions dist/ng-quick-date.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6dfcb60

Please sign in to comment.