ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup some sass files 

this does the following:

* renames some sass files to put a "_"
at the beginning of their filenames so they are
used as a sass partial.

* fixes some bad css syntax

* doesn't include all of "common" in the "styleguide"
  bundle, and instead loads "common" seperately
  on the styleguide page

* removes "canvas_icons" from conversations bundle
  since it is already included in "common"

this is all to get ready for the new sass system

test plan:
nothing actually changes.
load /styleguide, make sure it looks right
load conversations, make sure it looks right

Change-Id: Ief7613b0b2edbb0ba63d961c20e250aafe695cdd
Reviewed-on: https://gerrit.instructure.com/54804
Tested-by: Jenkins
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
This commit is contained in:
Ryan Shaw 2015-05-20 10:29:56 -06:00
parent 4f5870124d
commit ae7a7b6826
15 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
app/stylesheets/brand_variables.scss → app/stylesheets/_brand_variables.scss
View File

2
app/stylesheets/base/_custom_mediaelementplayer.scss
View File

@ -42,7 +42,7 @@ div.mejs-speed-button {
left: -10px;
width: 60px;
height: 100px;
background: url(background.png);
background: url("/images/mediaelement/background.png");
background: rgba(50, 50, 50, 0.7);
border: solid 1px transparent;
padding: 0;

0
app/stylesheets/base/module_sequence_footer.scss → app/stylesheets/base/_module_sequence_footer.scss
View File

1
app/stylesheets/bundles/conversations_new.scss
View File

@ -1,5 +1,4 @@
@import "base/environment";
@import "vendor/_simlink-to-public_javascripts_vendor_bootstrap-select_bootstrap-select.css.scss";
@import "components/_canvas-icons.scss";
@import "pages/conversations/conversations_new";
@import "pages/conversations/compose_message_dialog";

8
app/stylesheets/bundles/mobile_auth.scss
View File

@ -14,13 +14,13 @@ html {
margin: 0;
padding: 0;
background-color: black;
background: url('/images/Money_Noise_tm.png?1348625397'),
background: url('/images/Money_Noise_tm.png'),
-webkit-gradient(radial, 50% 0px, 0, 50% 0px, 0, color-stop(0%, rgba(255, 255, 255, 0.4)), color-stop(100%, transparent)),
-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #2B2B2B), color-stop(100%, black));
background: url('/images/Money_Noise_tm.png?1348625397'),
background: url('/images/Money_Noise_tm.png'),
-webkit-radial-gradient(50% 0px, circle cover, rgba(255, 255, 255, 0.4) 0%, transparent 100%),
-webkit-linear-gradient(top, #2B2B2B, black);
background: url('/images/Money_Noise_tm.png?1348625397'),
background: url('/images/Money_Noise_tm.png'),
radial-gradient(50% -100px, circle cover, rgba(255, 255, 255, 0.6) 0%, transparent 100%),
linear-gradient(to bottom, #2B2B2B, black);
min-height: 420px; /* this is a workaround to be high enough on an iphone */
@ -39,7 +39,7 @@ html {
width: 300px;
height: 198px;
z-index: 1;
background-image: url("/images/canvas_logo_for_mobile_login.png?1");
background-image: url("/images/canvas_logo_for_mobile_login.png");
background-position: center 30px;
background-repeat: no-repeat;
background-size: 270px 48px;

2
app/stylesheets/bundles/styleguide.scss
View File

@ -1,4 +1,4 @@
@import "bundles/common.scss";
@import "base/environment";
//// Stylesheet compiler list
////////

42
app/stylesheets/components/_inst_tree.scss
View File

@ -26,18 +26,18 @@ ul.instTree {
font-size: 2px;
}
&.node {
background-image: image-url("mimeClassIcons/folder.svg");
background-image: url("/images/mimeClassIcons/folder.svg");
&.collaborations {
background-image: image-url("collaboration_folder.png");
background-image: url("/images/collaboration_folder.png");
}
&.groups {
background-image: image-url("groups_folder.png");
background-image: url("/images/groups_folder.png");
}
// &.open
}
&.leaf {
background-image: image-url("mimeClassIcons/file.svg");
background-image: url("/images/mimeClassIcons/file.svg");
&:hover {
background-color: #eee;
}
@ -71,10 +71,10 @@ ul.instTree {
left: -4px;
top: 0;
&.plus {
background: image-url("inst_tree/plus.gif") 5px 50% no-repeat;
background: url("/images/inst_tree/plus.gif") 5px 50% no-repeat;
}
&.minus {
background: image-url("inst_tree/minus.gif") 5px 50% no-repeat;
background: url("/images/inst_tree/minus.gif") 5px 50% no-repeat;
}
}
}
@ -93,56 +93,56 @@ ul.instTree {
z-index: 1000;
position: absolute;
&.node {
background: #C3E1FF image-url("inst_tree/node-drag.gif") left 3px no-repeat;
background: #C3E1FF url("/images/inst_tree/node-drag.gif") left 3px no-repeat;
}
&.leaf {
background: #C3E1FF image-url("inst_tree/leaf-drag.gif") left 3px no-repeat;
background: #C3E1FF url("/images/inst_tree/leaf-drag.gif") left 3px no-repeat;
}
}
ul.instTree {
li.separator.dd-hover {
background: transparent image-url("inst_tree/separator-drag.gif") 3px 1px no-repeat;
background: transparent url("/images/inst_tree/separator-drag.gif") 3px 1px no-repeat;
}
li.leaf {
&.dd-hover {
background-color: yellow;
}
&.pdf {
background-image: image-url("mimeClassIcons/pdf.svg");
background-image: url("/images/mimeClassIcons/pdf.svg");
}
&.image, &.jpeg, &.jpg, &.png, &.svg {
background-image: image-url("mimeClassIcons/image.svg");
background-image: url("/images/mimeClassIcons/image.svg");
}
&.xls, &.xlsx, &.spreadsheet {
background-image: image-url("mimeClassIcons/xls.svg");
background-image: url("/images/mimeClassIcons/xls.svg");
}
&.word, &.doc, &.docx {
background-image: image-url("mimeClassIcons/doc.svg");
background-image: url("/images/mimeClassIcons/doc.svg");
}
&.ppt, &.pptx {
background-image: image-url("mimeClassIcons/ppt.svg");
background-image: url("/images/mimeClassIcons/ppt.svg");
}
&.audio {
background-image: image-url("mimeClassIcons/audio.svg");
background-image: url("/images/mimeClassIcons/audio.svg");
}
&.zip {
background-image: image-url("mimeClassIcons/zip.svg");
background-image: url("/images/mimeClassIcons/zip.svg");
}
&.video {
background-image: image-url("mimeClassIcons/video.svg");
background-image: url("/images/mimeClassIcons/video.svg");
}
&.html {
background-image: image-url("mimeClassIcons/html.svg");
background-image: url("/images/mimeClassIcons/html.svg");
}
&.google_docs {
background-image: image-url("google_docs_icon.ico");
background-image: url("/images/google_docs_icon.ico");
}
&.etherpad {
background-image: image-url("etherpad_icon.ico");
background-image: url("/images/etherpad_icon.ico");
}
&.loading {
background-image: image-url("ajax-loader-small.gif");
background-image: url("/images/ajax-loader-small.gif");
}
}
}

8
app/stylesheets/jst/tinymce/EquationEditorView.scss
View File

@ -9,12 +9,12 @@
@font-face {
font-family: Symbola;
src: url(/font/Symbola.eot?v1);
src: url(/font/Symbola.eot);
src: local("Symbola Regular"),
local("Symbola"),
url(/font/Symbola.ttf?v1) format("truetype"),
url(/font/Symbola.otf?v1) format("opentype"),
url(/font/Symbola.svg?v1#webfont7MzkO3xs) format("svg");
url(/font/Symbola.ttf) format("truetype"),
url(/font/Symbola.otf) format("opentype"),
url(/font/Symbola.svg#webfont7MzkO3xs) format("svg");
}
div.math-dialog > span {

0
app/stylesheets/pages/turnitin.scss → app/stylesheets/pages/_turnitin.scss
View File

0
app/stylesheets/pages/wiki_animations.scss → app/stylesheets/pages/_wiki_animations.scss
View File

0
app/stylesheets/pages/gradebook2/grade_passback.scss → app/stylesheets/pages/gradebook2/_grade_passback.scss
View File

0
app/stylesheets/utilities/c-modal-form.scss → app/stylesheets/utilities/_c-modal-form.scss
View File

1
app/stylesheets/vendor/jqueryui/_jquery.ui.menu.scss vendored
View File

@ -91,7 +91,6 @@ $kyle-menu-carat-size: 8px;
border: 1px solid $ic-border-light;
box-shadow: 0px 0px 6px rgba(black, 0.1);
background-color: $ic-color-light;
min-width:
}
@else {
background-color: $kyle-menu-bg-color;

1
doc/styleguide/template.mustache
View File

@ -1,4 +1,5 @@
<!-- this file is autogenerated from doc/styleguide/template.mustache -->
<% jammit_css :common %>
<% jammit_css :styleguide %>
<% js_bundle :styleguide %>

3
public/font/icons/_canvas-icons.scss
View File

@ -294,8 +294,7 @@ Either use `<a>` with icon desired icon class added or insert `<i>` inside `<but
src: url('/font/canvas/canvas-icons.eot');
src: url('/font/canvas/canvas-icons.eot?#iefix') format('embedded-opentype'),
url('/font/canvas/canvas-icons.woff') format('woff'),
url('/font/canvas/canvas-icons.ttf') format('truetype'),
url('/font/canvas/canvas-webfont.svg#canvasregular') format('svg');
url('/font/canvas/canvas-icons.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}