Mirroring/tailblocks
1
0
Fork 0
mirror of https://github.com/mertJF/tailblocks.git synced 2025-12-09 09:23:23 +00:00
Code Issues Projects Releases Wiki Activity

resolved merge conflict

Browse Source
This commit is contained in:
saini-g
2020-05-30 16:37:46 +05:30
parent 54f023a9ba
commit 54118947e5
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blocks/footer/dark/d.js
View File

@@ -18,7 +18,7 @@ function DarkFooterD(props) {
> >
<path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" /> <path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" />
</svg> </svg>
<span className="ml-3 text-xl">madde</span> <span className="ml-3 text-xl">tailblocks</span>
</a> </a>
<p className="text-sm text-gray-600 sm:ml-4 sm:pl-4 sm:border-l-2 sm:border-gray-800 sm:py-2 sm:mt-0 mt-4"> <p className="text-sm text-gray-600 sm:ml-4 sm:pl-4 sm:border-l-2 sm:border-gray-800 sm:py-2 sm:mt-0 mt-4">
© 2020 madde — © 2020 madde —

2
src/blocks/footer/dark/e.js
View File

@@ -108,7 +108,7 @@ function DarkFooterE(props) {
> >
<path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" /> <path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" />
</svg> </svg>
<span className="ml-3 text-xl">madde</span> <span className="ml-3 text-xl">tailblocks</span>
</a> </a>
<p className="text-sm text-gray-600 sm:ml-6 sm:mt-0 mt-4"> <p className="text-sm text-gray-600 sm:ml-6 sm:mt-0 mt-4">
© 2020 madde — © 2020 madde —

2
src/blocks/footer/light/d.js
View File

@@ -18,7 +18,7 @@ function LightFooterD(props) {
> >
<path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" /> <path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" />
</svg> </svg>
<span className="ml-3 text-xl">madde</span> <span className="ml-3 text-xl">tailblocks</span>
</a> </a>
<p className="text-sm text-gray-500 sm:ml-4 sm:pl-4 sm:border-l-2 sm:border-gray-200 sm:py-2 sm:mt-0 mt-4"> <p className="text-sm text-gray-500 sm:ml-4 sm:pl-4 sm:border-l-2 sm:border-gray-200 sm:py-2 sm:mt-0 mt-4">
© 2020 madde — © 2020 madde —

2
src/blocks/footer/light/e.js
View File

@@ -108,7 +108,7 @@ function LightFooterE(props) {
> >
<path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" /> <path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" />
</svg> </svg>
<span className="ml-3 text-xl">madde</span> <span className="ml-3 text-xl">tailblocks</span>
</a> </a>
<p className="text-sm text-gray-500 sm:ml-6 sm:mt-0 mt-4"> <p className="text-sm text-gray-500 sm:ml-6 sm:mt-0 mt-4">
© 2020 madde — © 2020 madde —

2
src/blocks/header/dark/d.js
View File

@@ -18,7 +18,7 @@ function DarkHeaderD(props) {
> >
<path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" /> <path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" />
</svg> </svg>
<span className="ml-3 text-xl">madde</span> <span className="ml-3 text-xl">tailblocks</span>
</a> </a>
<nav className="md:ml-auto md:mr-auto flex flex-wrap items-center text-base justify-center"> <nav className="md:ml-auto md:mr-auto flex flex-wrap items-center text-base justify-center">
<a href className="mr-5 hover:text-white">First Link</a> <a href className="mr-5 hover:text-white">First Link</a>

2
src/blocks/header/light/a.js
View File

@@ -18,7 +18,7 @@ function LightHeaderA(props) {
> >
<path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" /> <path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" />
</svg> </svg>
<span className="ml-3 text-xl">madde</span> <span className="ml-3 text-xl">tailblocks</span>
</a> </a>
<nav className="md:ml-auto flex flex-wrap items-center text-base justify-center"> <nav className="md:ml-auto flex flex-wrap items-center text-base justify-center">
<a href className="mr-5 hover:text-gray-900">First Link</a> <a href className="mr-5 hover:text-gray-900">First Link</a>

2
src/blocks/header/light/b.js
View File

@@ -18,7 +18,7 @@ function LightHeaderB(props) {
> >
<path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" /> <path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" />
</svg> </svg>
<span className="ml-3 text-xl">madde</span> <span className="ml-3 text-xl">tailblocks</span>
</a> </a>
<nav className="md:mr-auto md:ml-4 md:py-1 md:pl-4 md:border-l md:border-gray-400 flex flex-wrap items-center text-base justify-center"> <nav className="md:mr-auto md:ml-4 md:py-1 md:pl-4 md:border-l md:border-gray-400 flex flex-wrap items-center text-base justify-center">
<a href className="mr-5 hover:text-gray-900">First Link</a> <a href className="mr-5 hover:text-gray-900">First Link</a>

2
src/blocks/header/light/c.js
View File

@@ -24,7 +24,7 @@ function LightHeaderC(props) {
> >
<path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" /> <path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" />
</svg> </svg>
<span className="ml-3 text-xl">madde</span> <span className="ml-3 text-xl">tailblocks</span>
</a> </a>
<div className="lg:w-2/5 inline-flex lg:justify-end ml-5 lg:ml-0"> <div className="lg:w-2/5 inline-flex lg:justify-end ml-5 lg:ml-0">
<button className="inline-flex items-center bg-gray-200 border-0 py-1 px-3 focus:outline-none hover:bg-gray-300 rounded text-base mt-4 md:mt-0"> <button className="inline-flex items-center bg-gray-200 border-0 py-1 px-3 focus:outline-none hover:bg-gray-300 rounded text-base mt-4 md:mt-0">