Skip to content

Updating React Components Dependencies #48

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.

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

Closed
wants to merge 40 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
7effb2d
updating react components dependencies
jivewise Feb 29, 2016
2d9d4c5
use new mergeWith function instead of merge and update demo
jivewise Feb 29, 2016
d2160ec
update state when free response value props changes so that it can be…
pandafulmanda Mar 18, 2016
eb04f00
include current free response state when comparing with next state fo…
pandafulmanda Mar 18, 2016
a031640
limit free response to 10000 chars
darrenmason Mar 21, 2016
2b9dc14
adding in initial code for responsive video embed
jivewise Mar 25, 2016
2a891f1
fixing lint errors
jivewise Mar 25, 2016
e420406
adding in unit tests and updating small styles
jivewise Mar 29, 2016
036e2c7
cleaning up some code from phil's feedback
jivewise Mar 31, 2016
9b94eef
update react-bootstrap peerdependency
darrenmason Apr 4, 2016
6439ad6
also update react-bootstrap for dev dependency
pandafulmanda Apr 5, 2016
df02fbe
limit react-bootstrap to equal or below 0.26.2 as well due to current…
pandafulmanda Apr 5, 2016
b285ce9
add in breadcrumbs coach styles file, allowing it to be imported to p…
pandafulmanda Apr 6, 2016
e3ba573
dont need to pass step onto span as prop
pandafulmanda Apr 6, 2016
f4b3cf0
Copy in exercise preview component
nathanstitt Apr 4, 2016
974be23
fix preview less for building, adding exercise preview to demo
pandafulmanda Apr 5, 2016
1a7df55
add feedback_html and review mathjax for use in specs
nathanstitt Apr 5, 2016
63dd9d3
Add spec from tutor for exercise preview
nathanstitt Apr 5, 2016
f08381b
bring preview to use question more and more
pandafulmanda Apr 6, 2016
80ea554
use simple feedback rendering when showing all feedback, update gulp …
pandafulmanda Apr 6, 2016
2d4fbc8
updating stimulus and stem order
jivewise Apr 6, 2016
2723621
answer preview test adjust for new selector
pandafulmanda Apr 6, 2016
68da6b6
pass display feedback props through to question
pandafulmanda Apr 6, 2016
636522b
bring preview closer to what exercise-card in tutor-js looks like
pandafulmanda Apr 6, 2016
3fa0c8c
use underscore for now for this use of each
pandafulmanda Apr 6, 2016
e7803c0
fix use of not for cs linting
pandafulmanda Apr 6, 2016
7903308
fix answer table styling so that feedback lines up beneath answer, ta…
pandafulmanda Apr 6, 2016
c37b961
Use collaborator_solutions instead of solutions
nathanstitt Apr 6, 2016
006aef5
minor styling adjustments for readbility
pandafulmanda Apr 6, 2016
61d16a3
allow passing through of question children from exercise preview comp…
pandafulmanda Apr 6, 2016
aff5800
different footers per question may be needed
pandafulmanda Apr 6, 2016
93f39d9
add preview type for questions to keep selected count in teacher review
pandafulmanda Apr 7, 2016
709839a
Add keys to components to silence warnings
nathanstitt Apr 7, 2016
9e78418
Remove dead code (@renderAnswer is null)
nathanstitt Apr 7, 2016
19b3b2f
Use underscore instead of lodash
nathanstitt Apr 7, 2016
8e6aec0
include core fa less so that .fa is usable as a mixin
pandafulmanda Apr 14, 2016
05587a6
use the provide mixin for fa-icon instead of including core from fa
pandafulmanda Apr 14, 2016
07725c4
updating react components dependencies
jivewise Feb 29, 2016
3b94a0f
updating to latest bootstrap
jivewise Apr 15, 2016
e376494
removing react scroll peer dependency
jivewise Apr 15, 2016
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
3 changes: 2 additions & 1 deletion demo.cjsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
React = require 'react'
ReactDom = require 'react-dom'
Demo = require './src/components/demo'
{startMathJax} = require './src/helpers/mathjax'

Expand All @@ -10,7 +11,7 @@ loadApp = ->
mainDiv = document.createElement('div')
mainDiv.id = 'react-root-container'
document.body.appendChild(mainDiv)
React.render(<Demo/>, mainDiv)
ReactDom.render(<Demo/>, mainDiv)
true

