From 911ba6c6bb7651addcf62e2f6958e180cd55d1cb Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Thu, 18 Mar 2021 15:02:08 +0100 Subject: [PATCH 1/3] fix some mobile css and balance out the site a bit more --- .../assets/stylesheets/includes/about.scss | 3 ++ .../assets/stylesheets/includes/blogpost.scss | 15 +------- .../assets/stylesheets/includes/tiles.scss | 8 ++++ content/assets/stylesheets/main.scss | 6 ++- content/contact.erb | 8 ++-- content/index.erb | 8 ++-- drive | 2 +- layouts/blogpost.erb | 2 +- layouts/generic.erb | 4 +- layouts/partials/_blog_preview.erb | 37 ++++++++++++------- layouts/partials/_events_tile.erb | 4 +- nanoc.yaml | 5 --- package.json | 1 - yarn.lock | 9 +---- 14 files changed, 56 insertions(+), 56 deletions(-) diff --git a/content/assets/stylesheets/includes/about.scss b/content/assets/stylesheets/includes/about.scss index fbb07e6..7100ebd 100644 --- a/content/assets/stylesheets/includes/about.scss +++ b/content/assets/stylesheets/includes/about.scss @@ -70,6 +70,9 @@ table.board-table { justify-content: center; align-items: center; + margin-left: 0; + margin-top: 0; + > .column { max-width: 70vw; } diff --git a/content/assets/stylesheets/includes/blogpost.scss b/content/assets/stylesheets/includes/blogpost.scss index b361171..4ecdbbb 100644 --- a/content/assets/stylesheets/includes/blogpost.scss +++ b/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 { - display: flex; - > a { - flex-grow: 1; - margin-bottom: 0; - display: inline-block; - } - } - > .blogpreview-extra { + .blogpreview-extra { color: #7a7a7a; - display: inline-block; - margin-bottom: 5px; } - > .blogpreview-tags { + .blogpreview-tags { color: #7a7a7a; } } diff --git a/content/assets/stylesheets/includes/tiles.scss b/content/assets/stylesheets/includes/tiles.scss index 1893093..42421c4 100644 --- a/content/assets/stylesheets/includes/tiles.scss +++ b/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; diff --git a/content/assets/stylesheets/main.scss b/content/assets/stylesheets/main.scss index 0b0f420..68f0874 100644 --- a/content/assets/stylesheets/main.scss +++ b/content/assets/stylesheets/main.scss @@ -6,8 +6,10 @@ @import "includes/variables"; @import "node_modules/bulma/bulma"; -@import "node_modules/bulma-divider/dist/css/bulma-divider"; -@import "node_modules/bulma-timeline/dist/css/bulma-timeline"; +//@import "node_modules/bulma-divider/dist/css/bulma-divider"; +//@import "node_modules/@creativebulma/bulma-divider/dist/bulma-divider.css"; +//@import "node_modules/bulma-timeline/dist/css/bulma-timeline"; +@import "node_modules/bulma-timeline/src/sass/index.sass"; // Sticky footer diff --git a/content/contact.erb b/content/contact.erb index a360585..ee2924a 100644 --- a/content/contact.erb +++ b/content/contact.erb @@ -83,7 +83,7 @@ contact_links:

Pay us

-
+

BE32 9799 9370 6502

@@ -98,7 +98,7 @@ contact_links:

Call us

-
+

+32 9 264 47 51
Internal: 4751 @@ -110,7 +110,7 @@ contact_links:

Find us

-
+

You can find our hiding place, or what we call 'de kelder' at the basement level of following address:

@@ -138,7 +138,7 @@ contact_links:

Mattermost info

-
+

You can register with any valid email address.

diff --git a/content/index.erb b/content/index.erb index 7cafecb..e92d3df 100644 --- a/content/index.erb +++ b/content/index.erb @@ -21,7 +21,7 @@
- Upcoming Events + Upcoming Events
<% unless upcoming_events.empty? %> <% upcoming_events.each do |event| %> @@ -41,7 +41,7 @@
- Top Coders + Top Coders
@@ -60,7 +60,7 @@
- Previous Events + Previous Events
<% previous_events[0..3].each do |event| %>
@@ -82,7 +82,7 @@

- Blogposts + Blogposts
<% sorted_articles[0..3].each do |post| %> <%= render '/partials/_blog_preview.*', post: post %> diff --git a/drive b/drive index e346d08..4a68374 160000 --- a/drive +++ b/drive @@ -1 +1 @@ -Subproject commit e346d083f848488ec334619a5be9ab924123ba1d +Subproject commit 4a68374555496d3d849ee95d74aa0c88883670b3 diff --git a/layouts/blogpost.erb b/layouts/blogpost.erb index 0c4253c..264713d 100644 --- a/layouts/blogpost.erb +++ b/layouts/blogpost.erb @@ -25,7 +25,7 @@ <%= item[:title] %> <% if item[:author] %> -

+

door <%= item[:author] %>

<% end %> diff --git a/layouts/generic.erb b/layouts/generic.erb index de2df05..abcd911 100644 --- a/layouts/generic.erb +++ b/layouts/generic.erb @@ -7,8 +7,8 @@ <% if item[:subnavigation] %> <%= render '/partials/_sub_navbar.*', selected: item[:subnavigation][:identifier] %> <% end %> -
-
+
+
<% end %> <%= yield %> diff --git a/layouts/partials/_blog_preview.erb b/layouts/partials/_blog_preview.erb index 031dcc6..9c705aa 100644 --- a/layouts/partials/_blog_preview.erb +++ b/layouts/partials/_blog_preview.erb @@ -1,21 +1,30 @@
-
- - <%= post[:title] %> - -
- <% post[:tags]&.each do |tag| %> - - > - <%= tag %> - - <% end %> +
+
+
+
+ + <%= post[:title] %> + +
+ <% if post[:tags] %> +
+
+ <% post[:tags]&.each do |tag| %> + + > + <%= tag %> + + <% end %> +
+
+ <% end %> +
+ <%= post[:created_at] %><% if post[:author] %> • <%= post[:author] %> <% end %> <%= "• #{post[:description]}" if post[:description] %>
- <%= post[:created_at] %><% if post[:author] %> • <%= post[:author] %> <% end %> • <%= post[:description] %> -

- <%= excerptize(post.reps[:text].compiled_content, length: 500).tr("\n", ' ')%> + <%= excerptize(post.reps[:text].compiled_content, length: 500).tr("\n", ' ')%>

diff --git a/layouts/partials/_events_tile.erb b/layouts/partials/_events_tile.erb index f6177c0..2d04a63 100644 --- a/layouts/partials/_events_tile.erb +++ b/layouts/partials/_events_tile.erb @@ -12,7 +12,7 @@ <% end %>
-

+

<%= @event[:title] %>

@@ -20,7 +20,7 @@ <%= @event[:description] %>
-
+
<%= fa :'clock-o' , fw: true %><%= @event[:time].strftime('%A %d %B, %H:%M') %> diff --git a/nanoc.yaml b/nanoc.yaml index 38fe064..567d469 100644 --- a/nanoc.yaml +++ b/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/ diff --git a/package.json b/package.json index 8dc4885..383ba57 100644 --- a/package.json +++ b/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" } } diff --git a/yarn.lock b/yarn.lock index e0ecb9d..f86b0f7 100644 --- a/yarn.lock +++ b/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== From c651c6d4be5d2a6ab794500bf4bec285c1398235 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Thu, 18 Mar 2021 15:05:41 +0100 Subject: [PATCH 2/3] remove commented code --- content/assets/stylesheets/main.scss | 3 --- 1 file changed, 3 deletions(-) diff --git a/content/assets/stylesheets/main.scss b/content/assets/stylesheets/main.scss index 68f0874..7970a46 100644 --- a/content/assets/stylesheets/main.scss +++ b/content/assets/stylesheets/main.scss @@ -6,9 +6,6 @@ @import "includes/variables"; @import "node_modules/bulma/bulma"; -//@import "node_modules/bulma-divider/dist/css/bulma-divider"; -//@import "node_modules/@creativebulma/bulma-divider/dist/bulma-divider.css"; -//@import "node_modules/bulma-timeline/dist/css/bulma-timeline"; @import "node_modules/bulma-timeline/src/sass/index.sass"; From bc855375e42b14782b42022f5d2693f0e318af84 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Sat, 20 Mar 2021 10:15:00 +0100 Subject: [PATCH 3/3] centering issue contact page --- content/assets/stylesheets/includes/about.scss | 13 +++---------- content/contact.erb | 10 ++++++---- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/content/assets/stylesheets/includes/about.scss b/content/assets/stylesheets/includes/about.scss index 7100ebd..df954a3 100644 --- a/content/assets/stylesheets/includes/about.scss +++ b/content/assets/stylesheets/includes/about.scss @@ -66,20 +66,13 @@ table.board-table { } #contact-icons { - display: flex; - justify-content: center; - align-items: center; - - margin-left: 0; - margin-top: 0; - > .column { - max-width: 70vw; + max-width: 40vw; } .contact-circle-option { - display: block; - max-width: 200px; + //display: block; + //max-width: 200px; .contact-circle-wrapper { display: block; diff --git a/content/contact.erb b/content/contact.erb index ee2924a..3afbf46 100644 --- a/content/contact.erb +++ b/content/contact.erb @@ -47,9 +47,10 @@ contact_links:

bleep bloop

-
<% end %> - +

The board (<%= pretty_year @config[:academic_year] %>)