From 2899885711cd03bbef1301607fd78a2250250269 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 13 May 2015 21:26:46 -0400
Subject: [PATCH 1/3] LMS: renaming Sass/CSS files for consistency and clarity

---
 .gitignore                                    |  8 ++--
 lms/envs/common.py                            | 40 +++++++++----------
 lms/static/.gitignore                         |  2 +-
 lms/static/sass/_build-course.scss            |  2 +-
 lms/static/sass/_build-lms.scss               |  2 +-
 ...rtl.scss.mako => lms-course-rtl.scss.mako} |  0
 ...{course.scss.mako => lms-course.scss.mako} |  0
 ...n-rtl.scss.mako => lms-main-rtl.scss.mako} |  0
 ...plication.scss.mako => lms-main.scss.mako} |  0
 lms/templates/main.html                       |  2 +-
 lms/templates/main_django.html                |  2 +-
 lms/templates/mktg_iframe.html                |  2 +-
 12 files changed, 30 insertions(+), 30 deletions(-)
 rename lms/static/sass/{course-rtl.scss.mako => lms-course-rtl.scss.mako} (100%)
 rename lms/static/sass/{course.scss.mako => lms-course.scss.mako} (100%)
 rename lms/static/sass/{application-rtl.scss.mako => lms-main-rtl.scss.mako} (100%)
 rename lms/static/sass/{application.scss.mako => lms-main.scss.mako} (100%)

