Skip to content

Commit

Permalink
Use standardized tab size of 2 spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
zlatanvasovic committed Sep 24, 2016
1 parent ea96ce5 commit e4c9d1e
Show file tree
Hide file tree
Showing 4 changed files with 280 additions and 280 deletions.
14 changes: 7 additions & 7 deletions _sass/minima.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ $on-laptop: 800px !default;

// Use media queries like this:
// @include media-query($on-palm) {
// .wrapper {
// padding-right: $spacing-unit / 2;
// padding-left: $spacing-unit / 2;
// }
// .wrapper {
// padding-right: $spacing-unit / 2;
// padding-left: $spacing-unit / 2;
// }
// }
@mixin media-query($device) {
@media screen and (max-width: $device) {
@content;
}
@media screen and (max-width: $device) {
@content;
}
}

// Import partials.
Expand Down
148 changes: 74 additions & 74 deletions _sass/minima/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
body, h1, h2, h3, h4, h5, h6,
p, blockquote, pre, hr,
dl, dd, ol, ul, figure {
margin: 0;
padding: 0;
margin: 0;
padding: 0;
}


Expand All @@ -14,15 +14,15 @@ dl, dd, ol, ul, figure {
* Basic styling
*/
body {
font: $base-font-weight #{$base-font-size}/#{$base-line-height} $base-font-family;
color: $text-color;
background-color: $background-color;
-webkit-text-size-adjust: 100%;
-webkit-font-feature-settings: "kern" 1;
-moz-font-feature-settings: "kern" 1;
-o-font-feature-settings: "kern" 1;
font-feature-settings: "kern" 1;
font-kerning: normal;
font: $base-font-weight #{$base-font-size}/#{$base-line-height} $base-font-family;
color: $text-color;
background-color: $background-color;
-webkit-text-size-adjust: 100%;
-webkit-font-feature-settings: "kern" 1;
-moz-font-feature-settings: "kern" 1;
-o-font-feature-settings: "kern" 1;
font-feature-settings: "kern" 1;
font-kerning: normal;
}


Expand All @@ -34,7 +34,7 @@ h1, h2, h3, h4, h5, h6,
p, blockquote, pre,
ul, ol, dl, figure,
%vertical-rhythm {
margin-bottom: $spacing-unit / 2;
margin-bottom: $spacing-unit / 2;
}


Expand All @@ -43,8 +43,8 @@ ul, ol, dl, figure,
* Images
*/
img {
max-width: 100%;
vertical-align: middle;
max-width: 100%;
vertical-align: middle;
}


Expand All @@ -53,11 +53,11 @@ img {
* Figures
*/
figure > img {
display: block;
display: block;
}

figcaption {
font-size: $small-font-size;
font-size: $small-font-size;
}


Expand All @@ -66,14 +66,14 @@ figcaption {
* Lists
*/
ul, ol {
margin-left: $spacing-unit;
margin-left: $spacing-unit;
}

li {
> ul,
> ol {
margin-bottom: 0;
}
> ul,
> ol {
margin-bottom: 0;
}
}


Expand All @@ -82,7 +82,7 @@ li {
* Headings
*/
h1, h2, h3, h4, h5, h6 {
font-weight: $base-font-weight;
font-weight: $base-font-weight;
}


Expand All @@ -91,17 +91,17 @@ h1, h2, h3, h4, h5, h6 {
* Links
*/
a {
color: $brand-color;
text-decoration: none;
color: $brand-color;
text-decoration: none;

&:visited {
color: darken($brand-color, 15%);
}
&:visited {
color: darken($brand-color, 15%);
}

&:hover {
color: $text-color;
text-decoration: underline;
}
&:hover {
color: $text-color;
text-decoration: underline;
}
}


Expand All @@ -110,16 +110,16 @@ a {
* Blockquotes
*/
blockquote {
color: $grey-color;
border-left: 4px solid $grey-color-light;
padding-left: $spacing-unit / 2;
font-size: 18px;
letter-spacing: -1px;
font-style: italic;
color: $grey-color;
border-left: 4px solid $grey-color-light;
padding-left: $spacing-unit / 2;
font-size: 18px;
letter-spacing: -1px;
font-style: italic;

> :last-child {
margin-bottom: 0;
}
> :last-child {
margin-bottom: 0;
}
}


Expand All @@ -129,25 +129,25 @@ blockquote {
*/
pre,
code {
font-size: 15px;
border: 1px solid $grey-color-light;
border-radius: 3px;
background-color: #eef;
font-size: 15px;
border: 1px solid $grey-color-light;
border-radius: 3px;
background-color: #eef;
}

code {
padding: 1px 5px;
padding: 1px 5px;
}

pre {
padding: 8px 12px;
overflow-x: auto;
padding: 8px 12px;
overflow-x: auto;

> code {
border: 0;
padding-right: 0;
padding-left: 0;
}
> code {
border: 0;
padding-right: 0;
padding-left: 0;
}
}


Expand All @@ -156,20 +156,20 @@ pre {
* Wrapper
*/
.wrapper {
max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit} * 2));
max-width: calc(#{$content-width} - (#{$spacing-unit} * 2));
margin-right: auto;
margin-left: auto;
padding-right: $spacing-unit;
padding-left: $spacing-unit;
@extend %clearfix;

@include media-query($on-laptop) {
max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit}));
max-width: calc(#{$content-width} - (#{$spacing-unit}));
padding-right: $spacing-unit / 2;
padding-left: $spacing-unit / 2;
}
max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit} * 2));
max-width: calc(#{$content-width} - (#{$spacing-unit} * 2));
margin-right: auto;
margin-left: auto;
padding-right: $spacing-unit;
padding-left: $spacing-unit;
@extend %clearfix;

@include media-query($on-laptop) {
max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit}));
max-width: calc(#{$content-width} - (#{$spacing-unit}));
padding-right: $spacing-unit / 2;
padding-left: $spacing-unit / 2;
}
}


Expand All @@ -178,9 +178,9 @@ pre {
* Clearfix
*/
%clearfix:after {
content: "";
display: table;
clear: both;
content: "";
display: table;
clear: both;
}


Expand All @@ -189,10 +189,10 @@ pre {
* Icons
*/
.icon > svg {
display: inline-block;
vertical-align: middle;
display: inline-block;
vertical-align: middle;

path {
fill: $grey-color;
}
path {
fill: $grey-color;
}
}
Loading

0 comments on commit e4c9d1e

Please sign in to comment.