Skip to content

Commit

Permalink
Merge pull request #152 from bu-ist/release/2.0.1
Browse files Browse the repository at this point in the history
Release/2.0.1
  • Loading branch information
ashleykolodziej authored May 30, 2018
2 parents 83be83f + 9d5906a commit c6a0dc4
Show file tree
Hide file tree
Showing 9 changed files with 185 additions and 36 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 2.0.1

* Adds support for BU Hub Indicator within Course Feeds.

## 2.0.0

* Support for typography mixins
Expand Down
8 changes: 8 additions & 0 deletions css-dev/burf-base/_config.scss
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,14 @@ $color-grayscale-f5: tint-gray( #f5f5f5 );

$color-grayscale-f: tint-gray( #fff );

/// A grayscale variable for hover state of the BU Hub webfont. Not intended for editing.
/// @group 01-config
/// @type color
/// @access public
/// @since 2.0.0

$color-hub: #767676;

// -----------------------------------------------------------------
// -----------------------------------------------------------------
// -----------------------------------------------------------------
Expand Down
15 changes: 15 additions & 0 deletions css-dev/burf-base/_fonts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,18 @@
font-style: italic;
font-weight: 700;
}

// BU Default Icons
// -----------------------------------------------------------------

@font-face {
font-family: 'BU-Default-Icons';
src: url( '//www.bu.edu/cdn/fonts/icons/bu-default-icons/bu-default-icons.eot' );
src: url( '//www.bu.edu/cdn/fonts/icons/bu-default-icons/bu-default-icons.eot?#iefix' ) format( 'embedded-opentype' ),
url( '//www.bu.edu/cdn/fonts/icons/bu-default-icons/bu-default-icons.woff' ) format( 'woff' ),
url( '//www.bu.edu/cdn/fonts/icons/bu-default-icons/bu-default-icons.ttf' ) format( 'truetype' ),
url( '//www.bu.edu/cdn/fonts/icons/bu-default-icons/bu-default-icons.svg#bu-default-icons' ) format( 'svg' );
font-style: normal;
font-weight: 400;
// unicode-range:U+??????; /* Include all Unicode possiblities */
}
5 changes: 5 additions & 0 deletions css-dev/burf-base/icons/_supported.scss
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,11 @@ $icons-responsive: (
checkbox-filled: "\ED53",
radio-empty: "\ED54",
radio-filled: "\ED55",

// BU Hub Indicator

buhub: '\F700',
questionmark: '\2753',
);

// Merges custom icons and overrides with the default supported icons map.
Expand Down
30 changes: 28 additions & 2 deletions css-dev/burf-base/icons/_ui.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
/// The radio - empty icon.
/// @example scss - Add the radio - empty icon to a menu item
/// .menu-item {
/// @extend %icon-radio-empty;
/// @extend %icon-checkbox-filled;
/// }
/// @group icons
/// @access public
Expand All @@ -62,7 +62,7 @@
/// The radio - filled icon.
/// @example scss - Add the radio - filled icon to a menu item
/// .menu-item {
/// @extend %icon-radio-filled;
/// @extend %icon-radio-empty;
/// }
/// @group icons
/// @access public
Expand All @@ -71,3 +71,29 @@
%icon-radio-filled {
@include icon( "radio-filled" );
}

/// BU Hub Wordmark Logo
/// @example scss - Add the radio - filled icon to a menu item
/// .menu-item {
/// @extend %icon-buhub;
/// }
/// @group icons
/// @access public
/// @since 2.0.0

%icon-buhub {
@include icon( 'buhub' );
}

/// BU Hub Question Mark Icon
/// @example scss - Add the radio - filled icon to a menu item
/// .menu-item {
/// @extend %icon-questionmark;
/// }
/// @group icons
/// @access public
/// @since 2.0.0

%icon-questionmark {
@include icon( 'questionmark' );
}
93 changes: 92 additions & 1 deletion css-dev/burf-theme/content/_courses.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/// @access public
/// @since 2.0.0

$border-coursefeed: $border !default;
$border-coursefeed: $border !default;

// =================================================================
// Course Feed Styles
Expand All @@ -20,6 +20,7 @@ $border-coursefeed: $border !default;

.cf-course {
border-top: $border-coursefeed;
clear: right;
margin-top: $margin;
padding-top: $padding;

Expand Down Expand Up @@ -116,3 +117,93 @@ $border-coursefeed: $border !default;
content: "Prerequisites: ";
}
}

// =================================================================
// BU Hub Indicator Styles
// =================================================================


/// BU Hub Indicator Wrapper
/// @group 09-content
/// @access public
/// @since 2.0.1

.cf-hub-ind {
display: block;
float: unset;
margin: 0 0 20px 20px;
max-width: 305px;
width: 100%;

.cf-course-card & {
// This breakpoint is explicit and shouldn’t be altered.
@include breakpoint( 525px ) {
float: right;
}
}
}

/// BU Hub Indicator Title
/// @group 09-content
/// @access public
/// @since 2.0.1

.cf-hub-head {
text-decoration: none;
}

/// BU Hub Indicator Title Iconstyles
/// @group 09-content
/// @access public
/// @since 2.0.1

.bu-hub-iconstyles {
display: inline-block;
height: 25px;
margin: 5px 0;
overflow: hidden;

&::before {
color: $color-grayscale-5;
display: block;
font-size: 65px;
height: 25px;
line-height: 16px;
overflow: hidden;
width: 90px;

a:hover & {
color: $color-hub;
}
}

&.icon-buhub::before {
margin-right: 0;
width: 70px;
}

&.icon-questionmark::before {
font-size: 16px;
line-height: 17px;
}
}

/// BU Hub Indicator Area <ul> List
/// @group 09-content
/// @access public
/// @since 2.0.1

.cf-hub-offerings {
color: $color-hub;
// ! Regardless where this lives, always maintain consistent use of Benton.
font-family: "Benton-Sans", Arial, "Helvetica Neue", Helvetica, sans-serif;
font-size: 12px;
font-weight: 300;
list-style-type: none;
margin: -5px 0 10px;
padding: 0;

li {
margin-bottom: 7px;
}
}
2 changes: 1 addition & 1 deletion css-dev/burf-theme/layout/_branding.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/// @access public
/// @since 1.0.0

$font-family-brand: "Whitney SSm A", "Whitney SSm B", $font-family-sans-serif !default;
$font-family-brand: "Whitney SSm A", "Whitney SSm B", "Helvetica", "Arial", sans-serif !default;

/// The font family to use for the sponsored branding type.
/// @group 07-branding
Expand Down
56 changes: 28 additions & 28 deletions package-lock.json

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

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "responsive-foundation",
"version": "2.0.0",
"version": "2.0.1",
"devDependencies": {
"grunt": "~0.4.5",
"grunt-browser-sync": "^1.5.3",
"grunt-bower-task": "^0.4.0",
"grunt-browser-sync": "^1.5.3",
"grunt-contrib-concat": "^0.5.0",
"grunt-contrib-copy": "^0.7.0",
"grunt-contrib-sass": "^0.8.1",
"grunt-contrib-watch": "^0.6.1",
"grunt-gh-pages": "^0.9.1",
"grunt-sassdoc": "^2.0.2",
"grunt-sassdoc": "^2.0.3",
"grunt-version": "^0.3.0",
"sassdoc-theme-budocs": "[email protected]:ashleykolodziej/sassdoc-theme-budocs.git#master"
"sassdoc-theme-budocs": "git+ssh://git@github.com/ashleykolodziej/sassdoc-theme-budocs.git#master"
}
}

0 comments on commit c6a0dc4

Please sign in to comment.