Commit d6dc4fa7 authored by Robert Knight's avatar Robert Knight

Remove src/styles/base.scss

This module was used by multiple SASS entry points (annotator, sidebar)
even though each mixin or class within it was either trivial or only
actually used by one of the entry points. Moving the mixins to the
individual entry points will make it easier to run the migrator.
parent 234207c4
@import '../variables'; @import '../variables';
@import '../base';
@import '../mixins/icons'; @import '../mixins/icons';
@import '../mixins/focus'; @import '../mixins/focus';
@import '../mixins/shadow';
@import './adder'; @import './adder';
...@@ -46,7 +46,7 @@ $base-font-size: 14px; ...@@ -46,7 +46,7 @@ $base-font-size: 14px;
// frame styles // frame styles
@import './bucket-bar'; @import './bucket-bar';
user-select: none; user-select: none;
@include grey-background; background: $grey-2;
direction: ltr; direction: ltr;
background: none; background: none;
font-size: $base-font-size; font-size: $base-font-size;
...@@ -172,6 +172,11 @@ $base-font-size: 14px; ...@@ -172,6 +172,11 @@ $base-font-size: 14px;
transition: none !important; transition: none !important;
} }
.annotator-hide {
display: none;
visibility: hidden;
}
/* /*
Mobile layout Mobile layout
240-479 px 240-479 px
......
/* Style input placeholders */
@mixin placeholder {
&.placeholder {
@content;
}
&:placeholder {
@content;
}
&::placeholder {
@content;
}
}
/* Shadow mixins */
@mixin smallshadow($a: 0, $b: 1px, $c: 0.1) {
box-shadow: $a $b 1px hsla(0, 0%, 0%, $c);
}
@mixin quote {
@include font-normal;
border-left: 3px solid $gray-lighter;
color: $grey-4;
font-family: sans-serif;
font-size: 12px;
font-style: italic;
letter-spacing: 0.1px;
padding: 0 1em;
}
//Provides the grey-background
@mixin grey-background {
background: $grey-2;
}
.annotator-hide {
display: none;
visibility: hidden;
}
/* Style input placeholders */
@mixin placeholder {
&.placeholder {
@content;
}
&:placeholder {
@content;
}
&::placeholder {
@content;
}
}
// See http://compass-style.org/reference/compass/utilities/general/clearfix/#mixin-pie-clearfix // See http://compass-style.org/reference/compass/utilities/general/clearfix/#mixin-pie-clearfix
@mixin pie-clearfix { @mixin pie-clearfix {
&:after { &:after {
......
@mixin smallshadow($a: 0, $b: 1px, $c: 0.1) {
box-shadow: $a $b 1px hsla(0, 0%, 0%, $c);
}
@mixin quote {
@include font-normal;
border-left: 3px solid $gray-lighter;
color: $grey-4;
font-family: sans-serif;
font-size: 12px;
font-style: italic;
letter-spacing: 0.1px;
padding: 0 1em;
}
// Highlight quote of annotation whenever its thread is hovered // Highlight quote of annotation whenever its thread is hovered
.thread-list__card:hover .annotation-quote { .thread-list__card:hover .annotation-quote {
border-left: $highlight 3px solid; border-left: $highlight 3px solid;
......
...@@ -17,7 +17,6 @@ $base-line-height: 20px; ...@@ -17,7 +17,6 @@ $base-line-height: 20px;
// Misc. legacy :( // Misc. legacy :(
// --------------- // ---------------
@import '../base';
@import '../forms'; @import '../forms';
@import './styled-text'; @import './styled-text';
@import './common'; @import './common';
...@@ -69,8 +68,7 @@ body { ...@@ -69,8 +68,7 @@ body {
} }
body { body {
@include grey-background; background: $grey-2;
font-family: $sans-font-family; font-family: $sans-font-family;
font-weight: normal; font-weight: normal;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
...@@ -84,8 +82,7 @@ hypothesis-app { ...@@ -84,8 +82,7 @@ hypothesis-app {
.app-content-wrapper { .app-content-wrapper {
$sidebar-h-padding: 9px; $sidebar-h-padding: 9px;
@include grey-background; background: $grey-2;
min-height: 100%; min-height: 100%;
height: 100%; height: 100%;
overflow: scroll; overflow: scroll;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment