Brian Talbot
|
3bc73de1b4
|
studio - changed order of Sass import to account for variables needed in architecture
|
2013-03-08 12:56:00 -05:00 |
|
Brian Talbot
|
786ffd1092
|
studio - further small cleanup on Sass
|
2013-03-08 12:44:24 -05:00 |
|
Brian Talbot
|
e9a2413c04
|
studio - further small cleanup on Sass
|
2013-03-08 12:35:28 -05:00 |
|
Brian Talbot
|
6418d033dd
|
studio - adding files I forgot to add when cleaning up Sass and originally committing
|
2013-03-08 12:20:40 -05:00 |
|
Brian Talbot
|
3b2c970248
|
studio - reorganized and documented used Sass for studio
|
2013-03-08 11:47:11 -05:00 |
|
Brian Talbot
|
62514d85a3
|
studio - alerts: loosely wired advanced settings with new notification and alert messages
|
2013-03-06 15:36:38 -05:00 |
|
Brian Talbot
|
9a7b6c7eaf
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-03-06 15:04:34 -05:00 |
|
Arthur Barrett
|
c9b2a6a203
|
updated CSS to use the new advanced icon
|
2013-03-05 10:52:39 -05:00 |
|
Brian Talbot
|
cbdf9ea25b
|
studio - alerts: proofing older, but still needed in page alerts (unit drafts) styling
|
2013-03-05 09:57:14 -05:00 |
|
Brian Talbot
|
cc3b9557f9
|
studio - open ended and annotations: added in component button icon assets and styling
|
2013-03-04 17:02:59 -05:00 |
|
Brian Talbot
|
eb1658730a
|
studio - alerts: revised border styling on all elements and button/color inheritance
|
2013-03-04 12:30:04 -05:00 |
|
Brian Talbot
|
72c58cd454
|
studio - alerts: refactored styles for common content types across UI, got prompts set up and styled, and refactored base template for future prompt/notification/alert use
|
2013-03-03 20:44:48 -05:00 |
|
Brian Talbot
|
bc0b1b0958
|
studio - alerts: cleaned up animation standards and made mixins to reference as well as got prompt UI pattern behavior working
|
2013-03-02 22:06:55 -05:00 |
|
Vik Paruchuri
|
f8b0338dee
|
Change name of annotatable, add in sass for advanced module
|
2013-03-01 16:26:48 -05:00 |
|
Brian Talbot
|
8552b2d614
|
local merge with master - WIP
|
2013-03-01 15:47:23 -05:00 |
|
Brian Talbot
|
ad70581b80
|
studio - alerts: more progress including prompts
|
2013-03-01 15:43:07 -05:00 |
|
Vik Paruchuri
|
9f020e228b
|
Add in some dummy values
|
2013-03-01 14:50:40 -05:00 |
|
Brian Talbot
|
73ae818958
|
studio - fixing padding of codeMirror fields to match height of others given new line height
|
2013-02-27 13:08:56 -05:00 |
|
Brian Talbot
|
cdd6ce708e
|
studio - reducing line height for codemirror JSON lines
|
2013-02-27 13:07:58 -05:00 |
|
Brian Talbot
|
524f48b68e
|
studio - fixing padding of codeMirror fields to match height of others given new line height
|
2013-02-27 13:03:36 -05:00 |
|
Brian Talbot
|
45520fe124
|
studio - fixing line heights not syncing with code mirror lines and cursor
|
2013-02-27 12:59:25 -05:00 |
|
Brian Talbot
|
cb456ad228
|
studio - alerts: converted transition-based animation to keyframe/css animation and added in a demo for a fleeting notification
|
2013-02-27 12:45:44 -05:00 |
|
Carlos Andrés Rocha
|
2ca303c95d
|
Merge pull request #1526 from MITx/feature/cas/manual-policy-merged
Feature/cas/manual policy merged
|
2013-02-27 09:02:07 -08:00 |
|
Brian Talbot
|
d09927e8dd
|
studio - alerts: small styling tweaks for the close button on help notifications
|
2013-02-26 12:38:46 -05:00 |
|
Brian Talbot
|
0926395445
|
studio - alerts: added in close buttons and basic JS to control them/moved demo JS to alerts.html page
|
2013-02-26 12:32:20 -05:00 |
|
Brian Talbot
|
95ea01689f
|
studio - alerts: firmed up status-based notifications
|
2013-02-25 16:30:36 -05:00 |
|
Brian Talbot
|
d809df913d
|
studio - alerts: moved all states and documentation into new /alerts view
|
2013-02-25 14:45:27 -05:00 |
|
Brian Talbot
|
8179b9fadc
|
studio - alerts: initial pass at alert styling and markup complete
|
2013-02-25 14:19:22 -05:00 |
|
Brian Talbot
|
b1f5d67a96
|
studio - alerts: initial pass at alert styling and markup complete
|
2013-02-22 14:39:49 -05:00 |
|
Brian Talbot
|
bb24a079a1
|
studio - alerts: initial pass at alert styling and markup complete
|
2013-02-22 14:28:13 -05:00 |
|
Brian Talbot
|
d7bbfbc707
|
studio - alerts: basic layout and general alert styling WIP
|
2013-02-22 13:52:24 -05:00 |
|
Brian Talbot
|
22639adc63
|
studio - alerts WIP
|
2013-02-21 14:31:24 -05:00 |
|
Brian Talbot
|
8b5f088eb9
|
studio - fixed alignment of new section field and controls
|
2013-02-20 16:43:13 -05:00 |
|
Brian Talbot
|
4b850f4da9
|
studio - notifications: made icon/copy area more bulletproof for longer lines of text
|
2013-02-20 16:24:50 -05:00 |
|
Brian Talbot
|
7b60ec380a
|
Merge branch 'master' into feature/cas/manual-policy-merged
|
2013-02-20 14:58:50 -05:00 |
|
Brian Talbot
|
e157fd26c8
|
studio - manual policy editor: policy item spacing and overflow hidden on CodeMirror value fields
|
2013-02-20 14:58:19 -05:00 |
|
Brian Talbot
|
c7f5b74225
|
studio - manual policy editor: converting to new page layout and styling
|
2013-02-20 14:46:54 -05:00 |
|
Brian Talbot
|
ad770a5ec8
|
studio - manual policy editor: converting to new page layout - WIP
|
2013-02-20 14:24:13 -05:00 |
|
Brian Talbot
|
453e249f16
|
studio - manual policy editor: converting to new page layout - WIP
|
2013-02-20 13:54:19 -05:00 |
|
cahrens
|
f91060d197
|
Merge branch 'master' into feature/cas/manual-policy
Conflicts:
cms/djangoapps/contentstore/features/common.py
cms/djangoapps/contentstore/features/section.py
cms/djangoapps/contentstore/tests/test_course_settings.py
cms/djangoapps/contentstore/views.py
cms/static/js/models/settings/course_grading_policy.js
cms/static/js/views/settings/main_settings_view.js
cms/static/sass/_settings.scss
cms/templates/settings.html
cms/urls.py
|
2013-02-19 13:27:35 -05:00 |
|
Brian Talbot
|
fca98c19a5
|
studio - adding in info icon to page intro help and making icon classes consistent in all new references
|
2013-02-19 12:13:08 -05:00 |
|
Brian Talbot
|
3c6caa611c
|
resolving local merge
|
2013-02-15 14:24:42 -05:00 |
|
Brian Talbot
|
a5e2b5c53a
|
resolving merge conflict and missing Sass mixin
|
2013-02-15 14:10:52 -05:00 |
|
Brian Talbot
|
9feb810006
|
studio - final prep of introduction areas (with fix for current page content margins)
|
2013-02-14 13:16:10 -05:00 |
|
Brian Talbot
|
c81f958788
|
studio - final prep of introduction areas (with fix for current page content margins)
|
2013-02-14 13:00:14 -05:00 |
|
Brian Talbot
|
9b09d043bd
|
studio - adding introduction areas to all templates and infrastructure for its contnet
|
2013-02-14 12:49:58 -05:00 |
|
Brian Talbot
|
1a1be106ae
|
studio - page headers: added in view live links to course dashboard
|
2013-02-14 10:14:10 -05:00 |
|
Brian Talbot
|
2024f9eeca
|
studio - page headers: added view course button to course outline
|
2013-02-14 09:48:19 -05:00 |
|
Brian Talbot
|
6ade6983ae
|
studio - page headers: added in logic to style page actions' height based on title having a subtitle or not
|
2013-02-14 09:38:32 -05:00 |
|
Brian Talbot
|
ff0b85ed0d
|
studio - manual policy editor: revised CodeMirror string color for JSON fields specifically
|
2013-02-14 09:24:16 -05:00 |
|