Skip to content

Commit

Permalink
More Sass quality fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
andy-armstrong committed Oct 16, 2017
1 parent 6387e3a commit bd1a0d9
Show file tree
Hide file tree
Showing 78 changed files with 1,785 additions and 1,557 deletions.
2 changes: 2 additions & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
common/lib/xmodule/xmodule/css
common/static/sass/bourbon
common/static/xmodule/modules/css
lms/static/sass/vendor
22 changes: 19 additions & 3 deletions common/lib/xmodule/xmodule/css/annotatable/display.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,18 @@ $annotatable--body-font-size: em(14);
border-radius: 0.5em;
margin-bottom: 0.5em;

&.shaded { background-color: #EDEDED; }
&.shaded { background-color: #ededed; }

.annotatable-section-title {
font-weight: bold;
a { font-weight: normal; }
}

.annotatable-section-body {
border-top: 1px solid $annotatable--border-color;
margin-top: 0.5em;
padding-top: 0.5em;

@include clearfix();
}

Expand All @@ -40,6 +42,7 @@ $annotatable--body-font-size: em(14);
margin-left: 4em;
b { font-weight: bold; }
i { font-style: italic; }

code {
display: inline;
white-space: pre;
Expand All @@ -58,9 +61,11 @@ $annotatable--body-font-size: em(14);

.annotatable-span {
@extend %ui-fake-link;

display: inline;

$highlight_index: 0;

@each $highlight in (
(yellow rgba(255,255,10,0.3) rgba(255,255,10,0.9)),
(red rgba(178,19,16,0.3) rgba(178,19,16,0.9)),
Expand All @@ -80,6 +85,7 @@ $annotatable--body-font-size: em(14);
&.selected { background-color: $selected_color; }
}
}

&.highlight-#{$marker} {
background-color: $color;
&.selected { background-color: $selected_color; }
Expand All @@ -89,6 +95,7 @@ $annotatable--body-font-size: em(14);
&.hide {
cursor: none;
background-color: inherit;

.annotatable-icon {
display: none;
}
Expand All @@ -113,20 +120,24 @@ $annotatable--body-font-size: em(14);
background-color: transparent;
padding: ($baseline/4) ($baseline/2);
border: none;

.ui-tooltip-title {
padding: ($baseline/4) 0;
border-bottom: 2px solid #333;
font-weight: bold;
}

.ui-tooltip-icon {
right: 10px;
background: #333;
}

.ui-state-hover {
color: inherit;
border: 1px solid $gray-l3;
}
}

.ui-tooltip-content {
color: inherit;
font-size: em(14);
Expand All @@ -136,23 +147,27 @@ $annotatable--body-font-size: em(14);
background-color: transparent;
border-color: transparent;
}

p {
color: inherit;
line-height: normal;
color: inherit;
line-height: normal;
}
}

.ui-tooltip.qtip.ui-tooltip-annotatable {
max-width: 375px;

.ui-tooltip-content {
padding: 0 ($baseline/2);

.annotatable-comment {
display: block;
margin: 0 0 ($baseline/2) 0;
max-height: 225px;
overflow: auto;
line-height: normal;
}

.annotatable-reply {
display: block;
border-top: 2px solid #333;
Expand All @@ -161,6 +176,7 @@ $annotatable--body-font-size: em(14);
text-align: center;
}
}

&:after {
content: '';
display: inline-block;
Expand Down
Loading

0 comments on commit bd1a0d9

Please sign in to comment.