Skip to content

Commit

Permalink
💄🔧:wrangle sloppy SCSS situation (integration) #1100
Browse files Browse the repository at this point in the history
As we are migrating out of here, we will merge as-is.

PR URL: #1100

---------

Co-authored-by: OpenINF-bot <openinfbot@open.inf.is>
Acked-by: Grimes <grimes@open.inf.is>
  • Loading branch information
DerekNonGeneric and OpenINFbot committed Apr 5, 2024
1 parent dd51bc2 commit 33d717a
Show file tree
Hide file tree
Showing 195 changed files with 16,458 additions and 2 deletions.
4 changes: 4 additions & 0 deletions _includes/assets/scss/about.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// Custom
@import "jekyll-theme-reflection";
@import "bootstrap/images";
@import "about";
3 changes: 3 additions & 0 deletions _includes/assets/scss/blog.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Custom
@import "jekyll-theme-reflection";
@import "blog";
3 changes: 3 additions & 0 deletions _includes/assets/scss/collections.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Custom
@import "jekyll-theme-reflection";
@import "page";
5 changes: 5 additions & 0 deletions _includes/assets/scss/contact.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// Custom
@import "jekyll-theme-reflection";
@import "bootstrap/forms";
@import "bootstrap/buttons";
@import "contact";
5 changes: 5 additions & 0 deletions _includes/assets/scss/discrete-sessions.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// Custom
@import "jekyll-theme-reflection";
@import "bootstrap/breadcrumb";
@import "custom-breadcrumb";
@import "discrete-sessions";
4 changes: 4 additions & 0 deletions _includes/assets/scss/docs.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// Custom
@import "jekyll-theme-reflection";
@import "api-ref-docs";
@import "page";
3 changes: 3 additions & 0 deletions _includes/assets/scss/home.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Custom
@import "jekyll-theme-reflection";
@import "home";
3 changes: 3 additions & 0 deletions _includes/assets/scss/page.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Custom
@import "jekyll-theme-reflection";
@import "page";
3 changes: 3 additions & 0 deletions _includes/assets/scss/post.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Custom
@import "jekyll-theme-reflection";
@import "post";
10 changes: 10 additions & 0 deletions _includes/assets/scss/session.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// Custom
@import "jekyll-theme-reflection";
@import "bootstrap/breadcrumb";
@import "bootstrap/tables";
@import "custom-breadcrumb";
@import "discrete-sessions";
@import "bootstrap/code";
@import "highlight";
@import "zenburn";
@import "session";
61 changes: 60 additions & 1 deletion _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,66 @@
crossorigin="anonymous"
referrerpolicy="no-referrer" />
<style>
{%- include assets/css/main.css -%}
{% if page.class == 'home' %}
{% capture styles %}
{% include assets/scss/home.scss %}
{% endcapture %}
{{ styles | scssify }}
{% endif %}
{% if page.class == 'docs' %}
{% capture styles %}
{% include assets/scss/docs.scss %}
{% endcapture %}
{{ styles | scssify }}
{% endif %}
{% if page.class == 'collections' %}
{% capture styles %}
{% include assets/scss/collections.scss %}
{% endcapture %}
{{ styles | scssify }}
{% endif %}
{% if page.class == 'blog' %}
{% capture styles %}
{% include assets/scss/blog.scss %}
{% endcapture %}
{{ styles | scssify }}
{% endif %}
{% if page.class == 'about' %}
{% capture styles %}
{% include assets/scss/about.scss %}
{% endcapture %}
{{ styles | scssify }}
{% endif %}
{% if page.class == 'contact' %}
{% capture styles %}
{% include assets/scss/contact.scss %}
{% endcapture %}
{{ styles | scssify }}
{% endif %}
{% if page.layout == 'post' %}
{% capture styles %}
{% include assets/scss/post.scss %}
{% endcapture %}
{{ styles | scssify }}
{% endif %}
{% if page.layout == 'page' or page.class == 'page' %}
{% capture styles %}
{% include assets/scss/page.scss %}
{% endcapture %}
{{ styles | scssify }}
{% endif %}
{% if page.class == 'discrete-sessions' %}
{% capture styles %}
{% include assets/scss/discrete-sessions.scss %}
{% endcapture %}
{{ styles | scssify }}
{% endif %}
{% if page.layout == 'session' %}
{% capture styles %}
{% include assets/scss/session.scss %}
{% endcapture %}
{{ styles | scssify }}
{% endif %}
</style>
<link rel="canonical" href="." />
<title>
Expand Down
24 changes: 23 additions & 1 deletion _includes/header.html
Original file line number Diff line number Diff line change
@@ -1 +1,23 @@
<header></header>
<header class="header fixed navbar">
<div class="container">
<div class="nav-container">
<a class="navbar-brand" href="{{ site.baseurl }}/">
{% include assets/img/svg/logogram.svg %}
</a>
<div class="right alt">
<a class="tab desktop {% if page.class == 'home' %}is-active{% endif %}" href="{{ site.baseurl }}/">Home</a>
<a class="tab desktop {% if page.class == 'blog' %}is-active{% endif %}" href="{{ site.baseurl }}/blog/">Blog</a>
<a class="tab desktop {% if page.class == 'blog' %}is-active{% endif %}" href="{{ site.baseurl }}/docs/">Docs</a>
<a class="tab desktop {% if page.class == 'about' %}is-active{% endif %}" href="{{ site.baseurl }}/about/">About</a>
<a class="tab desktop {% if page.class == 'contact' %}is-active{% endif %}" href="{{ site.baseurl }}/contact/">Contact</a>
<button class="tab hamburger" id="menu-button" on="tap:sidebar.toggle"></button>
<div class="search">
<form class="form-search" target="_top" action="https://google.com/search">
<input type="search" class="search-input" name="q" placeholder="Search">
<input type="submit" class="search-submit" tabindex="-1" value="">
</form>
</div>
</div>
</div>
</div>
</header>
3 changes: 3 additions & 0 deletions _sass/_about.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
p {
text-indent: 2em;
}
16 changes: 16 additions & 0 deletions _sass/_blog.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
@import 'byline';
@import 'post-carousel';
@import 'social-box';
@import 'post';
@import 'bootstrap/images';
@import 'bootstrap/utilities/text';
@import 'bootstrap/utilities/spacing';
@import 'bootstrap/pagination';

