mirror of
https://github.com/seigler/dash-website
synced 2025-07-27 07:16:10 +00:00
slight reorg of scss, added junk-drawer.scss to help with cleanup, typography adjustments
This commit is contained in:
Joshua Seigler
parent
0d7ab2922c
commit
e68fb55657
7 changed files with 138 additions and 124 deletions
|
|
@ -119,8 +119,6 @@
|
|||
overflow: hidden;
|
||||
}
|
||||
h3 {
|
||||
font-family: 'Helvetica Neue', Helvetica, Arial, Sans-Serif;
|
||||
font-size: 14px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.date {
|
||||
|
|
@ -135,4 +133,4 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
31
_sass/_junk-drawer.scss
Normal file
31
_sass/_junk-drawer.scss
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
/*
|
||||
|
||||
Everything in this file is technical debt. Put stuff in here if
|
||||
you're in a hurry or lost or you just need to Make It Work©
|
||||
|
||||
*/
|
||||
|
||||
img.staff {
|
||||
max-width: 100px;
|
||||
float: left;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
a.blog_link {
|
||||
text-align:right;
|
||||
}
|
||||
|
||||
.img-circle {
|
||||
margin: 1px;
|
||||
border:1px solid #dddddd;
|
||||
border-radius: 50%;
|
||||
-webkit-border-radius: 50%;
|
||||
-moz-border-radius: 50%;
|
||||
}
|
||||
|
||||
.background-title {
|
||||
background-color: $gray;
|
||||
padding: 10px;
|
||||
margin-top: 30px;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
35
_sass/_layout.scss
Normal file
35
_sass/_layout.scss
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
body {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
color: $black;
|
||||
background-color: $white;
|
||||
}
|
||||
|
||||
.content {
|
||||
width: 1280px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.col {
|
||||
float: left
|
||||
}
|
||||
|
||||
.button_container {
|
||||
display: none;
|
||||
}
|
||||
|
||||
// non-semantic concessions AKA utility classes
|
||||
.clear {
|
||||
clear: both;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.right {
|
||||
float: right;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.left {
|
||||
float: left;
|
||||
display: inline-block;
|
||||
}
|
||||
54
_sass/_reset.scss
Normal file
54
_sass/_reset.scss
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
/**
|
||||
* This gives us a consistent starting point for styles across browsers.
|
||||
*
|
||||
* Eric Meyer's Reset CSS v2.0 (http://meyerweb.com/eric/tools/css/reset/)
|
||||
* http://cssreset.com
|
||||
*/
|
||||
html, body, div, span, applet, object, iframe,
|
||||
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
|
||||
a, abbr, acronym, address, big, cite, code,
|
||||
del, dfn, em, img, ins, kbd, q, s, samp,
|
||||
small, strike, strong, sub, sup, tt, var,
|
||||
b, u, i, center,
|
||||
dl, dt, dd, ol, ul, li,
|
||||
fieldset, form, label, legend,
|
||||
table, caption, tbody, tfoot, thead, tr, th, td,
|
||||
article, aside, canvas, details, embed,
|
||||
figure, figcaption, footer, header, hgroup,
|
||||
menu, nav, output, ruby, section, summary,
|
||||
time, mark, audio, video {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
border: 0;
|
||||
font-size: 100%;
|
||||
font: inherit;
|
||||
vertical-align: baseline;
|
||||
}
|
||||
/* HTML5 display-role reset for older browsers */
|
||||
article, aside, details, figcaption, figure,
|
||||
footer, header, hgroup, menu, nav, section {
|
||||
display: block;
|
||||
}
|
||||
body {
|
||||
line-height: 1;
|
||||
}
|
||||
ol, ul {
|
||||
list-style: none;
|
||||
}
|
||||
blockquote, q {
|
||||
quotes: none;
|
||||
}
|
||||
blockquote:before, blockquote:after,
|
||||
q:before, q:after {
|
||||
content: '';
|
||||
content: none;
|
||||
}
|
||||
table {
|
||||
border-collapse: collapse;
|
||||
border-spacing: 0;
|
||||
}
|
||||
|
||||
/* one small addition */
|
||||
*,*:after,*:before {
|
||||
box-sizing: inherit;
|
||||
}
|
||||
|
|
@ -1,50 +1,10 @@
|
|||
font-face {
|
||||
font-family: 'montserratbold';
|
||||
src: url('../fonts/montserrat-bold-webfont.eot');
|
||||
src: url('../fonts/montserrat-bold-webfont.eot?#iefix') format('embedded-opentype'),
|
||||
url('../fonts/montserrat-bold-webfont.woff2') format('woff2'),
|
||||
url('../fonts/montserrat-bold-webfont.woff') format('woff'),
|
||||
url('../fonts/montserrat-bold-webfont.ttf') format('truetype'),
|
||||
url('../fonts/montserrat-bold-webfont.svg#montserratbold') format('svg');
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@font-face {
|
||||
font-family: 'montserratlight';
|
||||
src: url('../fonts/montserrat-light-webfont.eot');
|
||||
src: url('../fonts/montserrat-light-webfont.eot?#iefix') format('embedded-opentype'),
|
||||
url('../fonts/montserrat-light-webfont.woff2') format('woff2'),
|
||||
url('../fonts/montserrat-light-webfont.woff') format('woff'),
|
||||
url('../fonts/montserrat-light-webfont.ttf') format('truetype'),
|
||||
url('../fonts/montserrat-light-webfont.svg#montserratlight') format('svg');
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@font-face {
|
||||
font-family: 'montserratregular';
|
||||
src: url('../fonts/montserrat-regular-webfont.eot');
|
||||
src: url('../fonts/montserrat-regular-webfont.eot?#iefix') format('embedded-opentype'),
|
||||
url('../fonts/montserrat-regular-webfont.woff2') format('woff2'),
|
||||
url('../fonts/montserrat-regular-webfont.woff') format('woff'),
|
||||
url('../fonts/montserrat-regular-webfont.ttf') format('truetype'),
|
||||
url('../fonts/montserrat-regular-webfont.svg#montserratregular') format('svg');
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
@import "../assets/fonts/worksans/font";
|
||||
|
||||
body {
|
||||
font-family: 'work_sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
|
||||
}
|
||||
|
||||
p {
|
||||
font-family: 'Helvetica Neue', Helvetica, Arial, Sans-Serif;
|
||||
font-size: 14px;
|
||||
line-height: 22px;
|
||||
a {
|
||||
|
|
@ -56,41 +16,23 @@ p {
|
|||
}
|
||||
}
|
||||
|
||||
span {
|
||||
font-family: 'Helvetica Neue', Helvetica, Arial, Sans-Serif;
|
||||
}
|
||||
|
||||
h1 {
|
||||
font-size: 36px;
|
||||
line-height: 40px;
|
||||
font-family: 'montserratbold', 'Helvetica Neue', Helvetica, Arial, Sans-Serif;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
h2 {
|
||||
font-family: 'montserratregular';
|
||||
font-size: 22px;
|
||||
color: $blue;
|
||||
}
|
||||
|
||||
h3 {
|
||||
font-family: 'montserratlight';
|
||||
font-size: 20px;
|
||||
color: $black;
|
||||
span {
|
||||
font-family: inherit;
|
||||
}
|
||||
}
|
||||
|
||||
.background-title {
|
||||
background-color: $gray;
|
||||
padding: 10px;
|
||||
margin-top: 30px;
|
||||
margin-bottom: 0;
|
||||
|
||||
}
|
||||
|
||||
a {
|
||||
font-family: 'Helvetica Neue', Helvetica, Arial, Sans-Serif;
|
||||
text-decoration: none;
|
||||
color: $blue;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,78 +3,32 @@
|
|||
# only Main files contain this front matter, not partials.
|
||||
---
|
||||
|
||||
// stuff every page really needs
|
||||
@import "reset";
|
||||
@import "colors";
|
||||
@import "typography";
|
||||
@import "layout";
|
||||
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
color: $black;
|
||||
background-color: $white;
|
||||
font-family: 'Helvetica Neue', Helvetica, Arial, Sans-Serif;
|
||||
font-size: 14px;
|
||||
line-height: 22px;
|
||||
}
|
||||
|
||||
.content {
|
||||
width: 1280px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.col {
|
||||
float: left
|
||||
}
|
||||
|
||||
.clear {
|
||||
clear: both;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.right {
|
||||
float: right;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.left {
|
||||
float: left;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.button_container {
|
||||
display: none;
|
||||
}
|
||||
|
||||
img.staff {
|
||||
max-width: 100px;
|
||||
float: left;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
a.blog_link {
|
||||
text-align:right;
|
||||
}
|
||||
|
||||
.img-circle {
|
||||
margin: 1px;
|
||||
border:1px solid #dddddd;
|
||||
border-radius: 50%;
|
||||
-webkit-border-radius: 50%;
|
||||
-moz-border-radius: 50%;
|
||||
}
|
||||
|
||||
//stuff every page needs
|
||||
@import "header";
|
||||
@import "nav";
|
||||
@import "buttons";
|
||||
@import "forms";
|
||||
@import "footer";
|
||||
|
||||
//stuff most pages need
|
||||
@import "overlay-menu";
|
||||
@import "video";
|
||||
|
||||
//styles for specific pages
|
||||
@import "home";
|
||||
@import "interior";
|
||||
@import "post";
|
||||
@import "header";
|
||||
@import "junk-drawer";
|
||||
@import "styleguide";
|
||||
|
||||
//responsive overrides
|
||||
//TODO merge these back into the rest of the SCSS files
|
||||
@import "1024";
|
||||
@import "768";
|
||||
@import "640";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue