beenull/merakiui
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:merakiui/merakiui

Browse source
This commit is contained in:
khatabwedaa 2020-08-16 16:18:50 +02:00
parent c97ec7779b f5d43ee21d
commit 56c285743c
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/ui/Alerts/InfoPop.vue
View file

@ -11,12 +11,12 @@
<div class="-mx-3 py-2 px-4">
<div class="mx-3">
<span class="text-blue-500 font-semibold">Info</span>
<p class="text-gray-600 text-sm">This channel archived by owner !</p>
<p class="text-gray-600 text-sm">This channel archived by the owner!</p>
</div>
</div>
</div>
</div>
</view-component>
</view-component>
</template>
<script>
@ -35,7 +35,7 @@
<div class="-mx-3 py-2 px-4">
<div class="mx-3">
<span class="text-blue-500 font-semibold">Info</span>
<p class="text-gray-600 text-sm">This channel archived by owner !</p>
<p class="text-gray-600 text-sm">This channel archived by the owner!</p>
</div>
</div>
</div>`

4
src/components/ui/Alerts/NotificationPop.vue
View file

@ -8,7 +8,7 @@
<img class="w-10 h-10 object-cover rounded-full" alt="User avatar" src="https://images.unsplash.com/photo-1477118476589-bff2c5c4cfbb?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=200&q=200">
<div class="mx-3">
<p class="text-gray-600">Sara was replied on the <a class="text-blue-500 hover:text-blue-400 hover:underline">upload image</a>.</p>
<p class="text-gray-600">Sara has replied on the <a class="text-blue-500 hover:text-blue-400 hover:underline">uploaded image</a>.</p>
</div>
</div>
</div>
@ -29,7 +29,7 @@
<img class="w-10 h-10 object-cover rounded-full" alt="User avatar" src="https://images.unsplash.com/photo-1477118476589-bff2c5c4cfbb?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=200&q=200">
<div class="mx-3">
<p class="text-gray-600">Sara was replied on the <a class="text-blue-500 hover:text-blue-400 hover:underline">upload image</a>.</p>
<p class="text-gray-600">Sara has replied on the <a class="text-blue-500 hover:text-blue-400 hover:underline">uploaded image</a>.</p>
</div>
</div>
</div>`,

4
src/components/ui/Alerts/SuccessFullWidth.vue
View file

@ -8,7 +8,7 @@
<path d="M20 3.33331C10.8 3.33331 3.33337 10.8 3.33337 20C3.33337 29.2 10.8 36.6666 20 36.6666C29.2 36.6666 36.6667 29.2 36.6667 20C36.6667 10.8 29.2 3.33331 20 3.33331ZM16.6667 28.3333L8.33337 20L10.6834 17.65L16.6667 23.6166L29.3167 10.9666L31.6667 13.3333L16.6667 28.3333Z"></path>
</svg>
<p class="mx-3">You are finished the tasks.</p>
<p class="mx-3">You finished the tasks.</p>
</div>
<button class="rounded-md p-1 hover:bg-opacity-25 hover:bg-gray-600 focus:outline-none">
@ -35,7 +35,7 @@
<path d="M20 3.33331C10.8 3.33331 3.33337 10.8 3.33337 20C3.33337 29.2 10.8 36.6666 20 36.6666C29.2 36.6666 36.6667 29.2 36.6667 20C36.6667 10.8 29.2 3.33331 20 3.33331ZM16.6667 28.3333L8.33337 20L10.6834 17.65L16.6667 23.6166L29.3167 10.9666L31.6667 13.3333L16.6667 28.3333Z"></path>
</svg>
<p class="mx-3">You are finished the tasks.</p>
<p class="mx-3">You finished the tasks.</p>
</div>
<button class="rounded-md p-1 hover:bg-opacity-25 hover:bg-gray-600 focus:outline-none">

4
src/components/ui/Alerts/WarningFullWidth.vue
View file

@ -8,7 +8,7 @@
<path d="M20 3.33331C10.8 3.33331 3.33337 10.8 3.33337 20C3.33337 29.2 10.8 36.6666 20 36.6666C29.2 36.6666 36.6667 29.2 36.6667 20C36.6667 10.8 29.2 3.33331 20 3.33331ZM21.6667 28.3333H18.3334V25H21.6667V28.3333ZM21.6667 21.6666H18.3334V11.6666H21.6667V21.6666Z"></path>
</svg>
<p class="mx-3">This version is not support.</p>
<p class="mx-3">This version is not supported.</p>
</div>
<button class="rounded-md p-1 hover:bg-opacity-25 hover:bg-gray-600 focus:outline-none">
@ -35,7 +35,7 @@
<path d="M20 3.33331C10.8 3.33331 3.33337 10.8 3.33337 20C3.33337 29.2 10.8 36.6666 20 36.6666C29.2 36.6666 36.6667 29.2 36.6667 20C36.6667 10.8 29.2 3.33331 20 3.33331ZM21.6667 28.3333H18.3334V25H21.6667V28.3333ZM21.6667 21.6666H18.3334V11.6666H21.6667V21.6666Z"></path>
</svg>
<p class="mx-3">This version is not support.</p>
<p class="mx-3">This version is not supported.</p>
</div>
<button class="rounded-md p-1 hover:bg-opacity-25 hover:bg-gray-600 focus:outline-none">

4
src/components/ui/Alerts/WarningPop.vue
View file

@ -11,7 +11,7 @@
<div class="-mx-3 py-2 px-4">
<div class="mx-3">
<span class="text-yellow-500 font-semibold">Warning</span>
<p class="text-gray-600 text-sm">Your image size is to large !</p>
<p class="text-gray-600 text-sm">Your image size is too large!</p>
</div>
</div>
</div>
@ -35,7 +35,7 @@
<div class="-mx-3 py-2 px-4">
<div class="mx-3">
<span class="text-yellow-500 font-semibold">Warning</span>
<p class="text-gray-600 text-sm">Your image size is to large !</p>
<p class="text-gray-600 text-sm">Your image size is too large!</p>
</div>
</div>
</div>`

4
src/components/ui/Headers/ECommerce.vue
View file

@ -43,7 +43,7 @@
<div class="md:flex items-center">
<div class="w-full md:w-1/2">
<div class="max-w-lg">
<h1 class="text-gray-800 text-2xl font-semibold uppercase md:text-3xl">Best Place To Chose Your Clothes</h1>
<h1 class="text-gray-800 text-2xl font-semibold uppercase md:text-3xl">Best Place To Choose Your Clothes</h1>
<p class="mt-2 text-gray-600">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Porro beatae error laborum ab amet sunt recusandae? Reiciendis natus perspiciatis optio.</p>
<button class="mt-6 px-3 py-2 bg-indigo-600 text-white text-xs uppercase font-medium rounded hover:bg-indigo-500 focus:outline-none focus:bg-indigo-500">Shop Now</button>
</div>
@ -110,7 +110,7 @@
<div class="md:flex items-center">
<div class="w-full md:w-1/2">
<div class="max-w-lg">
<h1 class="text-gray-800 text-2xl font-semibold uppercase md:text-3xl">Best Place To Chose Your Clothes</h1>
<h1 class="text-gray-800 text-2xl font-semibold uppercase md:text-3xl">Best Place To Choose Your Clothes</h1>
<p class="mt-2 text-gray-600">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Porro beatae error laborum ab amet sunt recusandae? Reiciendis natus perspiciatis optio.</p>
<button class="mt-4 px-3 py-2 bg-indigo-600 text-white text-sm uppercase font-medium rounded hover:bg-indigo-500 focus:outline-none focus:bg-indigo-500">Shop Now</button>
</div>