From 7f2b3d3bf36786c55f2fd4e2c9f0e0a00e530f1b Mon Sep 17 00:00:00 2001 From: Utah Kate Newman Date: Wed, 2 Jul 2014 16:31:29 -0700 Subject: [PATCH 1/3] replaces blue comment box border and box shadow with gray border and no box shadow --- app/assets/stylesheets/application.css.sass | 1 + app/assets/stylesheets/bootstrap-commentfix.scss | 12 ++++++++++++ app/assets/stylesheets/new-templates.css.scss | 1 + 3 files changed, 14 insertions(+) create mode 100644 app/assets/stylesheets/bootstrap-commentfix.scss diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass index 52199d047..697ab005e 100644 --- a/app/assets/stylesheets/application.css.sass +++ b/app/assets/stylesheets/application.css.sass @@ -19,6 +19,7 @@ @import 'popover' @import 'stream_element' @import 'report' +@import 'bootstrap-commentfix' /* ====== media ====== */ .media diff --git a/app/assets/stylesheets/bootstrap-commentfix.scss b/app/assets/stylesheets/bootstrap-commentfix.scss new file mode 100644 index 000000000..8305d740f --- /dev/null +++ b/app/assets/stylesheets/bootstrap-commentfix.scss @@ -0,0 +1,12 @@ +//Replaces blue border and box shadow around comment field with gray border and no box shadow// + +.comment_box { + border: #cccccc solid 1px; + &:focus { + border: #999999 solid 1px; + border-color: #ccc solid 1px; + outline: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0), 0 0 8px rgba(102, 175, 233, 0); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0), 0 0 8px rgba(102, 175, 233, 0); + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/new-templates.css.scss b/app/assets/stylesheets/new-templates.css.scss index cfc3795e4..a423827d0 100644 --- a/app/assets/stylesheets/new-templates.css.scss +++ b/app/assets/stylesheets/new-templates.css.scss @@ -27,6 +27,7 @@ @import 'bootstrap-headerfix'; @import 'opengraph'; @import 'single-post-view'; +@import 'bootstrap-commentfix'; @import 'new_styles/poll'; /* conversations */ From a282a37a8c42cd4996f3a16498c1ce855c9a4bc8 Mon Sep 17 00:00:00 2001 From: Utah Kate Newman Date: Tue, 8 Jul 2014 17:45:52 -0700 Subject: [PATCH 2/3] revised argument order and changed colors to color variables defined in colors.css.scss --- app/assets/stylesheets/bootstrap-commentfix.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/bootstrap-commentfix.scss b/app/assets/stylesheets/bootstrap-commentfix.scss index 8305d740f..6b50a24fe 100644 --- a/app/assets/stylesheets/bootstrap-commentfix.scss +++ b/app/assets/stylesheets/bootstrap-commentfix.scss @@ -1,10 +1,10 @@ //Replaces blue border and box shadow around comment field with gray border and no box shadow// .comment_box { - border: #cccccc solid 1px; + border: 1px solid $border-grey; &:focus { - border: #999999 solid 1px; - border-color: #ccc solid 1px; + border: 1px solid $border-dark-grey; + border-color: 1px solid #ccc; outline: 0; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0), 0 0 8px rgba(102, 175, 233, 0); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0), 0 0 8px rgba(102, 175, 233, 0); From bdc5c1f958708479467acd0511eb92d86943954c Mon Sep 17 00:00:00 2001 From: lyzellis Date: Fri, 18 Jul 2014 17:27:41 -0700 Subject: [PATCH 3/3] changes border color to dark grey and removes box shadow for textareas and text inputs on focus --- app/assets/stylesheets/application.css.sass | 2 +- app/assets/stylesheets/bootstrap-commentfix.scss | 12 ------------ app/assets/stylesheets/new-templates.css.scss | 1 - app/assets/stylesheets/new_styles/_forms.scss | 8 ++++++++ 4 files changed, 9 insertions(+), 14 deletions(-) delete mode 100644 app/assets/stylesheets/bootstrap-commentfix.scss diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass index 697ab005e..a61fc11b0 100644 --- a/app/assets/stylesheets/application.css.sass +++ b/app/assets/stylesheets/application.css.sass @@ -19,7 +19,7 @@ @import 'popover' @import 'stream_element' @import 'report' -@import 'bootstrap-commentfix' +@import 'new_styles/_forms' /* ====== media ====== */ .media diff --git a/app/assets/stylesheets/bootstrap-commentfix.scss b/app/assets/stylesheets/bootstrap-commentfix.scss deleted file mode 100644 index 6b50a24fe..000000000 --- a/app/assets/stylesheets/bootstrap-commentfix.scss +++ /dev/null @@ -1,12 +0,0 @@ -//Replaces blue border and box shadow around comment field with gray border and no box shadow// - -.comment_box { - border: 1px solid $border-grey; - &:focus { - border: 1px solid $border-dark-grey; - border-color: 1px solid #ccc; - outline: 0; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0), 0 0 8px rgba(102, 175, 233, 0); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0), 0 0 8px rgba(102, 175, 233, 0); - } -} \ No newline at end of file diff --git a/app/assets/stylesheets/new-templates.css.scss b/app/assets/stylesheets/new-templates.css.scss index a423827d0..cfc3795e4 100644 --- a/app/assets/stylesheets/new-templates.css.scss +++ b/app/assets/stylesheets/new-templates.css.scss @@ -27,7 +27,6 @@ @import 'bootstrap-headerfix'; @import 'opengraph'; @import 'single-post-view'; -@import 'bootstrap-commentfix'; @import 'new_styles/poll'; /* conversations */ diff --git a/app/assets/stylesheets/new_styles/_forms.scss b/app/assets/stylesheets/new_styles/_forms.scss index 9586da874..c1aa97c4b 100644 --- a/app/assets/stylesheets/new_styles/_forms.scss +++ b/app/assets/stylesheets/new_styles/_forms.scss @@ -86,6 +86,14 @@ form.block-form { } } +textarea, input[type=text] { + &:focus { + border: 1px solid $border-dark-grey; + outline: none; + -webkit-box-shadow: none; + box-shadow: none; + } + } /* buttons to be extracted? */ .new-btn {