From 4ce711a3b78472152ca54fd36de9b1ce4bd56300 Mon Sep 17 00:00:00 2001 From: Kris Aubuchon Date: Mon, 4 Nov 2013 09:16:47 -0500 Subject: [PATCH] some general simplification to modal, menus, etc --- app/assets/stylesheets/desktop/modal.scss | 7 +------ app/assets/stylesheets/desktop/share_link.scss | 7 +++---- app/assets/stylesheets/desktop/topic-post.scss | 8 ++------ app/assets/stylesheets/desktop/topic.scss | 5 +---- 4 files changed, 7 insertions(+), 20 deletions(-) diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss index 4d124dce19e..b56637e2d21 100644 --- a/app/assets/stylesheets/desktop/modal.scss +++ b/app/assets/stylesheets/desktop/modal.scss @@ -56,7 +56,6 @@ *border: 1px solid #999; /* IE6-7 */ - @include border-radius-all (6px); box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); background-clip: padding-box; } @@ -85,7 +84,6 @@ *border: 1px solid #999; /* IE6-7 */ - @include border-radius-all (6px); box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); background-clip: padding-box; } @@ -110,8 +108,6 @@ margin: 0 15px; padding: 14px 0 15px; border-top: 1px solid #ddd; - @include border-radius-all(0 0 6px 6px); - @include box-shadow (inset 0 1px 0 #ffffff); *zoom: 1; } .modal-footer:before, @@ -134,8 +130,7 @@ margin-left: -1px; } .modal-header { - border-bottom: 1px solid #9baab2; - @include box-shadow((0 1px 3px rgba($black, 0.12), inset 0 -4px 4px -4px rgba($black, 0.3))); + border-bottom: 1px solid #ddd; h3 { color: $nav-pills-background-color-active; font-size: 20px; diff --git a/app/assets/stylesheets/desktop/share_link.scss b/app/assets/stylesheets/desktop/share_link.scss index 3ffdc039a30..f26a066e591 100644 --- a/app/assets/stylesheets/desktop/share_link.scss +++ b/app/assets/stylesheets/desktop/share_link.scss @@ -7,10 +7,9 @@ position: absolute; left: 20px; z-index: 990; - @include border-radius-all(3px); - @include box-shadow(1px 1px 5px $darkish_gray); - background-color: $light_gray; - padding: 3px 7px 6px 7px; + box-shadow: 0 1px 5px rgba(70, 70, 70, .4); + background-color: #fff; + padding: 6px 10px 10px 10px; width: 300px; display: none; &.visible { diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 374f2db5691..34a5b0b4349 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -772,12 +772,8 @@ button.show-replies { margin: 1px 0 0; list-style: none; background-color: #ffffff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - *border-right-width: 2px; - *border-bottom-width: 2px; - border-radius: 5px; - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + border: 1px solid #ddd; + box-shadow: 0 1px 5px rgba(70, 70, 70, .4); background-clip: padding-box; span {font-size: 12px;} .title {font-weight: bold; display: block; font-size: 14px;} diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss index bbec999656b..83d1f248e60 100644 --- a/app/assets/stylesheets/desktop/topic.scss +++ b/app/assets/stylesheets/desktop/topic.scss @@ -45,9 +45,7 @@ margin-left: 10px; } -.docked #topic-progress { - box-shadow: 0 0 3px #aaa; -} + #topic-progress-wrapper { position: fixed; @@ -81,7 +79,6 @@ a:hover.reply-new { } #topic-progress { - box-shadow: 0 0 3px #000; position: relative; left: 302px; &.hidden {