Skip to content

Updating UI Fixes#212

Merged
tmattio merged 2 commits intomainfrom
ui-fixes
Jan 13, 2022
Merged

Updating UI Fixes#212
tmattio merged 2 commits intomainfrom
ui-fixes

Conversation

@asaadmahmood
Copy link
Contributor

No description provided.

@@ -8,8 +8,41 @@
@import url(https://fonts.googleapis.com/css?family=Fira+Mono:400,500);
Copy link
Collaborator

Choose a reason for hiding this comment

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

Let's revert this file, this is the manual generated from the compiler, we shouldn't change it

<h2 class="mb-6 font-bold">Our influence</h2>
<div>See where we are located around the world at an academic level</div>
<div class="mt-24 relative">
<<<<<<< Updated upstream
Copy link
Collaborator

Choose a reason for hiding this comment

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

Some unsolved merge conflicts

~tab:Documentation
~package @@
<button class="bg-primary-600 p-3 z-30 rounded-r-xl text-white shadow-md top-2/4 fixed md:hidden"
<button class="bg-primary-600 p-3 z-30 rounded-r-xl text-white shadow-md top-2/4 fixed lg:hidden left-0"
Copy link
Collaborator

Choose a reason for hiding this comment

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

We should apply the same to problems and learn layout. Maybe worth extracting this to a component.

@tmattio tmattio merged commit bd2e506 into main Jan 13, 2022
@tmattio tmattio deleted the ui-fixes branch January 13, 2022 12:02
patricoferris pushed a commit to patricoferris/ocaml.org that referenced this pull request Sep 2, 2022
* update "Industrial Users" header to exactly match the Tailwind Playground implementation
* also: fix hidden menu issue
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants