From 8b77111d58fd96ee0af0ba0c6bb6c52007f1ac44 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 8 May 2013 16:35:09 -0400
Subject: [PATCH] Studio: more styling changes
typography, SASS, imports
---
cms/static/sass/_base.scss | 31 +++++++++++++++++++++++++++++++
cms/static/sass/_mixins-inherited.scss | 2 ++
cms/static/sass/elements/_system-feedback.scss | 2 +-
common/static/sass/_mixins.scss | 20 --------------------
4 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index 3188ea6..3f9db16 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -166,6 +166,37 @@ h1 {
font-weight: 600;
}
+// typography - primary content
+.content-secondary {
+
+ .section-header {
+ color: $gray-d3;
+
+ .subtitle {
+ color: $gray-l2;
+ }
+ }
+
+ .content-header {
+ color: $gray-d3;
+
+ .subtitle {
+ color: $gray-l2;
+ }
+ }
+
+ .content-header {
+ color: $gray-d3;
+
+ .subtitle {
+ color: $gray-l2;
+ }
+ }
+}
+
+// ====================
+
+// typography - loose headings (BT: needs to be removed once html is clean)
.title-1 {
@extend .t-title3;
margin-bottom: ($baseline*1.5);
diff --git a/cms/static/sass/_mixins-inherited.scss b/cms/static/sass/_mixins-inherited.scss
index 2a047a4..a766919 100644
--- a/cms/static/sass/_mixins-inherited.scss
+++ b/cms/static/sass/_mixins-inherited.scss
@@ -1,6 +1,8 @@
// studio - utilities - INHERITED mixins and extends
+
// NOTE: these are older/poorly architected mixins that we want to move away from using or refactor in the future.
// They are still referenced when styliing current interface elements and as such need to be preserved for the time being.
+// talbs: we need to slowly ween ourselves off of these
// ====================
// inherited - vertical and horizontal centering
diff --git a/cms/static/sass/elements/_system-feedback.scss b/cms/static/sass/elements/_system-feedback.scss
index 55e5528..53c7625 100644
--- a/cms/static/sass/elements/_system-feedback.scss
+++ b/cms/static/sass/elements/_system-feedback.scss
@@ -111,7 +111,6 @@
.nav-actions .action-primary {
@include green-button();
@include font-size(12); // needed due to bad button mixins for now
-
border-color: $green-d2;
}
@@ -423,6 +422,7 @@
}
.action-secondary {
+
@extend .t-action4;
}
}
diff --git a/common/static/sass/_mixins.scss b/common/static/sass/_mixins.scss
index 1b4d834..6e1a34a 100644
--- a/common/static/sass/_mixins.scss
+++ b/common/static/sass/_mixins.scss
@@ -26,26 +26,6 @@
@include size($size);
}
-// ====================
-
-// mixins - image-replacement hidden text
-@mixin text-hide() {
- text-indent: 100%;
- white-space: nowrap;
- overflow: hidden;
-}
-
-// mixins - hidden elems - screenreaders
-@mixin text-sr() {
- border: 0;
- clip: rect(0 0 0 0);
- height: 1px;
- margin: -1px;
- overflow: hidden;
- padding: 0;
- position: absolute;
- width: 1px;
-}
// ====================
--
libgit2 0.26.0