From ab28e085910bccd772d68d3e8475637e0e9550c5 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 20 Aug 2012 13:22:21 -0400 Subject: [PATCH] Added new button classes --- lms/static/sass/course/base/_base.scss | 12 +++++++ lms/static/sass/course/base/_extends.scss | 36 +++++++++++-------- .../sass/course/discussion/_sidebar.scss | 6 ++-- 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/lms/static/sass/course/base/_base.scss b/lms/static/sass/course/base/_base.scss index 952ff91365..a9f7c9cce3 100644 --- a/lms/static/sass/course/base/_base.scss +++ b/lms/static/sass/course/base/_base.scss @@ -53,6 +53,18 @@ input[type="password"] { } } +input[type="reset"], +input[type="submit"], +input[type="button"], +button, +.button { + @extend .gray-button; + + form & { + @extend .gray-button; + } +} + img { max-width: 100%; diff --git a/lms/static/sass/course/base/_extends.scss b/lms/static/sass/course/base/_extends.scss index 78618df83d..c072ea3b1f 100644 --- a/lms/static/sass/course/base/_extends.scss +++ b/lms/static/sass/course/base/_extends.scss @@ -6,28 +6,34 @@ h1.top-header { padding-bottom: lh(); } -.light-button, a.light-button { - border: 1px solid #ccc; - @include border-radius(3px); - @include box-shadow(inset 0 1px 0 #fff); - color: #666; - cursor: pointer; - font: 400 $body-font-size $body-font-family; - @include linear-gradient(#fff, lighten(#888, 40%)); - padding: 4px 8px; - text-decoration: none; - text-shadow: none; +.button-reset { text-transform: none; letter-spacing: 0; - -webkit-font-smoothing: antialiased; - &:hover, &:focus { - border: 1px solid #ccc; - @include linear-gradient(#fff, lighten(#888, 37%)); + &:hover { text-decoration: none; } } +.light-button, a.light-button, // only used in askbot as classes +.gray-button { + @include button(simple, #eee); + @extend .button-reset; + font-size: em(13); +} + +.blue-button { + @include button(simple, $blue); + @extend .button-reset; + font-size: em(13); +} + +.pink-button { + @include button(simple, $pink); + @extend .button-reset; + font-size: em(13); +} + .content { @include box-sizing(border-box); display: table-cell; diff --git a/lms/static/sass/course/discussion/_sidebar.scss b/lms/static/sass/course/discussion/_sidebar.scss index 59dcfaf449..b248fb18d7 100644 --- a/lms/static/sass/course/discussion/_sidebar.scss +++ b/lms/static/sass/course/discussion/_sidebar.scss @@ -43,8 +43,8 @@ div.discussion-wrapper aside { width: 27%; float: right; text-align: center; - padding-left: 0; - padding-right: 0; + padding: 4px 0; + text-transform: capitalize; } input[type="text"] { @@ -300,7 +300,7 @@ div.discussion-wrapper aside { border-top: 0; a { - @extend .light-button; + @extend .gray-button; @include box-sizing(border-box); display: block; text-align: center;