loadApp() or document.addEventListener('readystatechange', loadApp)
2 changes: 2 additions & 0 deletions index.cjsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ SmartOverflow = require './src/components/smart-overflow'
RefreshButton = require './src/components/buttons/refresh-button'
AsyncButton = require './src/components/buttons/async-button'
CloseButton = require './src/components/buttons/close-button'
ExercisePreview = require './src/components/exercise/preview'
ExerciseIdentifierLink = require './src/components/exercise/identifier-link'
ChapterSectionMixin = require './src/components/chapter-section-mixin'
GetPositionMixin = require './src/components/get-position-mixin'
Expand Down Expand Up @@ -44,6 +45,7 @@ module.exports = {
ResizeListenerMixin,

SpyMode,
ExercisePreview,
ExerciseIdentifierLink,
KeysHelper
}
109 changes: 55 additions & 54 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,82 +21,83 @@
},
"homepage": "https://github.com/openstax/react-components",
"dependencies": {
"bootstrap": "3.3.5",
"camelcase": "1.2.1",
"classnames": "2.1.5",
"eventemitter2": "0.4.14",
"font-awesome": "4.4.0",
"bootstrap": "3.3.6",
"camelcase": "2.1.0",
"classnames": "2.2.3",
"eventemitter2": "1.0.0",
"font-awesome": "4.5.0",
"keymaster": "1.6.2",
"markdown-it": "4.4.0",
"moment": "2.10.6",
"markdown-it": "6.0.0",
"moment": "2.11.2",
"underscore": "1.8.3"
},
"devDependencies": {
"blanket": "1.1.7",
"chai": "2.1.2",
"chai-as-promised": "5.1.0",
"chromedriver": "2.19.0",
"cjsxify": "0.2.6",
"blanket": "1.2.2",
"chai": "3.5.0",
"chai-as-promised": "5.2.0",
"chromedriver": "2.21.2",
"cjsxify": "0.3.0",
"coffee-jsx-loader": "0.1.3",
"coffee-loader": "0.7.2",
"coffee-react-transform": "3.3.0",
"coffee-script": "1.9.3",
"coffeelint": "1.13.0",
"coffee-script": "1.10.0",
"coffeelint": "1.14.2",
"coffeelint-loader": "0.1.1",
"css-loader": "0.22.0",
"del": "1.1.1",
"es6-promise": "2.3.0",
"extract-text-webpack-plugin": "0.8.2",
"file-exists": "0.1.1",
"file-loader": "0.8.4",
"fixed-data-table": "0.4.1",
"gulp": "3.9.0",
"gulp-coffeelint": "0.4.0",
"gulp-env": "0.2.0",
"gulp-gzip": "1.0.0",
"gulp-rev": "3.0.1",
"gulp-tar": "1.4.0",
"gulp-util": "3.0.6",
"css-loader": "0.23.1",
"del": "2.2.0",
"es6-promise": "3.1.2",
"extract-text-webpack-plugin": "1.0.1",
"file-exists": "1.0.0",
"file-loader": "0.8.5",
"fixed-data-table": "0.6.0",
"gulp": "3.9.1",
"gulp-coffeelint": "0.6.0",
"gulp-env": "0.4.0",
"gulp-gzip": "1.2.0",
"gulp-rev": "7.0.0",
"gulp-tar": "1.8.0",
"gulp-util": "3.0.7",
"gulp-watch": "4.3.5",
"istanbul-instrumenter-loader": "0.1.3",
"json-loader": "0.5.3",
"karma": "0.13.19",
"istanbul-instrumenter-loader": "0.2.0",
"json-loader": "0.5.4",
"karma": "0.13.21",
"karma-chai": "0.1.0",
"karma-chai-sinon": "0.1.5",
"karma-chrome-launcher": "0.2.1",
"karma-coverage": "0.5.2",
"karma-mocha": "0.1.10",
"karma-mocha-reporter": "1.0.4",
"karma-nyan-reporter": "0.2.2",
"karma-phantomjs-launcher": "0.2.1",
"karma-phantomjs-shim": "1.1.1",
"karma-sourcemap-loader": "0.3.6",
"karma-chrome-launcher": "0.2.2",
"karma-coverage": "0.5.3",
"karma-mocha": "0.2.2",
"karma-mocha-reporter": "1.2.2",
"karma-nyan-reporter": "0.2.3",
"karma-phantomjs-launcher": "1.0.0",
"karma-phantomjs-shim": "1.2.0",
"karma-sourcemap-loader": "0.3.7",
"karma-webpack": "1.7.0",
"less": "2.5.3",
"less-loader": "2.2.1",
"lodash": "3.10.1",
"mocha": "2.2.5",
"phantomjs": "1.9.18",
"react": "0.13.1",
"react-bootstrap": "0.23.0",
"react-bootstrap": "0.28.3",
"less": "2.6.0",
"less-loader": "2.2.2",
"lodash": "4.5.1",
"react": "0.14.7",
"react-addons-test-utils": "0.14.7",
"react-hot-loader": "1.3.0",
"react-scroll-components": "0.2.2",
"selenium-webdriver": "2.47.0",
"sinon": "1.17.1",
"selenium-webdriver": "2.52.0",
"sinon": "1.17.3",
"sinon-chai": "2.8.0",
"style-loader": "0.12.4",
"url-loader": "0.5.6",
"webpack": "1.12.2",
"webpack-dev-server": "1.12.0",
"webpack-module-hot-accept": "1.0.3",
"style-loader": "0.13.0",
"url-loader": "0.5.7",
"webpack": "1.12.14",
"webpack-dev-server": "1.14.1",
"webpack-module-hot-accept": "1.0.4",
"webpack-umd-external": "1.0.2",
"when": "3.7.3"
},
"peerDependencies": {
"react": "^0.13.1",
"react-bootstrap": "^0.23.0",
"react-scroll-components": "^0.2.2"
"react": "0.14.7",
"react-bootstrap": "0.28.3"
},
"peerDependencies": {},
"config": {
"blanket": {
"pattern": "src"
Expand Down
1 change: 1 addition & 0 deletions resources/styles/_components.less
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
@import './components/html/index';
@import './components/exercise/step-card';
@import './components/exercise/group';
@import './components/exercise/preview';
@import './components/breadcrumbs/step';
@import './components/question';
@import './components/close';
Expand Down
141 changes: 141 additions & 0 deletions resources/styles/components/breadcrumbs/coach.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
@concept-coach-breadcrumb-background: @openstax-white;
@concept-coach-breadcrumb-color: @openstax-neutral;
@concept-coach-breadcrumb-border-radius: 0;

.make-breadcrumb-clickable() {
&.active {
color: @openstax-white;
background: @openstax-info;
border-color: @openstax-info;
cursor: default;
font-weight: 400;
}

&:hover,
&:focus {
border-color: @openstax-info;
outline: none;
}
}

.concept-coach-breadcrumbs() {
.task-breadcrumbs {
margin: 1rem 0;
}

.openstax-breadcrumbs-step {
border-width: 2px;
border-style: solid;
border-radius: @concept-coach-breadcrumb-border-radius;
background: @concept-coach-breadcrumb-background;
border-color: @concept-coach-breadcrumb-background;
color: @concept-coach-breadcrumb-color;
margin-right: 1rem;
font-size: 2.5rem;
line-height: 3.8rem;
width: auto;
position: relative;

&:hover,
&.active {
box-shadow: none;
border-radius: @concept-coach-breadcrumb-border-radius;
.scale(1);
}

.transition(~'background 0.1s ease-in-out, border-color 0.1s ease-in-out');
.make-breadcrumb-clickable();

&::before {
font-weight: 300;
position: relative;
}

&.disabled {
background: transparent;
border-color: transparent;
color: lighten(@concept-coach-breadcrumb-color, 25%);
cursor: default;

&:hover {
border-color: transparent;
}
}

&.end:not(.disabled) {
background: @openstax-white;
border-color: @openstax-white;
color: @concept-coach-breadcrumb-color;
cursor: pointer;
}

&:not(.active) {
&.status-incorrect,
&.status-correct {
background: @concept-coach-breadcrumb-background;
}
&.status-incorrect {
color: @openstax-incorrect-color;
}

&.status-correct {
color: @openstax-correct-color;
}
}


&.breadcrumb-end[data-label] {
top: -0.5em;

&::before {
text-align: center;
width: 100%;
padding: 0 1rem;
font-style: italic;
text-transform: capitalize;
content: attr(data-label);
}
}
}

.icon-end {
display: none;
}

.icon-stack {
> .icon-sm,
> .icon-lg {
top: -1.5rem;
left: 2.2rem;
width: 26px;
height: 26px;
border-radius: 50%;
border: 3px solid @openstax-neutral-light;
}
}


.icon-incorrect,
.icon-correct {
.fa-icon();
font-size: 2.4rem;
line-height: 1.8rem;
background: @openstax-white;
}

.icon-incorrect {
color: @openstax-incorrect-color;

&::after {
content: @fa-var-times-circle;
}
}

.icon-correct {
color: @openstax-correct-color;

&::after {
content: @fa-var-check-circle;
}
}
}
Loading