Skip to content

Commit

Permalink
Deprecate old files and introduce _shame.scss
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
JohnONolan committed Jul 30, 2014
1 parent 62fa89c commit bd3bb31
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 3 deletions.
@@ -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
// --------------------------------------------------
Expand Down
20 changes: 20 additions & 0 deletions core/client/assets/sass/patterns/global.scss
Expand Up @@ -57,6 +57,14 @@ a, a:active {
// Utilities
// --------------------------------------------------

.clearfix {
@include clearfix;
}

.wrapper {
position: relative;
}

.show {
display: block !important;
}
Expand Down Expand Up @@ -89,4 +97,16 @@ a, a:active {
overflow: visible;
clip: auto;
}
}

.right {
float: right;
}
.left {
float: left;
}

.vertical {
display: table-cell;
vertical-align: middle;
}
6 changes: 3 additions & 3 deletions core/client/assets/sass/screen.scss
Expand Up @@ -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";

0 comments on commit bd3bb31

Please sign in to comment.