Commit 9d4d41cb by Eric Fischer

Merge pull request #877 from edx/efischer/die_ruby_die

Remove ruby sass compilation
parents 7cbce617 600a0bfa
......@@ -35,7 +35,7 @@ javascript:
sass:
./scripts/sass.sh
python scripts/compile_sass.py
install-test:
......@@ -45,7 +45,6 @@ install-sys-requirements: install-system install-node
npm config set loglevel warn
install-dev:
gem install sass
pip install -q -r requirements/dev.txt
install: install-wheels install-python install-js install-nltk-data install-test install-dev javascript sass
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -247,7 +247,7 @@ $link-hover: $edx-blue-l1 !default; // from our Pattern Library http://ux.edx.or
.openassessment_editor_content_and_tabs {
width: 100%;
height: Calc(100% - 55px);
height: calc(100% - 55px);
}
#oa_editor_window_title{
......@@ -379,7 +379,7 @@ $link-hover: $edx-blue-l1 !default; // from our Pattern Library http://ux.edx.or
}
.oa_editor_content_wrapper {
height: Calc(100% - 42px);
height: calc(100% - 42px);
width: 100%;
@include border-radius(3px);
border: 1px solid $edx-gray-d1;
......@@ -426,7 +426,7 @@ $link-hover: $edx-blue-l1 !default; // from our Pattern Library http://ux.edx.or
#ai_training_examples{
@include margin(5px, 20px, 10px, 10px);
height: 300px;
width: Calc(100% - 20px);
width: calc(100% - 20px);
resize: none;
font: inherit;
line-height: 110%;
......@@ -773,7 +773,7 @@ $link-hover: $edx-blue-l1 !default; // from our Pattern Library http://ux.edx.or
label{
width: 100%;
@include padding-left(Calc((100% - 150px)/2));
@include padding-left(calc((100% - 150px)/2));
margin: 0;
@include float(right);
......@@ -967,7 +967,7 @@ $link-hover: $edx-blue-l1 !default; // from our Pattern Library http://ux.edx.or
height: 100%;
textarea {
min-height: 90px;
height: Calc(100% - 35px);
height: calc(100% - 35px);
resize: none;
box-sizing: border-box;
border: 1px solid #b2b2b2;
......@@ -979,7 +979,7 @@ $link-hover: $edx-blue-l1 !default; // from our Pattern Library http://ux.edx.or
font-size: 11px;
color: #4c4c4c;
@include margin(5px, 15px, 0, 10px);
width: Calc(100% - 25px);
width: calc(100% - 25px);
}
}
......
......@@ -19,6 +19,7 @@ djangorestframework>=3.1,<3.3
dogapi==1.2.1
jsonfield==1.0.3
lazy==1.1
libsass==0.10.0
loremipsum==1.0.5
python-dateutil==2.1
python-memcached==1.48
......
import sass
BASE_DIR = 'openassessment/xblock/static/'
sass.compile(
dirname=(BASE_DIR+'sass', BASE_DIR+'css'),
include_paths=[BASE_DIR+'sass/vendor/bi-app'],
output_style='compressed',
)
#!/usr/bin/env bash
cd `dirname $BASH_SOURCE` && cd ../openassessment/xblock/static
sass --update sass:css --force --style compressed -I ./sass/vendor/bi-app
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