Skip to content

Studio - Help Links Addition and Small UI Revisions to Main Navigation #299

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

Merged
talbs merged 19 commits into from
Jul 2, 2013
Merged

Studio - Help Links Addition and Small UI Revisions to Main Navigation #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f98f500
studio - sets initial studio nav revisions (WIP)
talbs Jun 26, 2013
33d0302
studio - proofs nav's flex grid widths/alignment
talbs Jun 26, 2013
51f96ad
studio - revises button styling/states for primary nav
talbs Jun 26, 2013
2a04eee
studio - revises studio nav visually and adds help links
talbs Jun 27, 2013
ab0cada
studio - revises main nav dropdown jquery selectors
talbs Jun 27, 2013
d592348
studio - abstracts and animates main nav dropdown icons
talbs Jun 27, 2013
628874d
studio - makes course org/number visually inline in main nav
talbs Jun 27, 2013
690f0f4
studio - removing reference to old edX Studio logo on index view
talbs Jun 28, 2013
20c8dcd
studio - removing unused/needed studio logos
talbs Jun 28, 2013
beaa597
studio - replaces flex-grid based widths with % for main nav
talbs Jun 28, 2013
41fa73b
studio - wraps nav elements in floated containers for easier layout
talbs Jul 1, 2013
1e5fa87
studio - syncs up Sass variable with edX's official blue
talbs Jul 1, 2013
2a5c551
studio - plans for/truncates long usernames in main nav
talbs Jul 1, 2013
251e775
studio - makes course org/number/name block an entire link
talbs Jul 2, 2013
391ebb7
studio - removes Studio Help from account-based nav
talbs Jul 2, 2013
f06f0b7
studio - revises edX base color
talbs Jul 2, 2013
c89c409
studio - syncs up blue background/border of tender widget
talbs Jul 2, 2013
3c2c2fb
studio - syncs up page subtitle labels with new main nav
talbs Jul 2, 2013
b560f43
studio - removes unused previous value
talbs Jul 2, 2013
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
Binary file removed cms/static/img/edx-studio-large.png
View file
Open in desktop
Binary file not shown.
Binary file removed cms/static/img/edx-studio-logo-small.png
View file
Open in desktop
Binary file not shown.
Binary file removed cms/static/img/logo-edx-studio-white.png
View file
Open in desktop
Binary file not shown.
Binary file modified cms/static/img/logo-edx-studio.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions cms/static/js/base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ $(document).ready(function() {

// nav - dropdown related
$body.click(function(e) {
$('.nav-dropdown .nav-item .wrapper-nav-sub').removeClass('is-shown');
$('.nav-dropdown .nav-item .title').removeClass('is-selected');
$('.nav-dd .nav-item .wrapper-nav-sub').removeClass('is-shown');
$('.nav-dd .nav-item .title').removeClass('is-selected');
});

$('.nav-dropdown .nav-item .title').click(function(e) {
$('.nav-dd .nav-item .title').click(function(e) {

$subnav = $(this).parent().find('.wrapper-nav-sub');
$title = $(this).parent().find('.title');
Expand All @@ -71,8 +71,8 @@ $(document).ready(function() {
$subnav.removeClass('is-shown');
$title.removeClass('is-selected');
} else {
$('.nav-dropdown .nav-item .title').removeClass('is-selected');
$('.nav-dropdown .nav-item .wrapper-nav-sub').removeClass('is-shown');
$('.nav-dd .nav-item .title').removeClass('is-selected');
$('.nav-dd .nav-item .wrapper-nav-sub').removeClass('is-shown');
$title.addClass('is-selected');
$subnav.addClass('is-shown');
}
Expand Down
2 changes: 1 addition & 1 deletion cms/static/sass/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ $gray-d2: shade($gray,40%);
$gray-d3: shade($gray,60%);
$gray-d4: shade($gray,80%);

$blue: rgb(85, 151, 221);
$blue: rgb(0, 159, 230);
$blue-l1: tint($blue,20%);
$blue-l2: tint($blue,40%);
$blue-l3: tint($blue,60%);
Expand Down
43 changes: 42 additions & 1 deletion cms/static/sass/elements/_controls.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,48 @@

// ====================

// layout-based buttons
// simple dropdown button styling - should we move this elsewhere?
.btn-dd {
@extend .btn;
@extend .btn-pill;
padding:($baseline/4) ($baseline/2);
border-width: 1px;
border-style: solid;
border-color: transparent;
text-align: center;

&:hover, &:active {
@extend .fake-link;
border-color: $gray-l3;
}

&.current, &.active, &.is-selected {
@include box-shadow(inset 0 1px 2px 1px $shadow-l1);
border-color: $gray-l3;
}
}

// layout-based buttons - nav dd
.btn-dd-nav-primary {
@extend .btn-dd;
background: $white;
border-color: $white;
color: $gray-d1;

&:hover, &:active {
background: $white;
color: $blue-s1;
}

&.current, &.active {
background: $white;
color: $gray-d4;

&:hover, &:active {
color: $blue-s1;
}
}
}

// ====================

Expand Down
Loading