From 64722701e4bfca36a98fd76b81cbe5710828ff0a Mon Sep 17 00:00:00 2001 From: Victor Lourng Date: Fri, 17 Feb 2017 16:27:47 -0500 Subject: [PATCH] Custom content width options for markdown --- _sass/temple/_content.scss | 22 +++++++++++++++++++++- _sass/temple/_overrides.scss | 2 +- index.md | 7 +++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/_sass/temple/_content.scss b/_sass/temple/_content.scss index 72aaa1fa..5d94f5f2 100644 --- a/_sass/temple/_content.scss +++ b/_sass/temple/_content.scss @@ -1,10 +1,30 @@ // Content only .content { - & > * { + & > * { max-width: $content-max-width; // 1080px; margin-left: auto; margin-right: auto; } + & > .row { + max-width: $content-max-width; // 1080px; + // max-width: calc($content-max-width + ($gutter-width / 2)); + max-width: calc(960px + (1.25em)); + margin-left: auto; + margin-right: auto; + } + & > .row-wide { + max-width: 1080px; + // max-width: calc(1080px + ($gutter-width / 2)); + max-width: calc(1080px + (1.25em)); + } + & > .row-wider { + max-width: 1280px; + // max-width: calc(1280px + ($gutter-width / 2)); + max-width: calc(1280px + (1.25em)); + } + & > .row-widest { + max-width: 100%; + } ol, ul { margin-bottom: 1em; li { diff --git a/_sass/temple/_overrides.scss b/_sass/temple/_overrides.scss index ab73ede6..d2c5f0a3 100644 --- a/_sass/temple/_overrides.scss +++ b/_sass/temple/_overrides.scss @@ -165,7 +165,7 @@ hr { padding: 1.5em; // min-height: 360px; // Todo: fix height issues - min-height: 24em; + min-height: 22em; color: white; border-radius: 4px; transition: all 300ms ease; diff --git a/index.md b/index.md index 8e10d51a..d3b8a343 100644 --- a/index.md +++ b/index.md @@ -108,3 +108,10 @@ Long, single-line code blocks should not wrap. They should horizontally scroll i ``` The final element. ``` + +
+
+
{% include cards/card2-image.html title="Broaden Your Perspective" content="Global Studies students learn to see the world as a whole, combining foundational courses with specialized study in global security, economy, or culture." image="assets/img_gs_rome.png" button-link="undergraduate/#coursework" button-text="Learn More" %}
+
{% include cards/card2-image.html title="Experience Temple Abroad" content="Our students can study and earn internship credit abroad at Temple’s campuses in Rome and Japan, as well as at dozens of other Temple-recognized programs." image="assets/img_gs_languages.png" button-link="next-stops/#study-around-the-world" button-text="Learn More" %}
+
{% include cards/card2-image.html title="Design Your Future" content="Beyond the classroom, Global Studies students are encouraged to undertake internships, volunteer, be active in student organizations, and plan for a variety of global professions." image="assets/img_gs_globalecon.png" button-link="next-stops/" button-text="Learn More" %}
+
\ No newline at end of file