diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-07-02 12:27:53 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-07-06 10:41:09 +0000 |
| commit | 36c40a1cebe522e2655ab05d4e461eddbed364c7 (patch) | |
| tree | b8d714cd20904933384e04a1209790c2a8625d18 /src/imports/calendar | |
| parent | 44cb549108913757277bd266c64aac9b2f6e6e8e (diff) | |
Remove non-color properties from Theme
Better start with a minimal set. It will be also easier to transition
from Theme to Palette if it gets done.
Change-Id: Ic9951ac5b913f99a84e2b8efb9ae7f8d61177aee
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Diffstat (limited to 'src/imports/calendar')
| -rw-r--r-- | src/imports/calendar/CalendarView.qml | 2 | ||||
| -rw-r--r-- | src/imports/calendar/DayOfWeekRow.qml | 4 | ||||
| -rw-r--r-- | src/imports/calendar/WeekNumberColumn.qml | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/calendar/CalendarView.qml b/src/imports/calendar/CalendarView.qml index 9a6c8d1e..7fd1ee0f 100644 --- a/src/imports/calendar/CalendarView.qml +++ b/src/imports/calendar/CalendarView.qml @@ -59,7 +59,7 @@ AbstractCalendarView { opacity: model.month === control.month ? 1 : 0 color: model.today ? control.Theme.accentColor : control.Theme.textColor text: model.day - padding: control.Theme.padding + padding: control.padding } //! [delegate] diff --git a/src/imports/calendar/DayOfWeekRow.qml b/src/imports/calendar/DayOfWeekRow.qml index 08532527..581071b1 100644 --- a/src/imports/calendar/DayOfWeekRow.qml +++ b/src/imports/calendar/DayOfWeekRow.qml @@ -46,8 +46,8 @@ AbstractDayOfWeekRow { implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding) - topPadding: Theme.padding - bottomPadding: Theme.padding + topPadding: 6 + bottomPadding: 6 //! [delegate] delegate: Text { diff --git a/src/imports/calendar/WeekNumberColumn.qml b/src/imports/calendar/WeekNumberColumn.qml index 8c0e75fa..221b9d71 100644 --- a/src/imports/calendar/WeekNumberColumn.qml +++ b/src/imports/calendar/WeekNumberColumn.qml @@ -46,8 +46,8 @@ AbstractWeekNumberColumn { implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding) - leftPadding: Theme.padding - rightPadding: Theme.padding + leftPadding: 6 + rightPadding: 6 //! [delegate] delegate: Text { |