Skip to content

Commit

Permalink
new styling on the archetypes page, small CSS fixes, commented out tr…
Browse files Browse the repository at this point in the history
…avis.yml
  • Loading branch information
lukasz-a-krol committed Oct 11, 2024
1 parent c4c277b commit 8a69c2e
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 40 deletions.
61 changes: 35 additions & 26 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,41 @@
dist: xenial
#
# ------------------
# Travis seemed to be necessary for legacy builds, but no longer
# As such, I commented it out in favour of the standard GitHub build action for Hugo
# Builds don't seem to throw any errors with travis.yml commented out, but kept the code here
# just in case something breaks once
# ------------------
#

addons:
snaps:
- hugo
# dist: xenial

sudo: true
# addons:
# snaps:
# - hugo

branches:
only:
- master
- source
# sudo: true

env:
global:
- SOURCE_DIR="public"
- BUILD_BRANCH="source"
- DEPLOY_BRANCH="master"
# branches:
# only:
# - master
# - source

script:
- hugo
# env:
# global:
# - SOURCE_DIR="public"
# - BUILD_BRANCH="source"
# - DEPLOY_BRANCH="master"

deploy:
- provider: pages
# edge: true
github_token: ${GITHUB_TOKEN}
fqdn: usable.tools
local_dir: public
skip_cleanup: true
target_branch: master
on:
branch: source
# script:
# - hugo

# deploy:
# - provider: pages
# # edge: true
# github_token: ${GITHUB_TOKEN}
# fqdn: usable.tools
# local_dir: public
# skip_cleanup: true
# target_branch: master
# on:
# branch: source
4 changes: 3 additions & 1 deletion assets/scss/components/_page.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
.page {
display: flex;
min-height: 100vh;
/* min-height: 100vh; */
/* Commented out the min-height above since pages that had little content (several lines worth) had too much blank space, especially on bigger screens */
/* Considered creating another category of page with no vertical min-height for pages with smaller amounts of content, but commenting out the min-height didn't change the functionality of any other pages. So I just commented it our instead of creating yet another type of page */
flex-direction: column;

.wrapper {
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/style.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/scss/style.css.map

Large diffs are not rendered by default.

12 changes: 3 additions & 9 deletions config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,13 @@ summaryLength = 20
weight = 5

[[menu.main]]
identifier = "adversaries"
identifier = "archetypes_adv_org"
name = "Archetypes"
url = "/archetypes_adv_org/"
weight = 6

# [[menu.main]]
# identifier = "organizations"
# name = "Organizational Archetypes"
# url = "/organizations/"
# weight = 7


[[menu.main]]
identifier = "guidebook"
name = "Guidebook"
url = "/guidebook/"
weight = 8
weight = 7
9 changes: 8 additions & 1 deletion content/archetypes_adv_org.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
---
title: "Archetypes: adversary and organizational"
layout: page
intro: "The USABLE project created two types of archetypes: organizational and organizational"
draft: false
---



<div class="usable-blue-box">
<h2>Archetypes</h2>
Internews created archetypes! Staging text staging text staging text
</div>


Link to adversary archetypes [here](/adversaries/)



Link to org archetypes [here](/organizations/)
2 changes: 1 addition & 1 deletion static/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -5518,7 +5518,7 @@ ol {

.page {
display: flex;
min-height: 100vh;
/*min-height: 100vh;*/
flex-direction: column; }
.page .wrapper {
flex: 1 0 0; }
Expand Down

0 comments on commit 8a69c2e

Please sign in to comment.