Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
5e27bd22
Commit
5e27bd22
authored
Apr 29, 2015
by
Brian Talbot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Studio: removing manual Sass/CSS extend files needed for IE9 and below
parent
89801251
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
99 additions
and
297 deletions
+99
-297
cms/envs/common.py
+0
-24
cms/static/sass/style-app-extend1-rtl.scss
+0
-78
cms/static/sass/style-app-extend1.scss
+0
-78
cms/static/sass/style-app-rtl.scss
+50
-8
cms/static/sass/style-app.scss
+49
-8
cms/static/sass/style-xmodule-rtl.scss
+0
-50
cms/static/sass/style-xmodule.scss
+0
-49
cms/templates/base.html
+0
-2
No files found.
cms/envs/common.py
View file @
5e27bd22
...
...
@@ -465,36 +465,12 @@ PIPELINE_CSS = {
],
'output_filename'
:
'css/cms-style-app.css'
,
},
'style-app-extend1'
:
{
'source_filenames'
:
[
'sass/style-app-extend1.css'
,
],
'output_filename'
:
'css/cms-style-app-extend1.css'
,
},
'style-app-rtl'
:
{
'source_filenames'
:
[
'sass/style-app-rtl.css'
,
],
'output_filename'
:
'css/cms-style-app-rtl.css'
,
},
'style-app-extend1-rtl'
:
{
'source_filenames'
:
[
'sass/style-app-extend1-rtl.css'
,
],
'output_filename'
:
'css/cms-style-app-extend1-rtl.css'
,
},
'style-xmodule'
:
{
'source_filenames'
:
[
'sass/style-xmodule.css'
,
],
'output_filename'
:
'css/cms-style-xmodule.css'
,
},
'style-xmodule-rtl'
:
{
'source_filenames'
:
[
'sass/style-xmodule-rtl.css'
,
],
'output_filename'
:
'css/cms-style-xmodule-rtl.css'
,
},
'style-xmodule-annotations'
:
{
'source_filenames'
:
[
'css/vendor/ova/annotator.css'
,
...
...
cms/static/sass/style-app-extend1-rtl.scss
deleted
100644 → 0
View file @
89801251
// studio - css architecture
// ====================
// Table of Contents
// * +Libs and Resets
// * +Vendor and Rebase
// * +Base - Utilities
// * +Base - Assets
// * +Base - Starter
// * +Base - Elements
// * +Base - Specific Views
// * +Base - Contexts
// +Libs and Resets - *do not edit*
// ====================
@import
'bourbon/bourbon'
;
// lib - bourbon
@import
'vendor/bi-app/bi-app-rtl'
;
// set the layout for right to left languages
// +Vendor and Rebase - *referenced/used vendor presentation and reset*
// ====================
@import
'reset'
;
// +Base - Utilities
// ====================
@import
'variables'
;
@import
'mixins'
;
@import
'mixins-inherited'
;
// +Base - Assets
// ====================
@import
'assets/fonts'
;
@import
'assets/graphics'
;
// sprites, basic image/figure/svg styling
@import
'assets/anims'
;
// animations
// +Base - Starter
// ====================
@import
'base'
;
// +Base - Elements
// ====================
@import
'elements/typography'
;
@import
'elements/pagination'
;
// pagination
@import
'elements/icons'
;
// references to icons used
@import
'elements/controls'
;
// buttons, link styles, sliders, etc.
@import
'elements/xblocks'
;
// studio rendering chrome for xblocks
@import
'elements/modules'
;
// content module patterns
@import
'elements/layout'
;
// various standard layouts
@import
'elements/uploaded-assets'
;
// layout for asset tables
// +Base - Specific Views
// ====================
@import
'views/account'
;
@import
'views/assets'
;
@import
'views/updates'
;
@import
'views/dashboard'
;
@import
'views/export'
;
@import
'views/index'
;
@import
'views/course-create'
;
@import
'views/import'
;
@import
'views/outline'
;
@import
'views/settings'
;
@import
'views/static-pages'
;
@import
'views/unit'
;
@import
'views/container'
;
@import
'views/users'
;
@import
'views/checklists'
;
@import
'views/textbooks'
;
@import
'views/export-git'
;
@import
'views/group-configuration'
;
@import
'views/video-upload'
;
// +Base - Contexts
// ====================
@import
'contexts/ie'
;
// ie-specific rules (mostly for known/older bugs)
@import
'developer'
;
// used for any developer-created scss that needs further polish/refactoring
@import
'shame'
;
// used for any bad-form/orphaned scss
cms/static/sass/style-app-extend1.scss
deleted
100644 → 0
View file @
89801251
// studio - css architecture
// ====================
// Table of Contents
// * +Libs and Resets
// * +Vendor and Rebase
// * +Base - Utilities
// * +Base - Assets
// * +Base - Starter
// * +Base - Elements
// * +Base - Specific Views
// * +Base - Contexts
// +Libs and Resets - *do not edit*
// ====================
@import
'bourbon/bourbon'
;
// lib - bourbon
@import
'vendor/bi-app/bi-app-ltr'
;
// set the layout for left to right languages
// +Vendor and Rebase - *referenced/used vendor presentation and reset*
// ====================
@import
'reset'
;
// +Base - Utilities
// ====================
@import
'variables'
;
@import
'mixins'
;
@import
'mixins-inherited'
;
// +Base - Assets
// ====================
@import
'assets/fonts'
;
@import
'assets/graphics'
;
// sprites, basic image/figure/svg styling
@import
'assets/anims'
;
// animations
// +Base - Starter
// ====================
@import
'base'
;
// +Base - Elements
// ====================
@import
'elements/typography'
;
@import
'elements/pagination'
;
// pagination
@import
'elements/icons'
;
// references to icons used
@import
'elements/controls'
;
// buttons, link styles, sliders, etc.
@import
'elements/xblocks'
;
// studio rendering chrome for xblocks
@import
'elements/modules'
;
// content module patterns
@import
'elements/layout'
;
// various standard layouts
@import
'elements/uploaded-assets'
;
// layout for asset tables
// +Base - Specific Views
// ====================
@import
'views/account'
;
@import
'views/assets'
;
@import
'views/updates'
;
@import
'views/dashboard'
;
@import
'views/export'
;
@import
'views/index'
;
@import
'views/course-create'
;
@import
'views/import'
;
@import
'views/outline'
;
@import
'views/settings'
;
@import
'views/static-pages'
;
@import
'views/unit'
;
@import
'views/container'
;
@import
'views/users'
;
@import
'views/checklists'
;
@import
'views/textbooks'
;
@import
'views/export-git'
;
@import
'views/group-configuration'
;
@import
'views/video-upload'
;
// +Base - Contexts
// ====================
@import
'contexts/ie'
;
// ie-specific rules (mostly for known/older bugs)
@import
'developer'
;
// used for any developer-created scss that needs further polish/refactoring
@import
'shame'
;
// used for any bad-form/orphaned scss
cms/static/sass/style-app-rtl.scss
View file @
5e27bd22
// studio - css architecture
// ====================
// Table of Contents
// Table of Contents
// * +Libs and Resets
// * +Vendor and Rebase
// * +Vendor and Rebase
// * +Base - Utilities
// * +Base - Assets
// * +Base - Starter
// * +Base - Elements
// * +Base - Specific Views
// * +Base - Contexts
// * +Xmodule
// +Libs and Resets - *do not edit*
// ====================
// ====================
@import
'bourbon/bourbon'
;
// lib - bourbon
@import
'vendor/bi-app/bi-app-rtl'
;
// set the layout for right to left languages
// +Vendor and Rebase - *referenced/used vendor presentation and reset*
// ====================
// ====================
@import
'reset'
;
// +Base - Utilities
// ====================
// ====================
@import
'variables'
;
@import
'mixins'
;
@import
'mixins-inherited'
;
// +Base - Assets
// ====================
// ====================
@import
'assets/fonts'
;
@import
'assets/graphics'
;
// sprites, basic image/figure/svg styling
@import
'assets/anims'
;
// animations
// +Base - Starter
// ====================
// ====================
@import
'base'
;
// +Base - Elements
// ====================
// ====================
@import
'elements/typography'
;
@import
'elements/icons'
;
// references to icons used
@import
'elements/controls'
;
// buttons, link styles, sliders, etc.
@import
'elements/pagination'
;
// pagination
@import
'elements/xblocks'
;
// studio rendering chrome for xblocks
@import
'elements/modules'
;
// content module patterns
@import
'elements/navigation'
;
// all archetypes of navigation
@import
'elements/layout'
;
// various standard layouts
...
...
@@ -52,3 +57,40 @@
@import
'elements/modal'
;
// interstitial UI, dialogs, modal windows
@import
'elements/vendor'
;
// overrides to vendor-provided styling
@import
'elements/modal-window'
;
@import
'elements/uploaded-assets'
;
// layout for asset tables
// +Base - Specific Views
// ====================
@import
'views/account'
;
@import
'views/assets'
;
@import
'views/updates'
;
@import
'views/dashboard'
;
@import
'views/export'
;
@import
'views/index'
;
@import
'views/course-create'
;
@import
'views/import'
;
@import
'views/outline'
;
@import
'views/settings'
;
@import
'views/static-pages'
;
@import
'views/unit'
;
@import
'views/container'
;
@import
'views/users'
;
@import
'views/checklists'
;
@import
'views/textbooks'
;
@import
'views/export-git'
;
@import
'views/group-configuration'
;
@import
'views/video-upload'
;
// +Base - Contexts
// ====================
@import
'contexts/ie'
;
// ie-specific rules (mostly for known/older bugs)
// +Xmodule
// ====================
@import
'xmodule/modules/css/module-styles.scss'
;
@import
'xmodule/descriptors/css/module-styles.scss'
;
@import
'elements/xmodules'
;
// styling for Studio-specific contexts
@import
'developer'
;
// used for any developer-created scss that needs further polish/refactoring
@import
'shame'
;
// used for any bad-form/orphaned scss
cms/static/sass/style-app.scss
View file @
5e27bd22
// studio - css architecture
// ====================
// Table of Contents
// Table of Contents
// * +Libs and Resets
// * +Vendor and Rebase
// * +Vendor and Rebase
// * +Base - Utilities
// * +Base - Assets
// * +Base - Starter
// * +Base - Elements
// * +Base - Specific Views
// * +Base - Contexts
// * +Xmodule
// +Libs and Resets - *do not edit*
// ====================
// ====================
@import
'bourbon/bourbon'
;
// lib - bourbon
@import
'vendor/bi-app/bi-app-ltr'
;
// set the layout for left to right languages
// +Vendor and Rebase - *referenced/used vendor presentation and reset*
// ====================
// ====================
@import
'reset'
;
// +Base - Utilities
// ====================
// ====================
@import
'variables'
;
@import
'mixins'
;
@import
'mixins-inherited'
;
// +Base - Assets
// ====================
// ====================
@import
'assets/fonts'
;
@import
'assets/graphics'
;
// sprites, basic image/figure/svg styling
@import
'assets/anims'
;
// animations
// +Base - Starter
// ====================
// ====================
@import
'base'
;
// +Base - Elements
// ====================
// ====================
@import
'elements/typography'
;
@import
'elements/icons'
;
// references to icons used
@import
'elements/controls'
;
// buttons, link styles, sliders, etc.
@import
'elements/pagination'
;
// pagination
@import
'elements/xblocks'
;
// studio rendering chrome for xblocks
@import
'elements/modules'
;
// content module patterns
@import
'elements/navigation'
;
// all archetypes of navigation
@import
'elements/layout'
;
// various standard layouts
...
...
@@ -52,3 +57,39 @@
@import
'elements/modal'
;
// interstitial UI, dialogs, modal windows
@import
'elements/vendor'
;
// overrides to vendor-provided styling
@import
'elements/modal-window'
;
@import
'elements/uploaded-assets'
;
// layout for asset tables
// +Base - Specific Views
// ====================
@import
'views/account'
;
@import
'views/assets'
;
@import
'views/updates'
;
@import
'views/dashboard'
;
@import
'views/export'
;
@import
'views/index'
;
@import
'views/course-create'
;
@import
'views/import'
;
@import
'views/outline'
;
@import
'views/settings'
;
@import
'views/static-pages'
;
@import
'views/unit'
;
@import
'views/container'
;
@import
'views/users'
;
@import
'views/checklists'
;
@import
'views/textbooks'
;
@import
'views/export-git'
;
@import
'views/group-configuration'
;
@import
'views/video-upload'
;
// +Base - Contexts
// ====================
@import
'contexts/ie'
;
// ie-specific rules (mostly for known/older bugs)
// +Xmodule
// ====================
@import
'xmodule/modules/css/module-styles.scss'
;
@import
'xmodule/descriptors/css/module-styles.scss'
;
@import
'elements/xmodules'
;
// styling for Studio-specific contexts
@import
'developer'
;
// used for any developer-created scss that needs further polish/refactoring
@import
'shame'
;
// used for any bad-form/orphaned scss
cms/static/sass/style-xmodule-rtl.scss
deleted
100644 → 0
View file @
89801251
// studio - xmodule architecture
// ====================
// Table of Contents
// * +Libs and Resets
// * +Vendor and Rebase
// * +Base - Utilities
// * +Base - Assets
// * +Base - Starter
// * +Base - Elements
// * +Xmodule
// +Libs and Resets - *do not edit*
// ====================
@import
'bourbon/bourbon'
;
// lib - bourbon
@import
'vendor/bi-app/bi-app-rtl'
;
// set the layout for right to left languages
// +Vendor and Rebase - *referenced/used vendor presentation and reset*
// ====================
@import
'reset'
;
// +Base - Utilities
// ====================
@import
'variables'
;
@import
'mixins'
;
@import
'mixins-inherited'
;
// +Base - Assets
// ====================
@import
'assets/fonts'
;
@import
'assets/graphics'
;
// sprites, basic image/figure/svg styling
@import
'assets/anims'
;
// animations
// +Base - Starter
// ====================
@import
'base'
;
// +Base - Elements
// ====================
@import
'elements/typography'
;
@import
'elements/icons'
;
// references to icons used
@import
'elements/controls'
;
// buttons, link styles, sliders, etc.
@import
'elements/navigation'
;
// all archetypes of navigation
// +Xmodule
// ====================
@import
'xmodule/modules/css/module-styles.scss'
;
@import
'xmodule/descriptors/css/module-styles.scss'
;
@import
'elements/xmodules'
;
// styling for Studio-specific contexts
cms/static/sass/style-xmodule.scss
deleted
100644 → 0
View file @
89801251
// studio - xmodule architecture
// ====================
// Table of Contents
// * +Libs and Resets
// * +Vendor and Rebase
// * +Base - Utilities
// * +Base - Assets
// * +Base - Starter
// * +Base - Elements
// * +Xmodule
// +Libs and Resets - *do not edit*
// ====================
@import
'bourbon/bourbon'
;
// lib - bourbon
@import
'vendor/bi-app/bi-app-ltr'
;
// set the layout for left to right languages
// +Vendor and Rebase - *referenced/used vendor presentation and reset*
// ====================
@import
'reset'
;
// +Base - Utilities
// ====================
@import
'variables'
;
@import
'mixins'
;
@import
'mixins-inherited'
;
// +Base - Assets
// ====================
@import
'assets/fonts'
;
@import
'assets/graphics'
;
// sprites, basic image/figure/svg styling
@import
'assets/anims'
;
// animations
// +Base - Starter
// ====================
@import
'base'
;
// +Base - Elements
// ====================
@import
'elements/typography'
;
@import
'elements/icons'
;
// references to icons used
@import
'elements/controls'
;
// buttons, link styles, sliders, etc.
@import
'elements/navigation'
;
// all archetypes of navigation
// +Xmodule
// ====================
@import
'xmodule/modules/css/module-styles.scss'
;
@import
'xmodule/descriptors/css/module-styles.scss'
;
@import
'elements/xmodules'
;
// styling for Studio-specific contexts
cms/templates/base.html
View file @
5e27bd22
...
...
@@ -37,8 +37,6 @@ import json
<
%
static:css
group=
'style-vendor-tinymce-content'
/>
<
%
static:css
group=
'style-vendor-tinymce-skin'
/>
<
%
static:css
group=
'style-app'
/>
<
%
static:css
group=
'style-app-extend1'
/>
<
%
static:css
group=
'style-xmodule'
/>
<
%
include
file=
"widgets/segment-io.html"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment