merge

hedyorg · Jun 5, 2020 · dcab7d1 · dcab7d1
2 parents bf4e407 + eb12d30
commit dcab7d1
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/static/css/generated.css b/static/css/generated.css
diff --git a/tailwind/styles.css b/tailwind/styles.css
@@ -24,6 +24,15 @@ h3 {
   @apply mt-4;
 }
 
+a {
+  @apply font-semibold text-blue-400;
+  text-decoration: underline;
+}
+
+strong {
+  @apply font-bold;
+}
+
 .green-btn {
   @apply bg-green-500 text-white font-bold py-2 px-4 border-b-4 border-green-700 rounded;
 }
@@ -44,13 +53,6 @@ h3 {
 .markdown strong {
   @apply font-bold;
 }
-.markdown a {
-  @apply font-semibold;
-}
-.markdown strong a {
-  @apply font-bold;
-}
-
 .markdown * + h1 {
   @apply leading-tight mb-2 mt-10;
 }
@@ -97,6 +99,14 @@ pre code {
   @apply bg-blue-400 border-blue-500;
 }
 
+.menubar-btn {
+  @apply text-white no-underline font-slab font-semibold border-b-4 tracking-wide text-xl px-4 py-3 mr-4;
+}
+
+.codebar-btn {
+  @apply text-black no-underline border-white tracking-wide font-normal px-4 py-3 mr-4;
+}
+
 #output {
   font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace;
 }

diff --git a/templates/incl-menubar.html b/templates/incl-menubar.html
@@ -8,7 +8,7 @@
 
         {% block menu %}
         {% for item in menu %}
-        <a class="no-underline font-slab font-semibold border-b-4 {% if item.selected %}border-{{item.accent_color}}{% else %}border-transparent{% endif %} tracking-wide text-xl px-4 py-3 mr-4" href="{{item.href}}?lang={{lang}}">
+        <a class="menubar-btn {% if item.selected %}border-{{item.accent_color}}{% else %}border-transparent{% endif %} " href="{{item.href}}?lang={{lang}}">
           {{ item.caption }}
         </a>
         {% endfor %}

diff --git a/templates/level-page.html b/templates/level-page.html
@@ -5,11 +5,11 @@
     <div class="tracking-wide text-xl font-thin py-2 mr-8 mt-1">
       {{ level_title }} {{ assignment_nr }}
     </div>
-    <a class="no-underline {% if selected_page == 'code' %}border-b-4{% endif %} border-white tracking-wide font-normal px-4 py-3 mr-4" href="{{ hedy_link(assignment_nr) }}">
+    <a class="codebar-btn {% if selected_page == 'code' %}border-b-4{% endif %}" href="{{ hedy_link(assignment_nr) }}">
       {{ code_title }}
     </a>
     {% for doc in docs %}
-    <a class="no-underline {% if selected_page == doc.slug %}border-b-4{% endif %} border-white tracking-wide font-normal px-4 py-3 mr-4" href="{{ hedy_link(assignment_nr, subpage=doc.slug) }}">
+    <a class="codebar-btn {% if selected_page == doc.slug %}border-b-4{% endif %}" href="{{ hedy_link(assignment_nr, subpage=doc.slug) }}">
       {{ doc.title }}
     </a>
     {% endfor %}