Skip to content

Commit

Permalink
All changes as of 2019-03-02 moving towards v1.0. Affects #50.
Browse files Browse the repository at this point in the history
  • Loading branch information
sirbeagle committed Mar 3, 2019
1 parent 2830104 commit c0efaa9
Show file tree
Hide file tree
Showing 8 changed files with 574 additions and 417 deletions.
154 changes: 102 additions & 52 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@
"build:pwa": "quasar build -m pwa"
},
"dependencies": {
"@quasar/extras": "^1.0.0",
"@quasar/extras": "^1.1.0",
"lodash.has": "^4.5.2",
"luxon": "^1.10.0",
"quasar": "^1.0.0-beta.4"
"quasar": "^1.0.0-beta.7"
},
"devDependencies": {
"@quasar/app": "^1.0.0-beta.0",
"@quasar/app": "^1.0.0-beta.9",
"@vue/eslint-config-standard": "^4.0.0",
"babel-eslint": "^10.0.1",
"eslint": "^5.10.0",
Expand Down
23 changes: 12 additions & 11 deletions src/components/calendar/Calendar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<div class="calendar-test">
<q-tabs
v-model="currentTab"
class="calendar-tabs"
class="text-primary calendar-tabs"
ref="fullCalendarTabs"
inverted
align="left"
>
<q-tab
name="tab-month"
Expand Down Expand Up @@ -37,9 +37,10 @@

<q-tab-panels
v-model="currentTab"
class="calendar-tab-panels"
animated
>
<q-tab-panel name="tab-month" class="calendar-tab-pane-month">
<q-tab-panel name="tab-month" class="calendar-tab-panel-month">
<calendar-month
:ref="'month-' + thisRefName"
:start-date="workingDate"
Expand All @@ -54,7 +55,7 @@

/>
</q-tab-panel>
<q-tab-panel name="tab-week-component" class="calendar-tab-pane-week">
<q-tab-panel name="tab-week-component" class="calendar-tab-panel-week">
<calendar-multi-day
:ref="'week-' + thisRefName"
:start-date="workingDate"
Expand All @@ -73,7 +74,7 @@

/>
</q-tab-panel>
<q-tab-panel name="tab-days-component" class="calendar-tab-pane-week">
<q-tab-panel name="tab-days-component" class="calendar-tab-panel-week">
<calendar-multi-day
:ref="'days-' + thisRefName"
:start-date="workingDate"
Expand All @@ -92,7 +93,7 @@

/>
</q-tab-panel>
<q-tab-panel name="tab-single-day-component" class="calendar-tab-pane-week">
<q-tab-panel name="tab-single-day-component" class="calendar-tab-panel-week">
<calendar-multi-day
:ref="'day-' + thisRefName"
:start-date="workingDate"
Expand All @@ -111,7 +112,7 @@

/>
</q-tab-panel>
<q-tab-panel name="tab-agenda" class="calendar-tab-pane-agenda">
<q-tab-panel name="tab-agenda" class="calendar-tab-panel-agenda">
<calendar-agenda
:ref="'agenda-' + thisRefName"
:start-date="workingDate"
Expand Down Expand Up @@ -246,13 +247,13 @@
<style lang="stylus">
@import 'calendar.vars.styl'
.calendar-tabs
.calendar-tab-pane-day,
.calendar-tab-pane-week
.calendar-tab-panels
.calendar-tab-panel-day,
.calendar-tab-panel-week
height 60vh
max-height 60vh
overflow hidden
.q-tab-pane
.q-tab-panel
border none
</style>
Loading

0 comments on commit c0efaa9

Please sign in to comment.