Merge pull request #634 from hypothesis/restructure-sidebar-css-bundle

Restructure sidebar styles in source tree

gulpfile.js

@@ -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',

src/boot/boot.js

@@ -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',
   ]);
 }
 

src/boot/test/boot-test.js

@@ -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;
       });

src/styles/reset.scss

-@import './mixins/reset';
+@import '../mixins/reset';
 
 /*
   Consistency fixes

src/styles/common.scss → src/styles/sidebar/common.scss

-@import './base';
-@import './forms';
-@import './mixins/responsive';
+@import '../base';
+@import '../forms';
+@import '../mixins/responsive';
 
 @import './styled-text';
 

src/styles/annotation.scss → src/styles/sidebar/components/annotation.scss

-@import "mixins/icons";
+@import "../../mixins/icons";
 
 // Highlight quote of annotation whenever its thread is hovered
 .thread-list__card:hover .annotation-quote {

src/styles/simple-search.scss → src/styles/sidebar/components/simple-search.scss

-@import "base.scss";
-@import "mixins/icons";
+@import "../../base.scss";
+@import "../../mixins/icons";
 
 .simple-search-form {
   display: flex;

src/styles/tags-input.scss → src/styles/sidebar/components/tags-input.scss

 // Styles for the ngTagsInput plugin.
 // http://mbenford.github.io/ngTagsInput/gettingstarted
 
-@import "mixins/forms";
-@import "variables";
+@import "../../mixins/forms";
+@import "../../variables";
 
 tags-input {
   .host {

src/styles/top-bar.scss → src/styles/sidebar/components/top-bar.scss

-@import 'base';
-@import 'mixins/responsive';
+@import '../../base';
+@import '../../mixins/responsive';
 
 .top-bar {
   background: $white;

src/styles/app.scss → src/styles/sidebar/sidebar.scss

 $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
 // ----------------