.post-divider {
margin: 3rem 0;
}

.page-link {
margin-left: -2px; // needed for 2px border
}
30 changes: 30 additions & 0 deletions _sass/_byline.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
.byline {
margin-top: 12px;
clear: both;
color: $text-muted;
}

.byline-author {
display: inline-block;
}

.byline-pubdate {
display: block;
font-size: small;
}

.byline-author {
line-height: 40px;
text-decoration: none;
text-transform: none;
}

.byline-photo {
float: left;
margin-right: 1em;
border-radius: 100%;

> img {
object-fit: cover;
}
}
31 changes: 31 additions & 0 deletions _sass/_contact.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*!
* Reflection Theme
*/

.contact {
.blurb {
text-align: justify;
text-indent: 2em;
}

.lead {
font-size: 1.25rem;
font-weight: 300;
}

ul.methods li {
margin-top: 2rem;
}

.icon {
float: left;
margin-right: 10px;
display: block;
width: 24px;
height: 24px;

svg path {
fill: $brand-primary;
}
}
}
15 changes: 15 additions & 0 deletions _sass/_custom-breadcrumb.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
.breadcrumb {
margin-top: 1.5rem;
margin-bottom: 1.5rem;
border: 2px solid $text-muted;
}

.breadcrumb-item,
.breadcrumb-item.active {
font-size: .875rem;
line-height: 1.5rem;
}

.breadcrumb-item a {
color: $text-muted;
}
67 changes: 67 additions & 0 deletions _sass/_discrete-sessions.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/*!
* Reflection Theme
*/

.discrete-sessions {

._bubble {
background-size: 90%;
// background-color: #ba160c;
border-radius: $border-radius;
border: $border-width solid #ba160c;

svg {
width: 80%;
margin: 13.5% 10%;

@include media-breakpoint-up(md) {
width: 30%;
margin: 10%;
}

@include media-breakpoint-up(lg) {
width: 30%;
margin: 10%;
}
}

svg path {
fill: #ba160c;
}
}
}

.banner-wrapper {
position: relative;
width: 100%;
height: 0;
padding-bottom: 60%; // acts as fluid height
margin-bottom: .5rem;
overflow: hidden;

@include media-breakpoint-up(sm) {
padding-bottom: 21rem
}

@include media-breakpoint-up(md) {
padding-bottom: 14.8rem;
}

@include media-breakpoint-up(lg) {
padding-bottom: 19.7rem;
}

@include media-breakpoint-up(xl) {
padding-bottom: 23.4rem;
}
}

.banner-img {
position:absolute;
width: 100%;
height: 100%;
// background-position: center center;
// background-size: 22rem;
// background-repeat: no-repeat;
// background-color: #3776ab;
}
21 changes: 21 additions & 0 deletions _sass/_featured-sites.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
.featured-sites {
margin-right: -1px;
margin-left: -1px;
}
.featured-sites .col-xs-6 {
padding: 1px;
}
.featured-sites .img-fluid {
margin-top: 0;
}

@media (min-width: 768px) {
.featured-sites .col-sm-3:first-child img {
border-top-left-radius: .25rem;
border-bottom-left-radius: .25rem;
}
.featured-sites .col-sm-3:last-child img {
border-top-right-radius: .25rem;
border-bottom-right-radius: .25rem;
}
}

0 comments on commit 33d717a

Please sign in to comment.