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 cms/static/sass/_base-v2.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ body {
color: $gray-d3;
}

footer.primary{
footer.primary {
font-size: font-size(x-small);
}
14 changes: 6 additions & 8 deletions cms/static/sass/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,8 @@ dl {
padding: 0 $baseline;
position: relative;

.mast, .metadata {
.mast,
.metadata {
@include clearfix();

position: relative;
Expand Down Expand Up @@ -383,11 +384,6 @@ dl {
font-weight: 600;
}
}

// page metadata/action bar
.metadata {

}
}

// +Layout - Basic Page Content
Expand Down Expand Up @@ -434,7 +430,8 @@ dl {
}
}

.content-primary, .content-supplementary {
.content-primary,
.content-supplementary {
@include box-sizing(border-box);
}

Expand Down Expand Up @@ -630,7 +627,8 @@ hr.divide {
// ====================

// UI - semantically hide text
.sr, .sr-only {
.sr,
.sr-only {
@extend %cont-text-sr;
}

Expand Down
2 changes: 1 addition & 1 deletion cms/static/sass/_reset.scss
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ video {
padding: 0;
border: 0;
outline: 0;
font-size: 100%;
font: inherit;
font-size: 100%;
vertical-align: baseline;
}

Expand Down
14 changes: 0 additions & 14 deletions cms/static/sass/contexts/_ie.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,3 @@
}
}
}

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

// CASE: less than or equal to IE8
.lte8 {

}

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

// CASE: less than or equal to IE7
.lte7 {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

w00t!


}
18 changes: 12 additions & 6 deletions cms/static/sass/elements-v2/_controls.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,22 @@
@extend %ui-btn;
@extend %ui-btn-pill;

padding:($baseline/4) ($baseline/2);
padding: ($baseline/4) ($baseline/2);
border-width: 1px;
border-style: solid;
border-color: transparent;
text-align: center;

&:hover, &:active {
&:hover,
&:active {
@extend %ui-fake-link;

border-color: $gray-l3;
}

&.current, &.active, &.is-selected {
&.current,
&.active,
&.is-selected {
box-shadow: inset 0 1px 2px 1px $shadow-l1;
border-color: $gray-l3;
}
Expand All @@ -31,16 +34,19 @@
border-color: $white;
color: $gray-d1;

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

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

&:hover, &:active {
&:hover,
&:active {
color: $blue-s1;
}
}
Expand Down
12 changes: 8 additions & 4 deletions cms/static/sass/elements-v2/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
// ====================

// basic layout
.wrapper-l, .wrapper-r {
.wrapper-l,
.wrapper-r {
background: $white;
}

Expand All @@ -36,7 +37,11 @@
@include text-align(right);
}

.branding, .info-course, .nav-course, .nav-account, .nav-pitch {
.branding,
.info-course,
.nav-course,
.nav-account,
.nav-pitch {
box-sizing: border-box;
display: inline-block;
vertical-align: middle;
Expand Down Expand Up @@ -67,7 +72,7 @@
margin-right: 0;
}

.title{
.title {
@extend %ui-btn-dd-nav-primary;

@include transition(all $tmg-f2 ease-in-out 0s);
Expand Down Expand Up @@ -132,7 +137,6 @@

.nav-account-user {
.title {
max-width: ($baseline*10.5);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Seems odd that this just got deleted?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I deleted it because it's redeclared on 137

display: inline-block;
max-width: 84%;
overflow: hidden;
Expand Down
3 changes: 2 additions & 1 deletion cms/static/sass/elements/_creative-commons.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
@font-face {
font-family: 'CreativeCommons';
src: url('#{$static-path}/fonts/CreativeCommons/cc.eot');
src: url('#{$static-path}/fonts/CreativeCommons/cc.eot#iefix') format('embedded-opentype'),
src:
url('#{$static-path}/fonts/CreativeCommons/cc.eot#iefix') format('embedded-opentype'),
url('#{$static-path}/fonts/CreativeCommons/cc.woff') format('woff'),
url('#{$static-path}/fonts/CreativeCommons/cc.ttf') format('truetype'),
url('#{$static-path}/fonts/CreativeCommons/cc.svg#CreativeCommons') format('svg');
Expand Down
1 change: 1 addition & 0 deletions cms/static/sass/elements/_modal-window.scss
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@
color: $blue-d4;
}
}

.clipboard-button {
position: absolute;
right: 30px;
Expand Down
14 changes: 9 additions & 5 deletions cms/static/sass/views/_account.scss
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@
}
}

.content-primary, .content-supplementary {
.content-primary,
.content-supplementary {
@include box-sizing(border-box);
}

Expand Down Expand Up @@ -109,7 +110,9 @@
}
}

label, input, textarea {
label,
input,
textarea {
display: block;
}

Expand All @@ -125,7 +128,8 @@
}
}

input, textarea {
input,
textarea {
@extend %t-copy-base;

height: 100%;
Expand Down Expand Up @@ -218,7 +222,8 @@
margin-right: 0;
}

input, textarea {
input,
textarea {
width: 100%;
}
}
Expand Down Expand Up @@ -251,7 +256,6 @@
margin: 0 0 ($baseline/4) 0;
color: $gray-d2;
}

}
}

Expand Down
8 changes: 5 additions & 3 deletions cms/static/sass/views/_assets.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
// ====================

.view-uploads {
.content-primary, .content-supplementary {
.content-primary,
.content-supplementary {
@include box-sizing(border-box);
}

Expand Down Expand Up @@ -210,7 +211,8 @@
text-align: left;
color: $gray;

.column-sort-link, .column-selected-link {
.column-sort-link,
.column-selected-link {
cursor: pointer;
color: $blue;
}
Expand Down Expand Up @@ -266,7 +268,7 @@

.nav-item {
&.reset-filter {
display:none;
display: none;
}

a {
Expand Down
18 changes: 12 additions & 6 deletions cms/static/sass/views/_container.scss
Original file line number Diff line number Diff line change
Expand Up @@ -267,13 +267,16 @@
}

// location widget
.unit-location, .library-location {
.unit-location,
.library-location {
@extend %bar-module;

border-top: none;

.wrapper-unit-id, .wrapper-library-id {
.unit-id-value, .library-id-value {
.wrapper-unit-id,
.wrapper-library-id {
.unit-id-value,
.library-id-value {
@extend %status-value-base;

display: inline-block;
Expand Down Expand Up @@ -315,7 +318,8 @@
}

// typographical overrides (based off of outline-simple)
.section-header, .subsection-header {
.section-header,
.subsection-header {
line-height: 0;
margin-bottom: ($baseline/2);
}
Expand Down Expand Up @@ -377,7 +381,8 @@
}

.bc-container:not(.last) {
button, .parent-displayname {
button,
.parent-displayname {
text-decoration: underline;
color: $ui-link-color;
}
Expand Down Expand Up @@ -412,7 +417,8 @@
@include float(left);
}

.button-forward, .component {
.button-forward,
.component {
border: none;
}

Expand Down
3 changes: 2 additions & 1 deletion cms/static/sass/views/_export-git.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
.view-export-git {

// UI: basic layout
.content-primary, .content-supplementary {
.content-primary,
.content-supplementary {
@include box-sizing(border-box);

float: left;
Expand Down
11 changes: 7 additions & 4 deletions cms/static/sass/views/_export.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
.view-export {

// UI: basic layout
.content-primary, .content-supplementary {
.content-primary,
.content-supplementary {
@include box-sizing(border-box);
}

Expand Down Expand Up @@ -68,7 +69,8 @@

margin: ($baseline*2) 0;

.export-includes, .export-excludes {
.export-includes,
.export-excludes {
width: flex-grid(4, 9);

.item-detail {
Expand Down Expand Up @@ -210,7 +212,7 @@

// STATE: started
&.is-started {
.fa-warning {
.fa-warning {
visibility: hidden;
opacity: 0;
}
Expand Down Expand Up @@ -264,7 +266,8 @@
color: $red;
}

.status-detail .title, .status-detail .copy {
.status-detail .title,
.status-detail .copy {
color: $red;
}
}
Expand Down
Loading