From bd3bb31b6c0eeb87e37d4a5b8dbd5240f72f5459 Mon Sep 17 00:00:00 2001 From: John O'Nolan Date: Wed, 30 Jul 2014 08:07:23 +0300 Subject: [PATCH] Deprecate old files and introduce _shame.scss - New _shame.scss to hold styles/components which need to be refactored or removed - layout.scss and floatingheader.scss merged into global.scss/shame.scss --- .../_shame.scss} | 63 +++++++++++++++++++ core/client/assets/sass/patterns/global.scss | 20 ++++++ core/client/assets/sass/screen.scss | 6 +- 3 files changed, 86 insertions(+), 3 deletions(-) rename core/client/assets/sass/{components/floatingheader.scss => patterns/_shame.scss} (66%) diff --git a/core/client/assets/sass/components/floatingheader.scss b/core/client/assets/sass/patterns/_shame.scss similarity index 66% rename from core/client/assets/sass/components/floatingheader.scss rename to core/client/assets/sass/patterns/_shame.scss index 9c236dad10..a4efcdd188 100644 --- a/core/client/assets/sass/components/floatingheader.scss +++ b/core/client/assets/sass/patterns/_shame.scss @@ -1,3 +1,66 @@ +// +// Box +// -------------------------------------------------- + +.box { + padding: 15px; + margin-bottom: 15px; + background: #fff; + position: relative; + box-shadow: $shadow; + + header { + height:14px; + border-bottom: 1px solid $lightbrown; + padding-bottom: 15px; + margin-bottom: 15px; + text-transform: uppercase; + font-size:0.85em; + color: $brown; + } + + footer { + height:14px; + border-top: 1px solid $lightbrown; + padding-top: 10px; + margin-top:15px; + text-transform: uppercase; + font-size:0.85em; + color: $brown; + } + + header a, + footer a { + color:$brown; + &:hover { + color:$darkgrey; + text-decoration: none; + } + } +} + + +// +// Main +// -------------------------------------------------- + +main { + position: absolute; + top: 55px; + right: 15px; + bottom: 0; + left: 15px; + padding: 0; + + @media (max-width: 400px) { + top: 40px; + left: 0; + right: 0; + } + +} + + // // Floating Header // -------------------------------------------------- diff --git a/core/client/assets/sass/patterns/global.scss b/core/client/assets/sass/patterns/global.scss index f65dd33a9b..9cd4623670 100644 --- a/core/client/assets/sass/patterns/global.scss +++ b/core/client/assets/sass/patterns/global.scss @@ -57,6 +57,14 @@ a, a:active { // Utilities // -------------------------------------------------- +.clearfix { + @include clearfix; +} + +.wrapper { + position: relative; +} + .show { display: block !important; } @@ -89,4 +97,16 @@ a, a:active { overflow: visible; clip: auto; } +} + +.right { + float: right; +} +.left { + float: left; +} + +.vertical { + display: table-cell; + vertical-align: middle; } \ No newline at end of file diff --git a/core/client/assets/sass/screen.scss b/core/client/assets/sass/screen.scss index b3b73f9861..c8ccd610c5 100644 --- a/core/client/assets/sass/screen.scss +++ b/core/client/assets/sass/screen.scss @@ -21,21 +21,21 @@ // -------------------------------------------------- @import "patterns/global"; +@import "patterns/_shame"; // TODO: Remove @import "patterns/forms"; @import "patterns/buttons"; // -// Components - User interface objects +// Components - Groups of Patterns // -------------------------------------------------- @import "components/navigation"; @import "components/dropdowns"; -@import "components/floatingheader"; // TODO: Remove // -// Layouts - Individual application screens +// Layouts - Groups of Components // -------------------------------------------------- @import "layouts/default";