Skip to content

Commit

Permalink
Merge pull request #27 from jesusantguerrero/fix-modal-footer
Browse files Browse the repository at this point in the history
improve modal styles
  • Loading branch information
jesusantguerrero authored Feb 13, 2021
2 parents 83e6c1f + efb16d8 commit da6d8c3
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/components/molecules/ModalBase.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</button>
</div>
</slot>
<div class="modal__body ic-scroller pb-10">
<div class="modal__body ic-scroller pb-20">
<slot name="body"></slot>
</div>
<div class="modal__footer px-5 py-2 text-right absolute bottom-0 w-full bg-white">
Expand Down
4 changes: 2 additions & 2 deletions src/components/molecules/TaskItem.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div
class="task-item mb-2 shadow-md bg-white border-gray-200 hover:border-green-200 border-2 px-4 py-3 rounded-md items-center transition-all"
:class="{'border-green-400': isSelected, 'cursor-pointer': handleMode || isItemAsHandler }"
class="task-item mb-2 shadow-md bg-white border-gray-200 hover:border-green-200 border-2 px-4 py-3 rounded-md items-center transition-all cursor-pointer"
:class="{'border-green-400': isSelected}"
@click="emit('selected', task)"
@dblclick="emit('edited', task)"

Expand Down
24 changes: 11 additions & 13 deletions src/components/organisms/TimeTrackerModal.vue
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<template>
<modal-base v-model:is-open="isOpenLocal">
<template #title>
<h1 class="pt-5 text-xl font-bold">
<h1 class="py-2 px-5 text-xl font-bold text-left">
Promodoro Configuration

</h1>
</template>

<template #body>
<form action="" @submit.prevent="save" class="pt-5 px-5 text-left prose mx-auto">
<form action="" @submit.prevent="save" class="pt-5 px-5 text-left mx-auto">
<!-- <h4> User preferences </h4> -->
<!-- <div class="form-group">
<label for="">
Expand All @@ -30,7 +29,7 @@
</label>
</div> -->

<h4> Workflow Template </h4>
<h4 class="font-bold"> Workflow Template </h4>
<div class="form-group">
<div class="workflow-item capitalize text-sm mb-10 inline-block"
v-for="(item, index) in formData.template"
Expand All @@ -41,7 +40,7 @@
</div>
</div>

<h4> Workflow Items </h4>
<h4 class="font-bold"> Workflow Items </h4>
<div class="form-group">
<div class="workflow-item capitalize text-sm mb-10"
v-for="(item, key) in formData.modes"
Expand All @@ -52,14 +51,17 @@
</div>
</div>

<h4> Select sound </h4>
<div class="form-group">
<select name="" class="form-control">
<h4 class="font-bold"> Select sound </h4>
<div class="form-group flex space-x-2">
<select name="" class="form-control w-full">
<option value="">Alarm Clock</option>
</select>
<button class="bg-gray-700 text-white px-5 py-1 focus:outline-none rounded-md w-40" @click.prevent="playSound()">
Test Audio
</button>
</div>

<h4> Set Times </h4>
<h4 class="font-bold"> Set Times </h4>
<div class="flex">
<div class="form-group">
<label for="">
Expand Down Expand Up @@ -94,10 +96,6 @@
>
</div>
</div>

<button class="bg-gray-700 text-white px-5 py-1 focus:outline-none rounded-md" @click.prevent="playSound()">
Test Audio
</button>
</form>
</template>

Expand Down
1 change: 0 additions & 1 deletion src/views/Standup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
:tags="state.selectedTags"
:tasks="state.committed"
:show-controls="false"
:show-select="true"
:current-task="currentTask"
@selected="setCurrentTask"
color="text-gray-400"
Expand Down

1 comment on commit da6d8c3

@vercel
Copy link

@vercel vercel bot commented on da6d8c3 Feb 13, 2021

Choose a reason for hiding this comment

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

Please sign in to comment.