Skip to content

E
edx-ora2
Commit e7fe99cc by Usman Khalid
Options

Added bidi versions of neat mixins: span-columns and omega. 

TNL-813
parent 456b3820
Showing with 89 additions and 43 deletions
openassessment/xblock/static/css/openassessment-ltr.css
This source diff could not be displayed because it is too large. You can view the blob instead.
openassessment/xblock/static/css/openassessment-rtl.css
This source diff could not be displayed because it is too large. You can view the blob instead.
openassessment/xblock/static/sass/oa/utilities/_developer.scss
......@@ -1115,6 +1115,26 @@
}
}
@include media($bp-m) {
@include bidi-span-columns(4 of 4);
}
@include media($bp-ds) {
@include bidi-span-columns(6 of 6);
}
@include media($bp-dm) {
@include bidi-span-columns(12 of 12);
}
@include media($bp-dl) {
@include bidi-span-columns(12 of 12);
}
@include media($bp-dx) {
@include bidi-span-columns(12 of 12);
}
.step__label, .grade__value {
display: inline-block;
vertical-align: middle;
......
openassessment/xblock/static/sass/oa/utilities/_extends.scss
......@@ -176,6 +176,7 @@
@extend %t-heading;
@include margin-left(($baseline-h/4));
white-space: pre-wrap;
display: inline;
color: $heading-color;
}
}
......@@ -226,17 +227,17 @@
display: block;
@include media($bp-dm) {
@include span-columns(8 of 12);
@include bidi-span-columns(8 of 12);
margin-bottom: 0;
}
@include media($bp-dl) {
@include span-columns(8 of 12);
@include bidi-span-columns(8 of 12);
margin-bottom: 0;
}
@include media($bp-dx) {
@include span-columns(8 of 12);
@include bidi-span-columns(8 of 12);
margin-bottom: 0;
}
}
......@@ -254,19 +255,19 @@
color: $copy-secondary-color;
@include media($bp-dm) {
@include span-columns(6 of 8);
@include bidi-span-columns(6 of 8);
@include float(left);
margin-bottom: 0;
}
@include media($bp-dl) {
@include span-columns(6 of 8);
@include bidi-span-columns(6 of 8);
@include float(left);
margin-bottom: 0;
}
@include media($bp-dx) {
@include span-columns(6 of 8);
@include bidi-span-columns(6 of 8);
@include float(left);
margin-bottom: 0;
}
......@@ -307,21 +308,21 @@
.wrapper--input {
@include media($bp-ds) {
@include span-columns(6 of 6);
@include bidi-span-columns(6 of 6);
}
@include media($bp-dm) {
@include span-columns(4 of 12);
@include bidi-span-columns(4 of 12);
margin-bottom: 0;
}
@include media($bp-dl) {
@include span-columns(4 of 12);
@include bidi-span-columns(4 of 12);
margin-bottom: 0;
}
@include media($bp-dx) {
@include span-columns(4 of 12);
@include bidi-span-columns(4 of 12);
margin-bottom: 0;
}
}
......
openassessment/xblock/static/sass/oa/utilities/_mixins.scss
......@@ -22,3 +22,28 @@
@return 180deg - $degrees;
}
}
// Bidi versions of neat mixins.
@mixin bidi-omega($query: block, $direction: default) {
@if $bi-app-direction == ltr {
@include direction-context(left-to-right) {
@include omega($query: $query, $direction: $direction);
}
} @else {
@include direction-context(right-to-left) {
@include omega($query: $query, $direction: $direction);
}
}
}
@mixin bidi-span-columns($span: $columns of $container-columns, $display: block) {
@if $bi-app-direction == ltr {
@include direction-context(left-to-right) {
@include span-columns($span: $span, $display: $display);
}
} @else {
@include direction-context(right-to-left) {
@include span-columns($span: $span, $display: $display);
}
}
}
openassessment/xblock/static/sass/oa/utilities/_shame.scss
......@@ -45,19 +45,19 @@
}
@include media($bp-ds) {
@include span-columns(4 of 6);
@include bidi-span-columns(4 of 6);
}
@include media($bp-dm) {
@include span-columns(8 of 12);
@include bidi-span-columns(8 of 12);
}
@include media($bp-dl) {
@include span-columns(8 of 12);
@include bidi-span-columns(8 of 12);
}
@include media($bp-dx) {
@include span-columns(9 of 12);
@include bidi-span-columns(9 of 12);
}
.step__label {
......
openassessment/xblock/static/sass/oa/views/_oa-base.scss
......@@ -50,22 +50,22 @@
margin-bottom: ($baseline-v/2);
@include media($bp-ds) {
@include span-columns(4 of 6);
@include bidi-span-columns(4 of 6);
margin-bottom: 0;
}
@include media($bp-dm) {
@include span-columns(8 of 12);
@include bidi-span-columns(8 of 12);
margin-bottom: 0;
}
@include media($bp-dl) {
@include span-columns(8 of 12);
@include bidi-span-columns(8 of 12);
margin-bottom: 0;
}
@include media($bp-dx) {
@include span-columns(9 of 12);
@include bidi-span-columns(9 of 12);
margin-bottom: 0;
}
......@@ -166,29 +166,29 @@
}
@include media($bp-ds) {
@include span-columns(2 of 6);
@include omega();
@include bidi-span-columns(2 of 6);
@include bidi-omega();
position: relative;
top: -12px;
}
@include media($bp-dm) {
@include span-columns(4 of 12);
@include omega();
@include bidi-span-columns(4 of 12);
@include bidi-omega();
position: relative;
top:-12px;
}
@include media($bp-dl) {
@include span-columns(4 of 12);
@include omega();
@include bidi-span-columns(4 of 12);
@include bidi-omega();
position: relative;
top: -12px;
}
@include media($bp-dx) {
@include span-columns(3 of 12);
@include omega();
@include bidi-span-columns(3 of 12);
@include bidi-omega();
position: relative;
top: -12px;
}
......@@ -726,23 +726,23 @@
.step__title {
@include media($bp-m) {
@include span-columns(4 of 4);
@include bidi-span-columns(4 of 4);
}
@include media($bp-ds) {
@include span-columns(6 of 6);
@include bidi-span-columns(6 of 6);
}
@include media($bp-dm) {
@include span-columns(12 of 12);
@include bidi-span-columns(12 of 12);
}
@include media($bp-dl) {
@include span-columns(12 of 12);
@include bidi-span-columns(12 of 12);
}
@include media($bp-dx) {
@include span-columns(12 of 12);
@include bidi-span-columns(12 of 12);
}
.step__label, .grade__value {
......@@ -902,23 +902,23 @@
margin-bottom: $baseline-v;
@include media($bp-ds) {
@include span-columns(3 of 6);
@include omega(2n);
@include bidi-span-columns(3 of 6);
@include bidi-omega(2n);
}
@include media($bp-dm) {
@include span-columns(4 of 12);
@include omega(3n);
@include bidi-span-columns(4 of 12);
@include bidi-omega(3n);
}
@include media($bp-dl) {
@include span-columns(4 of 12);
@include omega(3n);
@include bidi-span-columns(4 of 12);
@include bidi-omega(3n);
}
@include media($bp-dx) {
@include span-columns(4 of 12);
@include omega(3n);
@include bidi-span-columns(4 of 12);
@include bidi-omega(3n);
}
// CASE: self assessment
......@@ -977,19 +977,19 @@
.answer--feedback {
@include media($bp-ds) {
@include span-columns(6 of 6);
@include bidi-span-columns(6 of 6);
}
@include media($bp-dm) {
@include span-columns(12 of 12);
@include bidi-span-columns(12 of 12);
}
@include media($bp-dl) {
@include span-columns(12 of 12);
@include bidi-span-columns(12 of 12);
}
@include media($bp-dx) {
@include span-columns(12 of 12);
@include bidi-span-columns(12 of 12);
}
.answer--feedback__title {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment