Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Responsive Framework 3x Support - Boston University themes #75

Draft
wants to merge 9 commits into
base: develop
Choose a base branch
from
Draft

Responsive Framework 3x Support - Boston University themes #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
840035b
Move default calls to BU specific fonts to starter
ashleykolodziej Jan 4, 2021
8b8a62d
Decided to keep this in customizations instead
ashleykolodziej Jan 4, 2021
bb55771
Update include paths and packages
ashleykolodziej Jan 7, 2021
bdac9b6
Run changes to upgrade
ashleykolodziej Jan 15, 2021
9a053d8
Upgrades js paths, adds new variables
ashleykolodziej Jan 15, 2021
4c295d8
Run npm install
ashleykolodziej Jan 15, 2021
8f8134f
These aren’t true dependencies. Moving
ashleykolodziej Jan 15, 2021
dbdc2fd
Merge branch 'develop' into 3x/bu-specific
ashleykolodziej Jan 15, 2021
64bc84e
Merge branch 'develop' into 3x/bu-specific
ashleykolodziej Jan 15, 2021
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
6 changes: 3 additions & 3 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = function( grunt ) {
},
scripts: {
files: [
//'node_modules/responsive-foundation/js-dev/*.js',
//'node_modules/@bu-ist/js-dev/*.js',
'js-dev/**/*.js',
],
tasks: [ 'scripts' ],
Expand All @@ -30,7 +30,7 @@ module.exports = function( grunt ) {
},
styles: {
files: [
'node_modules/responsive-foundation/css-dev/**/*.scss',
'node_modules/@bu-ist/**/*.scss',
'css-dev/**/*.scss',
],
tasks: [ 'styles' ],
Expand Down Expand Up @@ -89,7 +89,7 @@ module.exports = function( grunt ) {
includePaths: [
'node_modules/normalize-scss/sass',
'node_modules/mathsass/dist/',
'node_modules/responsive-foundation/css-dev',
'node_modules/@bu-ist',
],
bundleExec: true,
},
Expand Down
2 changes: 1 addition & 1 deletion css-dev/calendar/_calendar-archive.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
// Responsive Calendar Archive Import
// =================================================================

@import "burf-theme/calendar/calendar-archive";
@import "burf-customizations/calendar/calendar-archive";

// =================================================================
// Custom Calendar Archive Styles
Expand Down
2 changes: 1 addition & 1 deletion css-dev/calendar/_calendar-picker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
// Responsive Calendar Widget Import
// =================================================================

@import "burf-theme/calendar/calendar-picker";
@import "burf-customizations/calendar/calendar-picker";

// =================================================================
// Custom Calendar Widget Styles
Expand Down
2 changes: 1 addition & 1 deletion css-dev/calendar/_calendar-single.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
// Responsive Single Calendar Event Import
// =================================================================

@import "burf-theme/calendar/calendar-single";
@import "burf-customizations/calendar/calendar-single";

// =================================================================
// Custom Single Calendar Event Styles
Expand Down
2 changes: 1 addition & 1 deletion css-dev/calendar/_widget-calendar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// Responsive Calendar Widget Import
// =================================================================

@import "burf-theme/calendar/widget-calendar";
@import "burf-customizations/calendar/widget-calendar";

// =================================================================
// Custom Calendar Widget Styles
Expand Down
2 changes: 1 addition & 1 deletion css-dev/content/_collapsibles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
// Responsive Collapsibles Import
// =================================================================

@import "burf-theme/content/collapsibles";
@import "burf-customizations/content/collapsibles";

// =================================================================
// Custom Collapsibles Styles
Expand Down
2 changes: 1 addition & 1 deletion css-dev/content/_courses.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// Responsive Course Feeds Import
// =================================================================

@import "burf-theme/content/courses";
@import "burf-customizations/content/courses";

// =================================================================
// Custom Course Feeds Styles
Expand Down
2 changes: 1 addition & 1 deletion css-dev/content/_slideshows.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// Responsive Slideshows Import
// =================================================================

@import "burf-theme/content/slideshows";
@import "burf-customizations/content/slideshows";

// =================================================================
// Custom Slideshows Styles
Expand Down
2 changes: 1 addition & 1 deletion css-dev/global/_fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Responsive Fonts
// =================================================================

@import "burf-base/fonts";
@import "burf-customizations/fonts";

// =================================================================
// Custom Fonts
Expand Down
4 changes: 2 additions & 2 deletions css-dev/global/_typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
/// @access public
/// @since 1.0.0

// $font-family-sans-serif: "Benton-Sans", "Helvetica", sans-serif;
$font-family-sans-serif: "Benton-Sans", "Helvetica", sans-serif;

/// A serif font to use. This variable is not used by default.
/// @group global
/// @access public
/// @since 1.0.0

// $font-family-serif: "TiemposText", Georgia, serif;
$font-family-serif: "TiemposText", Georgia, serif;

/// A monospace font to use sitewide.
/// By default, this affects the `<code>` and `<pre>` elements.
Expand Down
14 changes: 13 additions & 1 deletion css-dev/layout/_branding.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,23 @@

// $image-bumclogo-retina: "https://www.bu.edu/cdn/images/logos/bumclogo96x40-retina.png";

/// Branding Height
///
/// The height of the branding area.
///
/// Styleguide WordPress.Branding.Height
///
/// Access: Public
///
/// Since: 1.0.0

/// $height-brand: $height-masthead;

// =================================================================
// Responsive Branding Import
// =================================================================

@import "burf-theme/layout/branding";
@import "burf-customizations/layout/branding";

// =================================================================
// Custom Branding Styles
Expand Down
12 changes: 12 additions & 0 deletions css-dev/layout/_navigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,18 @@

// $color-masthead-bg: $color-grayscale-f;

/// Masthead Height
///
/// The height of the masthead area.
///
/// Styleguide WordPress.Masthead.Height
///
/// Access: Public
///
/// Since: 5.0.0

// $height-masthead: 120px;

/////////////////////// Primary Navigation /////////////////////////

/// The style of border used on primary navigation.
Expand Down
2 changes: 1 addition & 1 deletion css-dev/profiles/_profile-archive.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
// Responsive Profile Archive Import
// =================================================================

@import "burf-theme/profiles/profile-archive";
@import "burf-customizations/profiles/profile-archive";

// =================================================================
// Custom Profile Archive Styles
Expand Down
2 changes: 1 addition & 1 deletion css-dev/profiles/_profile-format-advanced.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
// Responsive Profiles Format - Advanced Import
// =================================================================

@import "burf-theme/profiles/profile-format-advanced";
@import "burf-customizations/profiles/profile-format-advanced";

// =================================================================
// Custom Profiles Format - Advanced Styles
Expand Down
2 changes: 1 addition & 1 deletion css-dev/profiles/_profile-format-basic.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// Responsive Profiles Format - Basic Import
// =================================================================

@import "burf-theme/profiles/profile-format-basic";
@import "burf-customizations/profiles/profile-format-basic";

// =================================================================
// Custom Profiles Format - Basic Styles
Expand Down
2 changes: 1 addition & 1 deletion css-dev/profiles/_profile-format-default.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
// Responsive Profiles Format - Default Import
// =================================================================

@import "burf-theme/profiles/profile-format-default";
@import "burf-customizations/profiles/profile-format-default";

// =================================================================
// Custom Profiles Format - Default Styles
Expand Down
2 changes: 1 addition & 1 deletion css-dev/profiles/_profile-format-mini.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
// Responsive Profiles Format - Mini Import
// =================================================================

@import "burf-theme/profiles/profile-format-mini";
@import "burf-customizations/profiles/profile-format-mini";

// =================================================================
// Custom Profiles Format - Mini Styles
Expand Down
2 changes: 1 addition & 1 deletion css-dev/profiles/_profile-single.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// Responsive Single Profile Import
// =================================================================

@import "burf-theme/profiles/profile-single";
@import "burf-customizations/profiles/profile-single";

// =================================================================
// Custom Single Profile Styles
Expand Down
2 changes: 1 addition & 1 deletion css-dev/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ Template: responsive-framework-2-x
// Layout
// =================================================================

@import "layout/branding";
@import "layout/navigation";
@import "layout/branding";
@import "layout/banner";
@import "layout/content-area";
@import "layout/footer";
Expand Down
Loading