Merge pull request #448 from ZeusWPI/mobile-css-enhancements

fix some mobile css and balance out the site a bit more

content/assets/stylesheets/includes/about.scss

@@ -66,17 +66,13 @@ table.board-table {
 }
 
 #contact-icons {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-
   > .column {
-    max-width: 70vw;
+    max-width: 40vw;
   }
 
   .contact-circle-option {
-    display: block;
+    //display: block;
-    max-width: 200px;
+    //max-width: 200px;
 
     .contact-circle-wrapper {
       display: block;

content/assets/stylesheets/includes/blogpost.scss

@@ -12,7 +12,6 @@
   .titlewrap {
     position: relative;
     margin: auto;
-    min-width: 400px;
 
     .title {
       @include tablet {
@@ -66,20 +65,10 @@
 }
 
 .blog-preview {
-  .blogpreview-heading {
+  .blogpreview-extra {
-    display: flex;
-    > a {
-      flex-grow: 1;
-      margin-bottom: 0;
-      display: inline-block;
-    }
-  }
-  > .blogpreview-extra {
     color: #7a7a7a;
-    display: inline-block;
-    margin-bottom: 5px;
   }
-  > .blogpreview-tags {
+  .blogpreview-tags {
     color: #7a7a7a;
   }
 }

content/assets/stylesheets/includes/tiles.scss

@@ -30,6 +30,14 @@ $top_coder_size: 80px;
       margin-left: 10px;
       margin-right: 10px;
 
+      >h2 {
+        margin-bottom: 0;
+      }
+
+      >hr {
+        margin: 0.4rem 0;
+      }
+
       .event-time-loc {
         margin-left: 10px;
         margin-right: 10px;

content/assets/stylesheets/main.scss

@@ -6,8 +6,7 @@
 @import "includes/variables";
 
 @import "node_modules/bulma/bulma";
-@import "node_modules/bulma-divider/dist/css/bulma-divider";
+@import "node_modules/bulma-timeline/src/sass/index.sass";
-@import "node_modules/bulma-timeline/dist/css/bulma-timeline";
 
 
 // Sticky footer

content/contact.erb

@@ -47,9 +47,10 @@ contact_links:
   <h2 class='subtitle is-4 has-text-centered has-text-weight-light'>bleep bloop</h2>
 
   <!-- Contact buttons -->
-  <ul id='contact-icons' class='columns is-centered is-multiline'>
+  <div id='contact-icons' class='columns is-centered is-multiline is-mobile'>
   <% @item[:contact_links].each do |option| %>
-  <li id='<%= option[:description] %>' class='contact-circle-option column is-one-quarter-desktop is-one-third-tablet is-half-mobile'>
+  <div class='column is-one-quarter-desktop is-one-third-tablet is-half-mobile'>
+    <div id='<%= option[:description] %>' class='contact-circle-option'>
     <a href='<%= option[:link] %>' class='contact-circle-wrapper'>
       <div class='contact-circle is-centered'>
         <div class='contact-circle-pulse grow'></div>
@@ -60,9 +61,10 @@ contact_links:
     <p class='has-text-centered'>
       <a href='<%= option[:link] %>' class='contact-text-link is-link'><%= option[:action] %></a>
     </p>
-  </li>
+    </div>
+  </div>
   <% end %>
-  </ul>
+  </div>
 
   <div id="board">
     <h2>The board (<%= pretty_year @config[:academic_year] %>)</h2>
@@ -83,7 +85,7 @@ contact_links:
         <!-- Payment information -->
         <div id='payment-info' class='tile is-child box content has-text-centered'>
           <h1 class='title has-text-centered'>Pay us</h1>
-          <div class='is-divider'></div>
+          <hr/>
           <p id='banknumber' class='is-size-5'>
             BE32 9799 9370 6502
           </p>
@@ -98,7 +100,7 @@ contact_links:
         <!-- Calling information -->
         <div id='calling-info' class='tile is-child box content has-text-centered'>
           <h1 class='title has-text-centered'>Call us</h1>
-          <div class='is-divider'></div>
+          <hr/>
           <p id='phone-number' class='is-size-5'>
             +32 9 264 47 51<br/>
             Internal: 4751
@@ -110,7 +112,7 @@ contact_links:
       <div id='address-info' class='tile is-parent'>
         <div class='tile is-child box content'>
           <h1 class='title has-text-centered'>Find us</h1>
-          <div class='is-divider'></div>
+          <hr/>
           <p class='is-size-5'>
             You can find our hiding place, or what we call <strong>'de kelder'</strong> at the basement level of following address:
           </p>
@@ -138,7 +140,7 @@ contact_links:
     <div id='mattermost-info' class='tile is-parent'>
       <div class='tile is-child box content'>
         <h1 class='title has-text-centered'>Mattermost info</h1>
-        <div class='is-divider'></div>
+        <hr/>
         <p id='mattermost-info-text' class='is-size-5'>
           You can register with any valid email address.
         </p>

content/index.erb

@@ -21,7 +21,7 @@
     <div class="tile is-parent">
       <div class="tile is-child">
         <div class="block has-text-centered">
-          <span class="title is-2 underline--magical">Upcoming Events</span>
+          <span class="title is-2-responsive underline--magical">Upcoming Events</span>
         </div>
         <% unless upcoming_events.empty? %>
           <% upcoming_events.each do |event| %>
@@ -41,7 +41,7 @@
       <div class="tile is-parent">
         <div class="tile is-child">
           <div class="block has-text-centered">
-            <span class="title is-2 underline--magical">Top Coders</span>
+            <span class="title is-2-responsive underline--magical">Top Coders</span>
           </div>
           <div class="box gamification-tile">
             <div class="content">
@@ -60,7 +60,7 @@
 
 
           <div class="block has-text-centered">
-            <span class="title is-2 underline--magical">Previous Events</span>
+            <span class="title is-2-responsive underline--magical">Previous Events</span>
           </div>
           <% previous_events[0..3].each do |event| %>
             <div class="block">
@@ -82,7 +82,7 @@
             </p>
           </div>
           <div class="block has-text-centered">
-            <span class="title is-2 underline--magical">Blogposts</span>
+            <span class="title is-2-responsive underline--magical">Blogposts</span>
           </div>
           <% sorted_articles[0..3].each do |post| %>
             <%= render '/partials/_blog_preview.*', post: post %>

drive

@@ -1 +1 @@
-Subproject commit e346d083f848488ec334619a5be9ab924123ba1d
+Subproject commit 4a68374555496d3d849ee95d74aa0c88883670b3

layouts/blogpost.erb

@@ -25,7 +25,7 @@
       <%= item[:title] %>
     </h1>
     <% if item[:author] %>
-    <h2 class="subtitle is-3-responsive has-text-centered animated fadeInLeft">
+    <h2 class="subtitle is-4-responsive has-text-centered animated fadeInLeft">
       door <%= item[:author] %>
     </h2>
     <% end %>

layouts/generic.erb

@@ -7,8 +7,8 @@
     <% if item[:subnavigation] %>
     <%= render '/partials/_sub_navbar.*', selected: item[:subnavigation][:identifier] %>
     <% end %>
-    <div class="columns">
+    <div class="columns is-centered">
-      <article class="column is-8 is-offset-2 <%= 'toc-container' if @item[:toc] %>">
+      <article class="column is-8 <%= 'toc-container' if @item[:toc] %>">
     <% end %>
 
     <%= yield %>

layouts/partials/_blog_preview.erb

@@ -1,21 +1,30 @@
 <div class="content blog-preview">
-  <div class="blogpreview-heading">
+  <div class="blogpreview-heading columns is-multiline is-gapless">
-    <a class="title is-3" href="<%= relative_path_to(post) %>">
+    <div class="column is-full">
-      <%= post[:title] %>
+      <div class="columns is-gapless is-vcentered">
-    </a>
+        <div class="column">
-    <div class="blogpreview-tags">
+          <a class="title is-3 is-size-4-mobile" href="<%= relative_path_to(post) %>">
-      <% post[:tags]&.each do |tag| %>
+            <%= post[:title] %>
-        <!-- The following code is a bit hacky, fix when necessary -->
+          </a>
-        <a class="tag is-normal is-rounded" href=<%= "/blog/#{tag.gsub(' ', '_')}/index.html" %>>
+        </div>
-          <%= tag %>
+        <% if post[:tags] %>
-        </a>
+          <div class="column is-narrow">
-      <% end %>
+            <div class="blogpreview-tags">
+              <% post[:tags]&.each do |tag| %>
+                <!-- The following code is a bit hacky, fix when necessary -->
+                <a class="tag is-normal is-rounded" href=<%= "/blog/#{tag.gsub(' ', '_')}/index.html" %>>
+                  <%= tag %>
+                </a>
+              <% end %>
+            </div>
+          </div>
+        <% end %>
+      </div>
     </div>
+    <small class="column blogpreview-extra"><%= post[:created_at] %><% if post[:author] %> • <%= post[:author] %> <% end %> <%= "• #{post[:description]}" if post[:description] %></small>
   </div>
-  <small class="blogpreview-extra"><%= post[:created_at] %><% if post[:author] %> • <%= post[:author] %> <% end %> • <%= post[:description] %></small>
-  <br/>
   <p>
-  <%= excerptize(post.reps[:text].compiled_content, length: 500).tr("\n", ' ')%>
+    <%= excerptize(post.reps[:text].compiled_content, length: 500).tr("\n", ' ')%>
   </p>
   <hr>
 </div>

layouts/partials/_events_tile.erb

@@ -12,7 +12,7 @@
   <img class="event-tile-image" src="<%= @event[:image] %>" alt="">
   <% end %>
     <div class="event-text">
-      <h2 class="is-size-5-mobile has-text-centered">
+      <h2 class="is-size-4-mobile has-text-centered">
         <%= @event[:title] %>
       </h2>
 
@@ -20,7 +20,7 @@
         <%= @event[:description] %>
       </div>
 
-      <div class="is-divider"></div>
+      <hr/>
 
       <div class="is-size-7-mobile  event-time-loc">
         <%= fa :'clock-o' , fw: true %><%= @event[:time].strftime('%A %d %B, %H:%M') %>

nanoc.yaml

@@ -80,11 +80,6 @@ data_sources:
     items_root: /data
     content_dir: data
     layouts_dir: null
-  -
-    type: filesystem
-    items_root: /node_modules
-    content_dir: node_modules
-    layouts_dir: null
   -
     type: filesystem
     items_root: /about/verslagen/

package.json

@@ -8,7 +8,6 @@
   "repository": "https://github.com/ZeusWPI/zeus.ugent.be",
   "dependencies": {
     "bulma": "0.9.1",
-    "bulma-divider": "~0.2.0",
     "bulma-timeline": "^3.0.4"
   }
 }

yarn.lock

@@ -2,17 +2,12 @@
 # yarn lockfile v1
 
 
-bulma-divider@~0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/bulma-divider/-/bulma-divider-0.2.0.tgz#a9b4d9fe8b270c7cb7573023c575062bc62616f3"
-  integrity sha512-REe3k56GECRfDaqFjC8cwLhV4RxXmV0RubuzDJqwior9wlJcdHlN0qfW0tvUX+qphikaTQegIeRuhjRIAqkjkw==
-
 bulma-timeline@^3.0.4:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/bulma-timeline/-/bulma-timeline-3.0.4.tgz#494f458098a06dcf8dcc7fe8f2f158b63d1d1ef2"
+  resolved "https://registry.yarnpkg.com/bulma-timeline/-/bulma-timeline-3.0.4.tgz"
   integrity sha512-gCUOcSUuzHoeVMkCpLF49j5Z5yl78XQ+KgJcT+1ju5WIGgBgVytRUob/dw5NHAxPLO2rmcvwYNbCJFp7w4WT4Q==
 
 bulma@0.9.1:
   version "0.9.1"
-  resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.9.1.tgz#2bf0e25062a22166db5c92e8c3dcb4605ab040d8"
+  resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.9.1.tgz"
   integrity sha512-LSF69OumXg2HSKl2+rN0/OEXJy7WFEb681wtBlNS/ulJYR27J3rORHibdXZ6GVb/vyUzzYK/Arjyh56wjbFedA==