Commit Graph

1670 Commits

Author SHA1 Message Date
Jason Bau
2eefa494b1 Width of labels for multiple-choice capa problems = width of text
Stanford got some feedback from our students/faculty that students
were making accidental clicks on radio-button capa questions.
They would click way to the right of the label text, but it would
still select the corresponding input, which caused some students
to make unintentional changes to their answers.  This was because
labels for these inputs were display:block and width:100%

Changing these labels to float:left clear:both should fix it.
2013-06-21 23:46:56 -07:00
Brian Wilson
77032067ac Refactor test_views from test_api. Pull out pending_tasks.js. 2013-06-18 11:19:25 -04:00
Brian Talbot
443a50845a lms - adds back in missing/previously added .sr screen reader-focused styling and references in place of the .visuallyhidden application 2013-06-10 16:22:21 -07:00
Giulio Gratta
7104937fb8 move url() wrapper into SASS variable 2013-06-06 17:54:41 -07:00
Brian Talbot
3775ac61a6 resolves background color syncing for particular page/container wrappers 2013-06-06 11:02:44 -04:00
Frances Botsford
6a2eedbf99 updated misused sass body-bg to container-bg variableon account and course views 2013-06-06 11:02:44 -04:00
Brian Talbot
0b62ec7d8d theming - revised variables and link/button styling to account for edX's registration and login constrast/styling changes 2013-06-05 10:56:26 -07:00
Brian Talbot
e9d4749877 theming - resolves some variable defintions to help with edX theme 2013-06-05 10:56:25 -07:00
Brian Talbot
110899620f edx.org - revises new register/login banner image variable paths to resolve a Sass rendering issue 2013-06-05 10:56:25 -07:00
Giulio Gratta
268524597c fix a few text weights and moved ugly mixins to mixin file and implemented in shame file 2013-06-05 10:56:25 -07:00
Giulio Gratta
27fce3e473 SASS diff from stanford themed branch for master 2013-06-05 10:56:25 -07:00
Nate Hardison
e0590c356b Rewrite the main course.scss file as well
Just as is done with the main LMS application.scss file, rewrite the
course.scss file with Mako to conditionally import a theme's
variables overrides. Add the course.scss file to the list of ignored
Git files so that it doesn't keep getting committed over and over
again.

This also requires us to add a hardcoded line in the assets Rakefile
for the moment, so that the course.scss.mako file gets properly
preprocessed. Once the preprocessing is done by a Django management
command, we won't have to do this anymore.
2013-06-05 10:27:26 -07:00
Nate Hardison
c7f56cf456 Move theme import right after variables import
Since the theme Sass is just a simple variables overrides (for the
moment), it must be imported right after the default variables Sass
file (if at all). At the bottom of the file, it has no effect.
2013-06-05 10:27:25 -07:00
Brian Talbot
f34b131678 lms - revises the physical height of the edX logo within the slim-sized header and vertically aligns all elements 2013-06-04 14:46:01 -04:00
Brian Talbot
e4cc0dfdba edx.org - revises login and register graphical banner images to include higher contrast between type and imagery 2013-06-04 10:45:42 -04:00
Brian Talbot
aa8f73ffb4 edx.org - revises base blue and color references to adhere to WCAG color contrast guidelines 2013-06-04 09:37:21 -04:00
Victor Shnayder
1d8e46f01c Merge pull request #13 from edx/victor/help-button-text
Change help button text, fixing LMS-319
2013-06-02 20:47:45 -07:00
Frances Botsford
92e159ea37 text and style adjustments to help button modal 2013-05-31 14:31:16 -04:00
marco
290d049c29 Merge branch 'feature/christina/metadata-ui' of https://github.com/edx/edx-platform into feature/christina/metadata-ui 2013-05-31 12:41:13 -04:00
marco
72e1fab1c4 SASS variable and naming standards sync-up based on @talbs feedback completed 2013-05-31 12:40:40 -04:00
David Baumgold
bdc9570cd1 Removed Symbolset font files 2013-05-30 16:09:17 -04:00
marcotuts
ab18953eec Merge pull request #2020 from edx/ux/marco/forums-icons
updated pinning icons
2013-05-28 11:22:13 -07:00
Giulio Gratta
186da0d5fe fix user button/dropdown spacing/scrolling issue 2013-05-28 10:49:58 -07:00
Brian Talbot
25305dc8f7 lms/mktg - removes margins from social icons and reinstates flex-gutter margin to colophon area of footer 2013-05-28 13:44:16 -04:00
Brian Talbot
ef6c365ca0 lms/mktg - revises paragraph in colophon portion of footer to match footer's flex-grid value 2013-05-28 13:36:47 -04:00
Giulio Gratta
8d7b46b51b fix footer element spacing issues 2013-05-28 10:15:39 -07:00
Giulio Gratta
538ffe6fbe fixing video-bg-image and homepage-bg-image urls 2013-05-23 11:04:24 -07:00
Giulio Gratta
566a8b3823 fix bad css and clean up after rebase/merge 2013-05-23 09:44:42 -07:00
Giulio Gratta
93258c548f fixed hardcoded changes left over from parent theme branch backport 2013-05-23 09:44:41 -07:00
Giulio Gratta
3dd5733cee first round of color replacements with variables 2013-05-23 09:44:40 -07:00
Nate Hardison
f826198214 Use "is not None" convention 2013-05-22 19:34:14 -07:00
Nate Hardison
a0b6a176f2 Use .get instead of [] to access env hash
If the `THEME_NAME` environment token isn't defined, then the
application.scss.mako file will crash during preprocessing. Use
.get to avoid a crash.
2013-05-22 14:49:22 -07:00
Nate Hardison
ea3506d2b9 Add general theming capabilities
This commit adds the requisite settings and startup features to
enable integration of themes into the edX platform. It does not
yet provide hooks in any of the templates, but it does cause the
main `lms/static/sass/application.scss` file to `@import` a theme's
base Sass. Template hooks will come down the road.

