Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/app/themes/mitlib-parent/css/v2/components/buttons.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ a.button {
border: 1px solid var(--color-button-base-border-primary);
background-color: var(--color-button-base-bg-primary);
color: var(--color-button-base-text-primary);
border-radius: var(--border-radius-none);
border-radius: var(--radius-none);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Am I right in thinking that this is bringing the border-radius variable into line with the terminology being used in the corners component stylesheet?

I don't mind this change being in the changeset either way, but want to understand whether I should be incorporating this into the intent of all the other changes.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, this was a typo. I used CoPilot to set up all the dependencies, and it caught this miss in the process. It wasn't noticeable since it is the default setting, but nice to streamline as part of this.

display: inline-block;
padding: var(--sp-150) var(--sp-300);
text-decoration: none;
Expand Down
29 changes: 0 additions & 29 deletions web/app/themes/mitlib-parent/css/v2/v2.css

This file was deleted.

30 changes: 28 additions & 2 deletions web/app/themes/mitlib-parent/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,33 @@ function setup_scripts_styles() {

wp_register_style( 'fontawesome', '//cdn.libraries.mit.edu/files/fontawesome/7.1.0/css/all.min.css', array(), $theme_version );

wp_register_style( 'v2', get_template_directory_uri() . '/css/v2/v2.css', array('fontawesome'), $theme_version );
// =============== //
// V2 STYLE SYSTEM //
// =============== //

// Register all the individual pieces of v2 style system to get versioning (for cache busting)

// VARIABLES
wp_register_style( 'v2-color', get_template_directory_uri() . '/css/v2/variables/color.css', array(), $theme_version );
wp_register_style( 'v2-corners', get_template_directory_uri() . '/css/v2/variables/corners.css', array(), $theme_version );
wp_register_style( 'v2-effects', get_template_directory_uri() . '/css/v2/variables/effects.css', array(), $theme_version );
wp_register_style( 'v2-layout', get_template_directory_uri() . '/css/v2/variables/layout.css', array(), $theme_version );
wp_register_style( 'v2-shadows', get_template_directory_uri() . '/css/v2/variables/shadows.css', array(), $theme_version );
wp_register_style( 'v2-spacing', get_template_directory_uri() . '/css/v2/variables/spacing.css', array(), $theme_version );
wp_register_style( 'v2-typography', get_template_directory_uri() . '/css/v2/variables/typography.css', array(), $theme_version );

// COMPONENTS
wp_register_style( 'v2-alerts', get_template_directory_uri() . '/css/v2/components/alerts.css', array( 'v2-color', 'v2-spacing', 'v2-typography' ), $theme_version );
wp_register_style( 'v2-buttons', get_template_directory_uri() . '/css/v2/components/buttons.css', array( 'v2-color', 'v2-corners', 'v2-spacing', 'v2-typography' ), $theme_version );

// TEMPLATES
wp_register_style( 'v2-header', get_template_directory_uri() . '/css/v2/partials/header.css', array( 'v2-color', 'v2-layout', 'v2-spacing', 'v2-typography' ), $theme_version );
wp_register_style( 'v2-footer', get_template_directory_uri() . '/css/v2/partials/footer.css', array( 'v2-color', 'v2-layout', 'v2-spacing' ), $theme_version );

// Register the pages where we're using these individual pieces. These will get enqueued below and contain the above as dependencies.

// PAGES
wp_register_style( 'v2-home', get_template_directory_uri() . '/css/v2/pages/home.css', array( 'v2-color', 'v2-corners', 'v2-effects', 'v2-layout', 'v2-shadows', 'v2-spacing', 'v2-typography', 'v2-alerts', 'v2-buttons', 'v2-header', 'v2-footer', 'fontawesome' ), $theme_version );


/**
Expand Down Expand Up @@ -261,7 +287,7 @@ function setup_scripts_styles() {

// Conditonally load v2 styles for only pages with the v2 header
if (is_page_template( 'templates/page-home-v2.php' )) {
wp_enqueue_style( 'v2' );
wp_enqueue_style( 'v2-home' );
wp_enqueue_script( 'moment' );
wp_enqueue_script( 'underscore' );
wp_enqueue_script( 'hours-loader-theme' );
Expand Down
2 changes: 1 addition & 1 deletion web/app/themes/mitlib-parent/style.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
Theme Name: MITlib Parent
Author: MIT Libraries
Version: 0.18
Version: 0.19
Description: The parent theme for the MIT Libraries' Pentagram-designed identity.

*/
Expand Down
Loading