Merge branch 'style'

cloverfeed · Jan 21, 2015 · 67a4101 · 67a4101
2 parents 34e76be + a18a701
commit 67a4101
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/app/factory.py b/app/factory.py
@@ -113,9 +113,7 @@ def configure_ext_assets(app, xstatic):
     assets.register('vendor_js', vendor_js)
 
     scss_bundle = Bundle(
-        'scss/bootstrap_custom.scss',
-        'scss/view.scss',
-        'scss/shame.scss',
+        'scss/site.scss',
         depends='**/*.scss',
         filters='pyscss',
         output='gen/app.css'

diff --git a/static/scss/annotation.scss b/static/scss/annotation.scss
@@ -0,0 +1,3 @@
+.annotation {
+    color: black;
+}
diff --git a/static/scss/dialog.scss b/static/scss/dialog.scss
@@ -0,0 +1,9 @@
+.ui-widget-header {
+    background: $brand-primary;
+    border: 1px solid darken($brand-primary, 20%);
+}
+
+.ui-widget-content {
+    background: $body-bg;
+    color: $text-color;
+}
diff --git a/static/scss/site.scss b/static/scss/site.scss
@@ -0,0 +1,5 @@
+@import "bootstrap_custom.scss";
+@import "view.scss";
+@import "dialog";
+@import "annotation";
+@import "shame.scss";