Commit 81369d96 authored by Robert Knight's avatar Robert Knight

Restructure sidebar styles in source tree

- Move the sidebar-specific styles into `styles/sidebar` and the
  component-specific styles into `styles/sidebar/components`. This mirrors
  the structure of the JS code in `src/`.

- Rename the entry point for the sidebar's style bundle from "app.scss"
  to "sidebar.scss" to make it more obvious what is in the generated
  "sidebar.css" bundle.

This move highlights some inappropriate dependencies between style
modules and an unclearly structured assortment of "stuff" shared by both
annotator and sidebar bundles in shared files in `src/styles`. There is
probably a fair amount of unused code in there as well. Cleaning that
up will happen in separate commits.
parent faf27af9
......@@ -136,7 +136,7 @@ var styleFiles = [
// H
'./src/styles/annotator/inject.scss',
'./src/styles/annotator/pdfjs-overrides.scss',
'./src/styles/app.scss',
'./src/styles/sidebar/sidebar.scss',
// Vendor
'./src/styles/vendor/angular-csp.css',
......
......@@ -93,7 +93,7 @@ function bootSidebarApp(doc, config) {
'styles/angular-toastr.css',
'styles/icomoon.css',
'styles/katex.min.css',
'styles/app.css',
'styles/sidebar.css',
]);
}
......
......@@ -37,7 +37,7 @@ describe('bootstrap', function () {
'styles/angular-toastr.css',
'styles/icomoon.css',
'styles/katex.min.css',
'styles/app.css',
'styles/sidebar.css',
];
var manifest = assetNames.reduce(function (manifest, path) {
......@@ -127,9 +127,9 @@ describe('bootstrap', function () {
'scripts/unorm.bundle.1234.js',
'styles/angular-csp.1234.css',
'styles/angular-toastr.1234.css',
'styles/app.1234.css',
'styles/icomoon.1234.css',
'styles/katex.min.1234.css',
'styles/sidebar.1234.css',
].map(function (url) {
return 'https://marginal.ly/client/build/' + url;
});
......
@import './mixins/reset';
@import '../mixins/reset';
/*
Consistency fixes
......
@import './base';
@import './forms';
@import './mixins/responsive';
@import '../base';
@import '../forms';
@import '../mixins/responsive';
@import './styled-text';
......
@import "mixins/icons";
@import "../../mixins/icons";
// Highlight quote of annotation whenever its thread is hovered
.thread-list__card:hover .annotation-quote {
......
@import "base.scss";
@import "mixins/icons";
@import "../../base.scss";
@import "../../mixins/icons";
.simple-search-form {
display: flex;
......
// Styles for the ngTagsInput plugin.
// http://mbenford.github.io/ngTagsInput/gettingstarted
@import "mixins/forms";
@import "variables";
@import "../../mixins/forms";
@import "../../variables";
tags-input {
.host {
......
@import 'base';
@import 'mixins/responsive';
@import '../../base';
@import '../../mixins/responsive';
.top-bar {
background: $white;
......
$base-font-size: 12px;
$base-line-height: 20px;
@import './variables';
@import './reset';
@import '../variables';
@import '../reset';
@import './elements';
@import './common';
// Components
// ----------
@import './annotation';
@import './annotation-share-dialog';
@import './annotation-thread';
@import './dropdown-menu-btn';
@import './excerpt';
@import './group-list';
@import './help-panel';
@import './loggedout-message';
@import './login-control';
@import './markdown';
@import './moderation-banner';
@import './new-note';
@import './primary-action-btn';
@import './publish-annotation-btn';
@import './search-status-bar';
@import './selection-tabs';
@import './share-link';
@import './sidebar-tutorial';
@import './simple-search';
@import './spinner';
@import './tags-input';
@import './thread-list';
@import './tooltip';
@import './top-bar';
@import './components/annotation';
@import './components/annotation-share-dialog';
@import './components/annotation-thread';
@import './components/dropdown-menu-btn';
@import './components/excerpt';
@import './components/group-list';
@import './components/help-panel';
@import './components/loggedout-message';
@import './components/login-control';
@import './components/markdown';
@import './components/moderation-banner';
@import './components/new-note';
@import './components/primary-action-btn';
@import './components/publish-annotation-btn';
@import './components/search-status-bar';
@import './components/selection-tabs';
@import './components/share-link';
@import './components/sidebar-tutorial';
@import './components/simple-search';
@import './components/spinner';
@import './components/tags-input';
@import './components/thread-list';
@import './components/tooltip';
@import './components/top-bar';
// Top-level styles
// ----------------
......
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