Skip to content

Commit

Permalink
chores: Remove the extends
Browse files Browse the repository at this point in the history
  rename some objects
  add some missing element in the font size reset

Issues #84 #91 #92
  • Loading branch information
Plou committed Feb 1, 2017
1 parent d1c4033 commit 3d28f1c
Show file tree
Hide file tree
Showing 16 changed files with 74 additions and 106 deletions.
20 changes: 10 additions & 10 deletions css/src/elements/_forms.scss
Expand Up @@ -7,15 +7,15 @@

$type-list: text tel email url search date time datetime month week number;
@each $type in $type-list {
[type="#{$type}"] { @extend %input; }
}

/// Reset
input, select, textarea { font-family: $font; }
fieldset { margin: 0; border: none; padding: 0; }
select { width: auto; cursor: pointer; }

input, select, textarea, label { vertical-align: middle; }
[type="#{$type}"] {
border: 1px solid $black; border-radius: 3px; background-color: $white;

&:focus { outline: none; }
}
}
select,
textarea { @extend %input; }
textarea {
border: 1px solid $black; border-radius: 3px; background-color: $white;

&:focus { outline: none; }
}
30 changes: 24 additions & 6 deletions css/src/elements/_headings.scss
Expand Up @@ -4,10 +4,28 @@
/// @group Elements
///
////
h1 { @extend %h1; }
h2 { @extend %h2; }
h3 { @extend %h3; }
h4 { @extend %h4; }
h5 { @extend %h5; }
h6 { @extend %h6; }
h1 {
margin: 25px 0;
font-size: 3.5em;
}
h2 {
margin: 25px 0;
font-size: 2.4em;
}
h3 {
margin: 25px 0;
font-size: 2em;
}
h4 {
margin: 20px 0;
font-size: 1.8em;
}
h5 {
margin: 20px 0;
font-size: 1.6em;
}
h6 {
margin: 15px 0;
font-size: 1.4em;
}
h1, h2, h3, h4, h5, h6 { line-height: 1; font-weight: $fw-bold; }
11 changes: 10 additions & 1 deletion css/src/generic/_reset.scss
Expand Up @@ -18,7 +18,8 @@ body {
}

/// Reset nested font-size
blockquote p,td p,th p,li li,li p,li h1,li h2,li h3,li h4,li h5,li h6,button { font-size: 100%; }
blockquote p,td p,th p,li li,li p,li h1,li h2,li h3,li h4,li h5,li h6,li label,li select, li input, li textarea, li button { font-size: 100%; }


// Links & buttons
button { display: inline; margin: 0; border: none; padding: 0; outline: none; cursor: pointer; }
Expand All @@ -29,3 +30,11 @@ img { max-width: 100%; height: auto;}

// Separator
hr { border: none; height: 1px; background-color: $black; }


// Forms
input, select, textarea { font-family: $font; }
fieldset { margin: 0; border: none; padding: 0; }
select { width: auto; cursor: pointer; }

input, select, textarea, label { vertical-align: middle; }
18 changes: 7 additions & 11 deletions css/src/main.scss
Expand Up @@ -14,27 +14,23 @@
@import 'generic/reset';

// Tools (helper, mixins and function)
@import 'tools/headings';
@import 'tools/list-horizontal';
@import 'tools/input';
@import 'tools/page-sized';
@import 'tools/link-block';
// @import 'tools/';


// Base
@import 'elements/body';
@import 'elements/blocks';
@import 'elements/forms';
@import 'elements/headings';
@import 'elements/body';
@import 'elements/forms';
@import 'elements/links';

// Objects
@import 'objects/alignements';
@import 'objects/container';
@import 'objects/list-inline';
@import 'objects/link-block';
@import 'objects/forms';
@import 'objects/alignements';
@import 'objects/highlights';
@import 'objects/list-horizontal';
@import 'objects/page-sized';
@import 'objects/link-block';

// Components

Expand Down
5 changes: 4 additions & 1 deletion css/src/objects/_alignements.scss
Expand Up @@ -7,4 +7,7 @@
.align-left { text-align: left; }
.align-center { text-align: center; }
.align-right { text-align: right; }
.align-justify { text-align: justify; }
.align-justify {
text-align: justify;
&.align-center { text-align-last: center; }
}
10 changes: 10 additions & 0 deletions css/src/objects/_container.scss
@@ -0,0 +1,10 @@
////
/// Page
///
/// @group Objects
///
////

.container {
margin: auto; padding: 0 $page-padding; width: $max-width; max-width: 100%;
}
6 changes: 5 additions & 1 deletion css/src/objects/_link-block.scss
@@ -1 +1,5 @@
.link-block { @extend %link-block; }
.link-block {
display: block; color: inherit;

&:hover { text-decoration: none; }
}
7 changes: 0 additions & 7 deletions css/src/objects/_list-horizontal.scss

This file was deleted.

@@ -1,11 +1,10 @@
////
/// Transform a list into a vertical spaced list
/// Navigation
///
/// @group Tools
/// @group Objects
///
////

%list-horizontal {
.list-inline {
display: block; margin: 0; padding: 0;

> * { display: inline-block; margin: 5px; padding: 0; }
Expand Down
8 changes: 0 additions & 8 deletions css/src/objects/_page-sized.scss

This file was deleted.

Empty file added css/src/tools/.gitkeep
Empty file.
31 changes: 0 additions & 31 deletions css/src/tools/_headings.scss

This file was deleted.

10 changes: 0 additions & 10 deletions css/src/tools/_input.scss

This file was deleted.

5 changes: 0 additions & 5 deletions css/src/tools/_link-block.scss

This file was deleted.

10 changes: 0 additions & 10 deletions css/src/tools/_page-sized.scss

This file was deleted.

2 changes: 1 addition & 1 deletion index.html
Expand Up @@ -32,7 +32,7 @@ <h1><img src="https://raw.githubusercontent.com/dummy-team/dummy/gh-pages/img/du
<div id="footer" class="footer">
<div class="page-sized align-center">
<!--nav-bottom-->
<ul id="nav-footer" class="list-horizontal nav nav-footer">
<ul id="nav-footer" class="list-inline nav nav-footer">
<li><a href="https://github.com/dummy-team/dummy" target="_blank">Dummy Team</a></li>
<li><a href="https://dummy-team.github.io/dummy" target="_blank">Project home</a></li>
<li><a href="https://github.com/dummy-team/dummy" target="_blank">Github</a></li>
Expand Down

0 comments on commit 3d28f1c

Please sign in to comment.