Skip to content

Verification: Switch class-based Sass @extend rules to use Sass placeholder syntax #990

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 1 commit into from
Sep 16, 2013
Merged

Verification: Switch class-based Sass @extend rules to use Sass placeholder syntax #990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 lms/static/sass/base/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ mark {
}

.sr {
@extend .text-sr;
@extend %text-sr;
}

.help-tab {
Expand Down
26 changes: 13 additions & 13 deletions lms/static/sass/base/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,26 +55,26 @@
// ====================

// extends - UI - visual link
.ui-fake-link {
%ui-fake-link {
cursor: pointer;
}

// extends - UI - functional disable
.ui-disabled {
%ui-disabled {
pointer-events: none;
outline: none;
}

// extends - UI - depth levels
.ui-depth0 { z-index: 0; }
.ui-depth1 { z-index: 10; }
.ui-depth2 { z-index: 100; }
.ui-depth3 { z-index: 1000; }
.ui-depth4 { z-index: 10000; }
.ui-depth5 { z-index: 100000; }
%ui-depth0 { z-index: 0; }
%ui-depth1 { z-index: 10; }
%ui-depth2 { z-index: 100; }
%ui-depth3 { z-index: 1000; }
%ui-depth4 { z-index: 10000; }
%ui-depth5 { z-index: 100000; }

// extends -hidden elems - screenreaders
.text-sr {
%text-sr {
border: 0;
clip: rect(1px 1px 1px 1px);
height: 1px;
Expand All @@ -86,7 +86,7 @@
}

// extends - UI - removes list styling/spacing when using uls, ols for navigation and less content-centric cases
.ui-no-list {
%ui-no-list {
list-style: none;
margin: 0;
padding: 0;
Expand All @@ -99,22 +99,22 @@
}

// extends - text - image-replacement hidden text
.text-hide {
%text-hide {
text-indent: 100%;
white-space: nowrap;
overflow: hidden;
}

// extends - text - wrapping
.text-wrap {
%text-wrap {
text-wrap: wrap;
white-space: pre-wrap;
white-space: -moz-pre-wrap;
word-wrap: break-word;
}

// extends - text - text overflow by ellipsis
.text-truncated {
%text-truncated {
@include box-sizing(border-box);
overflow: hidden;
white-space: nowrap;
Expand Down
46 changes: 23 additions & 23 deletions lms/static/sass/elements/_controls.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// lms - elements - controls
// ====================

.btn {
%btn {
@include box-sizing(border-box);
@include transition(color 0.25s ease-in-out, background 0.25s ease-in-out, box-shadow 0.25s ease-in-out);
display: inline-block;
Expand All @@ -18,23 +18,23 @@
}
}

.btn-pill {
%btn-pill {
border-radius: $baseline/5;
}

.btn-rounded {
%btn-rounded {
border-radius: ($baseline/2);
}

.btn-edged {
%btn-edged {
border-radius: ($baseline/10);
}

// primary button
.btn-primary {
@extend .t-weight3;
@extend .btn;
@extend .btn-edged;
%btn-primary {
@extend %t-weight3;
@extend %btn;
@extend %btn-edged;
border: none;
padding: ($baseline*0.75) $baseline;
text-align: center;
Expand All @@ -57,8 +57,8 @@
}

// blue primary gray
.btn-primary-gray {
@extend .btn-primary;
%btn-primary-gray {
@extend %btn-primary;
box-shadow: 0 2px 1px 0 $m-gray-d2;
background: $m-gray;
color: $white;
Expand All @@ -85,8 +85,8 @@
}

// blue primary button
.btn-primary-blue {
@extend .btn-primary;
%btn-primary-blue {
@extend %btn-primary;
box-shadow: 0 2px 1px 0 $m-blue-d4;
background: $m-blue-d3;
color: $white;
Expand All @@ -113,8 +113,8 @@
}

// pink primary button
.btn-primary-pink {
@extend .btn-primary;
%btn-primary-pink {
@extend %btn-primary;
box-shadow: 0 2px 1px 0 $m-pink-d2;
background: $m-pink;
color: $white;
Expand All @@ -141,8 +141,8 @@
}

// green primary button
.btn-primary-green {
@extend .btn-primary;
%btn-primary-green {
@extend %btn-primary;
box-shadow: 0 2px 1px 0 $m-green-d2;
background: $m-green-d1;
color: $white;
Expand All @@ -169,7 +169,7 @@
}

// disabled primary button - used for more manual approaches
.btn-primary-disabled {
%btn-primary-disabled {
background: $m-gray-l2;
color: $white-t3;
pointer-events: none;
Expand All @@ -189,19 +189,19 @@
}

.btn-large {
@extend .t-action1;
@extend .t-weight3;
@extend %t-action1;
@extend %t-weight3;
display: block;
padding:($baseline*0.75) ($baseline*1.5);
}

.btn-avg {
@extend .t-action2;
@extend .t-weight3;
@extend %t-action2;
@extend %t-weight3;
}

.btn-blue {
@extend .btn-primary-blue;
@extend %btn-primary-blue;
margin-bottom: $baseline;


Expand All @@ -211,7 +211,7 @@
}

.btn-pink {
@extend .btn-primary-pink;
@extend %btn-primary-pink;
margin-bottom: $baseline;


Expand Down
Loading