From 439927fa81154cfe9c03f22d15c41291f21dfb19 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Mon, 29 Jun 2015 00:47:07 -0700 Subject: [PATCH] move .gap style to base --- .../stylesheets/common/base/topic-post.scss | 37 +++++++++++++++++++ .../stylesheets/desktop/topic-post.scss | 37 ------------------- app/assets/stylesheets/mobile/topic-post.scss | 6 +-- 3 files changed, 38 insertions(+), 42 deletions(-) diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss index ed5d80554fa..62e8846588d 100644 --- a/app/assets/stylesheets/common/base/topic-post.scss +++ b/app/assets/stylesheets/common/base/topic-post.scss @@ -197,3 +197,40 @@ blockquote > *:first-child { blockquote > *:last-child { margin-bottom: 0 !important; } + +.gap { + background-color: dark-light-diff($primary, $secondary, 90%, -60%); + padding: 5px 0; + color: lighten($primary, 70%); + cursor: pointer; + text-align: center; + width: calc(#{$topic-avatar-width} + #{$topic-body-width} + 2 * #{$topic-body-width-padding}); + + &.jagged-border { + background-image: + linear-gradient( + 135deg, + $secondary 50%, rgba(255,255,255,0) 50% + ), + linear-gradient( + -135deg, + $secondary 50%, rgba(255,255,255,0) 50% + ), + linear-gradient( + 45deg, + $secondary 50%, rgba(255,255,255,0) 50% + ), + linear-gradient( + -45deg, + $secondary 50%, rgba(255,255,255,0) 50% + ); + background-position: + top center, top center, + bottom center, bottom center; + background-size: .9em .9em; + background-repeat: repeat-x; + padding: 20px 0; + margin-bottom: 20px; + } + +} diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 058febcb6af..e71ae6d6c27 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -709,43 +709,6 @@ $topic-avatar-width: 45px; z-index: 2; } -.gap { - background-color: dark-light-diff($primary, $secondary, 90%, -60%); - padding: 5px 0; - color: lighten($primary, 30%); - cursor: pointer; - text-align: center; - width: calc(#{$topic-avatar-width} + #{$topic-body-width} + 2 * #{$topic-body-width-padding}); - - &.jagged-border { - background-image: - linear-gradient( - 135deg, - $secondary 50%, rgba(255,255,255,0) 50% - ), - linear-gradient( - -135deg, - $secondary 50%, rgba(255,255,255,0) 50% - ), - linear-gradient( - 45deg, - $secondary 50%, rgba(255,255,255,0) 50% - ), - linear-gradient( - -45deg, - $secondary 50%, rgba(255,255,255,0) 50% - ); - background-position: - top center, top center, - bottom center, bottom center; - background-size: .9em .9em; - background-repeat: repeat-x; - padding: 20px 0; - margin-bottom: 20px; - } - -} - .time-gap { width: 755px; border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss index 7ff4b69d6f3..c25bebd873d 100644 --- a/app/assets/stylesheets/mobile/topic-post.scss +++ b/app/assets/stylesheets/mobile/topic-post.scss @@ -1,9 +1,5 @@ .gap { - background-color: dark-light-diff($primary, $secondary, 90%, -60%); - padding: 5px 15px; - color: $primary; - text-align: center; - margin: 10px 0; + /* may not need this */ } .time-gap {