diff --git a/.gitignore b/.gitignore
index b6866e736a..8f474c1974 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,10 +74,10 @@ bin/
 lms/static/css/
 lms/static/sass/*.css
 lms/static/sass/*.css.map
-lms/static/sass/application.scss
-lms/static/sass/application-rtl.scss
-lms/static/sass/course.scss
-lms/static/sass/course-rtl.scss
+lms/static/sass/lms-main.scss
+lms/static/sass/lms-main-rtl.scss
+lms/static/sass/lms-course.scss
+lms/static/sass/lms-course-rtl.scss
 cms/static/css/
 cms/static/sass/*.css
 cms/static/sass/*.css.map
diff --git a/lms/envs/common.py b/lms/envs/common.py
index c9559c3c85..3a31afbb7b 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1269,19 +1269,19 @@ PIPELINE_CSS = {
         ],
         'output_filename': 'css/lms-style-vendor-tinymce-skin.css',
     },
-    'style-app': {
+    'style-main': {
         'source_filenames': [
-            'sass/application.css',
+            'sass/lms-main.css',
             'sass/ie.css'
         ],
-        'output_filename': 'css/lms-style-app.css',
+        'output_filename': 'css/lms-main.css',
     },
-    'style-app-rtl': {
+    'style-main-rtl': {
         'source_filenames': [
-            'sass/application-rtl.css',
+            'sass/lms-main-rtl.css',
             'sass/ie-rtl.css'
         ],
-        'output_filename': 'css/lms-style-app-rtl.css',
+        'output_filename': 'css/lms-main-rtl.css',
     },
     'style-course-vendor': {
         'source_filenames': [
@@ -1291,26 +1291,26 @@ PIPELINE_CSS = {
         ],
         'output_filename': 'css/lms-style-course-vendor.css',
     },
+    'style-course': {
+        'source_filenames': [
+            'sass/lms-course.css',
+            'xmodule/modules.css',
+        ],
+        'output_filename': 'css/lms-course.css',
+    },
+    'style-course-rtl': {
+        'source_filenames': [
+            'sass/lms-course-rtl.css',
+            'xmodule/modules.css',
+        ],
+        'output_filename': 'css/lms-course-rtl.css',
+    },
     'style-student-notes': {
         'source_filenames': [
             'css/vendor/edxnotes/annotator.min.css',
         ],
         'output_filename': 'css/lms-style-student-notes.css',
     },
-    'style-course': {
-        'source_filenames': [
-            'sass/course.css',
-            'xmodule/modules.css',
-        ],
-        'output_filename': 'css/lms-style-course.css',
-    },
-    'style-course-rtl': {
-        'source_filenames': [
-            'sass/course-rtl.css',
-            'xmodule/modules.css',
-        ],
-        'output_filename': 'css/lms-style-course-rtl.css',
-    },
     'style-xmodule-annotations': {
         'source_filenames': [
             'css/vendor/ova/annotator.css',
diff --git a/lms/static/.gitignore b/lms/static/.gitignore
index afc42d5e7e..611e597b89 100644
--- a/lms/static/.gitignore
+++ b/lms/static/.gitignore
@@ -4,6 +4,6 @@
 *.swp
 *.orig
 *.DS_Store
-application.css
+style-main.css
 ie.css
 Gemfile.lock
diff --git a/lms/static/sass/_build-course.scss b/lms/static/sass/_build-course.scss
index cc8d3b0cbf..1f7fd8b926 100644
--- a/lms/static/sass/_build-course.scss
+++ b/lms/static/sass/_build-course.scss
@@ -1,7 +1,7 @@
 // ------------------------------
 // LMS Courseware: Shared Build Compile
 
-// About: Sass compile for the LMS Courseware Elements that are shared between LTR and RTL UI. Configuration and vendor specific imports happen before this shared set of imports are compiled in the main-*.scss files.
+// About: Sass compile for the LMS Courseware Elements that are shared between LTR and RTL UI. Configuration and vendor specific imports happen before this shared set of imports are compiled in the lms-course-*.scss files.
 
 @import 'base/base';
 @import 'base/extends';
diff --git a/lms/static/sass/_build-lms.scss b/lms/static/sass/_build-lms.scss
index 0995a1325c..dde9242f6c 100644
--- a/lms/static/sass/_build-lms.scss
+++ b/lms/static/sass/_build-lms.scss
@@ -1,7 +1,7 @@
 // ------------------------------
 // LMS: Shared Build Compile
 
-// About: Sass compile for the LMS Elements that are shared between LTR and RTL UI. Configuration and vendor specific imports happen before this shared set of imports are compiled in the main-*.scss files.
+// About: Sass compile for the LMS Elements that are shared between LTR and RTL UI. Configuration and vendor specific imports happen before this shared set of imports are compiled in the lms-main-*.scss files.
 
 // base - assets
 @import 'base/font_face';
diff --git a/lms/static/sass/course-rtl.scss.mako b/lms/static/sass/lms-course-rtl.scss.mako
similarity index 100%
rename from lms/static/sass/course-rtl.scss.mako
rename to lms/static/sass/lms-course-rtl.scss.mako
diff --git a/lms/static/sass/course.scss.mako b/lms/static/sass/lms-course.scss.mako
similarity index 100%
rename from lms/static/sass/course.scss.mako
rename to lms/static/sass/lms-course.scss.mako
diff --git a/lms/static/sass/application-rtl.scss.mako b/lms/static/sass/lms-main-rtl.scss.mako
similarity index 100%
rename from lms/static/sass/application-rtl.scss.mako
rename to lms/static/sass/lms-main-rtl.scss.mako
diff --git a/lms/static/sass/application.scss.mako b/lms/static/sass/lms-main.scss.mako
similarity index 100%
rename from lms/static/sass/application.scss.mako
rename to lms/static/sass/lms-main.scss.mako
diff --git a/lms/templates/main.html b/lms/templates/main.html
index 9dd5b4e310..438d243aea 100644
--- a/lms/templates/main.html
+++ b/lms/templates/main.html
@@ -65,7 +65,7 @@
   <link rel="icon" type="image/x-icon" href="${static.url(microsite.get_value('favicon_path', settings.FAVICON_PATH))}" />
 
   <%static:css group='style-vendor'/>
-  <%static:css group='style-app'/>
+  <%static:css group='style-main'/>
 
   % if disable_courseware_js:
     <%static:js group='base_vendor'/>
diff --git a/lms/templates/main_django.html b/lms/templates/main_django.html
index ae85eb2226..bf8736211f 100644
--- a/lms/templates/main_django.html
+++ b/lms/templates/main_django.html
@@ -8,7 +8,7 @@
  <link rel="icon" type="image/x-icon" href="{% favicon_path %}" />
 
   {% compressed_css 'style-vendor' %}
-  {% compressed_css 'style-app' %}
+  {% compressed_css 'style-main' %}
   {% compressed_css 'style-course-vendor' %}
   {% compressed_css 'style-course' %}
 
diff --git a/lms/templates/mktg_iframe.html b/lms/templates/mktg_iframe.html
index b6359f89dc..0ed7567447 100644
--- a/lms/templates/mktg_iframe.html
+++ b/lms/templates/mktg_iframe.html
@@ -12,7 +12,7 @@
   <meta name="google-site-verification" content="_mipQ4AtZQDNmbtOkwehQDOgCxUUV2fb_C0b6wbiRHY" />
 
   <%static:css group='style-vendor'/>
-  <%static:css group='style-app'/>
+  <%static:css group='style-main'/>
   <%static:js group='base_vendor'/>
 
   <!--[if lt IE 9]>

From d09d0a2c36d3986f45e17f7d8f521f73a7776fc8 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 13 May 2015 21:46:39 -0400
Subject: [PATCH 2/3] Studio: renaming Sass/CSS files for consistency and
 clarity

---
 cms/envs/common.py                                   | 12 ++++++------
 cms/static/sass/_build.scss                          |  2 +-
 .../{style-app-rtl.scss => studio-main-rtl.scss}     |  0
 cms/static/sass/{style-app.scss => studio-main.scss} |  0
 cms/templates/base.html                              |  2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename cms/static/sass/{style-app-rtl.scss => studio-main-rtl.scss} (100%)
 rename cms/static/sass/{style-app.scss => studio-main.scss} (100%)

diff --git a/cms/envs/common.py b/cms/envs/common.py
index ddf9fe9801..78d6e7bf35 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -459,17 +459,17 @@ PIPELINE_CSS = {
         ],
         'output_filename': 'css/cms-style-vendor-tinymce-skin.css',
     },
-    'style-app': {
+    'style-main': {
         'source_filenames': [
-            'sass/style-app.css',
+            'sass/studio-main.css',
         ],
-        'output_filename': 'css/cms-style-app.css',
+        'output_filename': 'css/studio-main.css',
     },
-    'style-app-rtl': {
+    'style-main-rtl': {
         'source_filenames': [
-            'sass/style-app-rtl.css',
+            'sass/studio-main-rtl.css',
         ],
-        'output_filename': 'css/cms-style-app-rtl.css',
+        'output_filename': 'css/studio-main-rtl.css',
     },
     'style-xmodule-annotations': {
         'source_filenames': [
diff --git a/cms/static/sass/_build.scss b/cms/static/sass/_build.scss
index 34b778e4b8..2ecf8085b2 100644
--- a/cms/static/sass/_build.scss
+++ b/cms/static/sass/_build.scss
@@ -1,7 +1,7 @@
 // ------------------------------
 // Studio: Shared Build Compile
 
-// About: Sass compile for Studio that are shared between LTR and RTL UI. Configuration and vendor specific imports happen before this shared set of imports are compiled in the style-app-*.scss files.
+// About: Sass compile for Studio that are shared between LTR and RTL UI. Configuration and vendor specific imports happen before this shared set of imports are compiled in the studio-main-*.scss files.
 
 // +Vendor and Rebase - *referenced/used vendor presentation and reset*
 // ====================
diff --git a/cms/static/sass/style-app-rtl.scss b/cms/static/sass/studio-main-rtl.scss
similarity index 100%
rename from cms/static/sass/style-app-rtl.scss
rename to cms/static/sass/studio-main-rtl.scss
diff --git a/cms/static/sass/style-app.scss b/cms/static/sass/studio-main.scss
similarity index 100%
rename from cms/static/sass/style-app.scss
rename to cms/static/sass/studio-main.scss
diff --git a/cms/templates/base.html b/cms/templates/base.html
index 049450ca09..c9f1d3d549 100644
--- a/cms/templates/base.html
+++ b/cms/templates/base.html
@@ -36,7 +36,7 @@ import json
     <%static:css group='style-vendor'/>
     <%static:css group='style-vendor-tinymce-content'/>
     <%static:css group='style-vendor-tinymce-skin'/>
-    <%static:css group='style-app'/>
+    <%static:css group='style-main'/>
 
     <%include file="widgets/segment-io.html" />
 

From c043e8dcf76b2d78abdeaa3264f440ca2db81c65 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 13 May 2015 22:04:52 -0400
Subject: [PATCH 3/3] LMS: removing now unnecessary IE-specific _ie.scss Sass
 partial

* since IE9 and below are formally not supported any longer
* since most of the CSS rules are for UI that has been removed or that is supported by modern browsers
---
 lms/envs/common.py      |   2 -
 lms/static/sass/ie.scss | 199 ----------------------------------------
 2 files changed, 201 deletions(-)
 delete mode 100644 lms/static/sass/ie.scss

diff --git a/lms/envs/common.py b/lms/envs/common.py
index 3a31afbb7b..b4a9099b06 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1272,14 +1272,12 @@ PIPELINE_CSS = {
     'style-main': {
         'source_filenames': [
             'sass/lms-main.css',
-            'sass/ie.css'
         ],
         'output_filename': 'css/lms-main.css',
     },
     'style-main-rtl': {
         'source_filenames': [
             'sass/lms-main-rtl.css',
-            'sass/ie-rtl.css'
         ],
         'output_filename': 'css/lms-main-rtl.css',
     },
diff --git a/lms/static/sass/ie.scss b/lms/static/sass/ie.scss
deleted file mode 100644
index b4acb8dfa1..0000000000
--- a/lms/static/sass/ie.scss
+++ /dev/null
@@ -1,199 +0,0 @@
-@import "bourbon/bourbon";
-@import "base/variables";
-
-// These are all quick solutions for IE please rewrite
-.ie {
-
-  //Make overlay white because ie doesn't like rgba
-  .highlighted-courses .courses .course header.course-preview, .find-courses .courses .course header.course-preview,
-  .home .highlighted-courses > h2, .home .highlighted-courses > section.outside-app h1, section.outside-app .home .highlighted-courses > h1,
-  header.global {
-    background: $white;
-  }
-
-  // hide all actions
-  .home > header .title .actions,
-  .home > header .title:hover .actions,
-  .home > header .title:focus .actions {
-    display: none;
-    height: auto;
-  }
-
-  .home > header .title {
-    &:hover, &:focus {
-
-      > hgroup {
-        h1 {
-          border-bottom: 0;
-          padding-bottom: 0;
-        }
-
-        h2 {
-          opacity: 1.0;
-        }
-      }
-
-      .actions {
-        opacity: 0;
-      }
-    }
-  }
-
-  // because ie doesn't like :last
-  .last {
-    margin-right: 0  !important;
-  }
-
-  // make partners not animate
-  .home .university-partners .partners a {
-    .name {
-      position: static;
-    }
-
-    &:hover, &:focus {
-      text-decoration: none;
-
-      &::before {
-        opacity: 1.0;
-      }
-
-      .name {
-        bottom: 0px;
-      }
-
-      img {
-        top: 0px;
-      }
-    }
-
-  }
-
-  .home .university-partners .partners {
-    width: 660px;
-
-    li.partner {
-      float: left;
-      display: block;
-      padding: 0;
-      width: 220px;
-      overflow: hidden;
-    }
-  }
-
-  // make animations on homepage not animate and show everything
-  .highlighted-courses .courses .course, .find-courses .courses .course {
-    .meta-info {
-      display: none;
-    }
-
-    .inner-wrapper {
-      height: 100%;
-      overflow: visible;
-      position: relative;
-    }
-
-    header.course-preview {
-      left: 0px;
-      position: relative;
-      top: 0px;
-      width: 100%;
-      z-index: 3;
-      height: auto;
-
-      hgroup {
-        position: relative;
-        right: 0;
-        top: 0;
-      }
-
-    }
-
-    .info {
-      height: auto;
-      position: static;
-      overflow: visible;
-
-      .desc {
-        height: auto;
-      }
-    }
-
-    &:hover, &:focus {
-      background: rgb(245,245,245);
-      border-color: rgb(170,170,170);
-      box-shadow: 0 1px 16px 0 rgba($blue, 0.4);
-
-      .info {
-        top: 0;
-      }
-
-      .meta-info {
-        opacity: 0;
-      }
-    }
-  }
-
-  // make overlay flat black since IE cant handle rgba
-  #lean_overlay {
-    background: $black;
-  }
-
-  // active navigation
-  nav.wrapper-course-material ol.course-tabs li a.active, nav.wrapper-course-material .xmodule_SequenceModule nav.sequence-nav ol.course-tabs li a.seq_video.active, .xmodule_SequenceModule nav.sequence-nav nav.wrapper-course-material ol.course-tabs li a.seq_video.active {
-    background-color: #333;
-    background-color: rgba(0, 0, 0, .4);
-  }
-
-  // make dropdown user consistent size
-  header.global ol.user > li.primary a.dropdown {
-    padding-top: 6px;
-    padding-bottom: 6px;
-  }
-
-  // always hide arrow in IE
-  .dashboard .my-courses .my-course .cover .arrow {
-    display: none;
-  }
-
-  div.course-wrapper {
-    display: block !important;
-
-    section.course-content,
-    div.course-index {
-      display: block !important;
-      float: left;
-    }
-
-    section.course-content {
-      width: 71.27%;
-    }
-  }
-
-  .sidebar {
-    float: left !important;
-    display: block !important;
-  }
-
-  .sequence-nav ol {
-    display: block !important;
-
-    li {
-      float: left !important;
-      width: 50px;
-    }
-  }
-
-  .course-wrapper {
-    @include clearfix();
-  }
-}
-
-// ====================
-
-// CASE: IE9
-.lte9 {
-
-  .ie-banner {
-    display: block !important;
-  }
-}