CHANGELOG
---------
Define a new `MITX_FEATURE`, `USE_CUSTOM_THEME`, that when enabled,
can be used in templates to determine whether or not custom theme
templates should be used instead of the defaults.

Also define a new setting, `THEME_NAME`, which will be used to
locate theme-specific files. Establish the convention that themes
will be stored outside of the `REPO_ROOT`, inside the `ENV_ROOT`,
in a directory named `themes/`. `themes/<THEME_NAME>` will store
the files for a particular theme.

Provide a function, `enable_theme`, that modifies the template and
static asset load paths appropriately to include the theme's files.

Move the main LMS Sass file to a Mako template that conditionally
`@import`s the theme's base Sass file when a theme is enabled.

Add logic to the assets Rakefile to properly preprocess any Sass/
Mako templates before compiling them.
2013-05-22 12:22:27 -07:00
marco
c8d30b1cfe Merge branch 'master' into ux/marco/forums-icons 2013-05-22 12:59:19 -04:00
Greg Price
de5b4d7d27 Merge branch 'master' into drupal-new 2013-05-17 16:10:56 -04:00
Greg Price
db3189d5ad Disable marketing registration button for courses that user cannot enroll in 2013-05-17 14:10:04 -04:00
Kevin Chugh
ef3204da69 Merge pull request #2059 from edx/feature/zoldak/forum-testing
Feature/zoldak/forum testing
2013-05-17 10:10:55 -07:00
Diana Huang
1c2175304e Merge branch 'master' into drupal-new 2013-05-16 16:27:36 -04:00
Greg Price
b8d2276de7 Remove dashboard links for unstarted courses
If a course is not started, the course image and title on the dashboard link
to the course about page. Because the LMS course about pages do not exist
(i.e. 404) with the marketing site enabled, we simply do not use a link if
the course has not started.
2013-05-16 15:06:48 -04:00
Greg Price
ff2ba68d79 Tweak behavior of registration button for marketing site
If a user is already registered for a course but the course has not started
yet, display a grey button that says "you are registered" and goes nowhere
instead of the blue "access courseware" button, which goes to the LMS course
about page (which 404s).
2013-05-16 15:06:48 -04:00
Arthur Barrett
adcd1dd886 update annotator.min.css with change to fix adder button and serve the minified one. 2013-05-16 14:48:06 -04:00
Arthur Barrett
52e5fe223c update annotator.js library and fix the annotator-adder button hover state in courseware. 2013-05-16 14:27:21 -04:00
marco
71be3debc4 updated flagging icons to not use other libraries 2013-05-16 10:56:58 -04:00
marco
33e8621af6 cursor state for discussions (not inline) span text needed to be set to pointer 2013-05-16 10:29:34 -04:00
marco
495cd305d4 adjusted cursor for span label on pins to be default 2013-05-16 10:29:34 -04:00
Your Name
e2d3aee768 styling inline flaggin 2013-05-16 10:29:34 -04:00
marco
65dbd3cf73 padding around icons for flags and pins 2013-05-16 10:29:34 -04:00
marco
0a43c0ff59 minor css tweaks to flag and pin icons 2013-05-16 10:29:34 -04:00
Your Name
78097c7ee1 update css for better cursor on pinning and flagging 2013-05-16 10:29:33 -04:00
Jay Zoldak
ed5ad46192 Revert "Revert "fix merge conflict""
This reverts commit 2df3fe9344.

Conflicts:
	common/static/coffee/src/discussion/utils.coffee
2013-05-16 10:29:33 -04:00