mirror of
https://github.com/locomotivemtl/locomotive-boilerplate.git
synced 2026-01-15 00:55:08 +08:00
Merge branch 'master' of https://github.com/stephenbe/locomotive-boilerplate
Conflicts: project-x/Gruntfile.js project-x/assets/styles/dist/main.css project-x/assets/styles/src/_import.scss project-x/assets/styles/src/base/_base.scss project-x/assets/styles/src/base/_forms.scss
This commit is contained in:
Stephen
1
.gitignore
vendored
1
.gitignore
vendored
@@ -2,3 +2,4 @@
|
||||
/boilerplate.sublime-workspace
|
||||
project-x/node_modules/
|
||||
project-x/.sass-cache/
|
||||
project-x/npm-debug.log
|
||||
|
||||
@@ -30,6 +30,7 @@ module.exports = function(grunt) {
|
||||
dest: 'assets/styles/src/'
|
||||
}
|
||||
},
|
||||
|
||||
autoprefixer: {
|
||||
build: {
|
||||
options: {
|
||||
|
||||
328
project-x/assets/styles/dist/main.css
vendored
328
project-x/assets/styles/dist/main.css
vendored
@@ -22,6 +22,7 @@
|
||||
/* Transitions
|
||||
========================================================================== */
|
||||
/* ==========================================================================
|
||||
<<<<<<< HEAD
|
||||
Base
|
||||
========================================================================== */
|
||||
*, *:before, *:after {
|
||||
@@ -131,6 +132,8 @@ a {
|
||||
width: span(0.2); } }
|
||||
|
||||
/* ==========================================================================
|
||||
=======
|
||||
>>>>>>> df5d306088635c119947b46a6aafbb6d67a1c502
|
||||
Functions
|
||||
========================================================================== */
|
||||
/* ==========================================================================
|
||||
@@ -139,7 +142,12 @@ a {
|
||||
/* ==========================================================================
|
||||
Helpers
|
||||
========================================================================== */
|
||||
<<<<<<< HEAD
|
||||
.clearfix:before, .clearfix:after {
|
||||
=======
|
||||
.clearfix:before,
|
||||
.clearfix:after {
|
||||
>>>>>>> df5d306088635c119947b46a6aafbb6d67a1c502
|
||||
content: " ";
|
||||
display: table; }
|
||||
|
||||
@@ -158,6 +166,76 @@ a {
|
||||
display: inline-block;
|
||||
vertical-align: middle; }
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
/* ==========================================================================
|
||||
Trumps
|
||||
========================================================================== */
|
||||
.left {
|
||||
float: left !important; }
|
||||
|
||||
.right {
|
||||
float: right !important; }
|
||||
|
||||
.align-left {
|
||||
text-align: left !important; }
|
||||
|
||||
.align-right {
|
||||
text-align: right !important; }
|
||||
|
||||
.align-center {
|
||||
text-align: center !important; }
|
||||
|
||||
.is-visible {
|
||||
visibility: visible !important;
|
||||
opacity: 1 !important; }
|
||||
|
||||
.is-hidden {
|
||||
visibility: hidden !important;
|
||||
opacity: 0 !important; }
|
||||
|
||||
/* Accessibility
|
||||
========================================================================== */
|
||||
/*
|
||||
* Hide visually and from screen readers: h5bp.com/u
|
||||
*/
|
||||
.hidden {
|
||||
display: none !important;
|
||||
visibility: hidden; }
|
||||
|
||||
/*
|
||||
* Hide only visually, but have it available for screen readers: h5bp.com/v
|
||||
*/
|
||||
.visuallyhidden {
|
||||
border: 0;
|
||||
clip: rect(0 0 0 0);
|
||||
height: 1px;
|
||||
margin: -1px;
|
||||
overflow: hidden;
|
||||
padding: 0;
|
||||
position: absolute;
|
||||
width: 1px; }
|
||||
|
||||
/*
|
||||
* Extends the .visuallyhidden class to allow the element to be focusable
|
||||
* when navigated to via the keyboard: h5bp.com/p
|
||||
*/
|
||||
.visuallyhidden.focusable:active,
|
||||
.visuallyhidden.focusable:focus {
|
||||
clip: auto;
|
||||
height: auto;
|
||||
margin: 0;
|
||||
overflow: visible;
|
||||
position: static;
|
||||
width: auto; }
|
||||
|
||||
/*
|
||||
* Hide visually and from screen readers, but maintain layout
|
||||
*/
|
||||
.invisible {
|
||||
visibility: hidden; }
|
||||
|
||||
>>>>>>> df5d306088635c119947b46a6aafbb6d67a1c502
|
||||
/*! normalize.css v3.0.1 | MIT License | git.io/normalize */
|
||||
/**
|
||||
* 1. Set default font family to sans-serif.
|
||||
@@ -185,14 +263,36 @@ body {
|
||||
* Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox.
|
||||
* Correct `block` display not defined for `main` in IE 11.
|
||||
*/
|
||||
<<<<<<< HEAD
|
||||
article, aside, details, figcaption, figure, footer, header, hgroup, main, nav, section, summary {
|
||||
=======
|
||||
article,
|
||||
aside,
|
||||
details,
|
||||
figcaption,
|
||||
figure,
|
||||
footer,
|
||||
header,
|
||||
hgroup,
|
||||
main,
|
||||
nav,
|
||||
section,
|
||||
summary {
|
||||
>>>>>>> df5d306088635c119947b46a6aafbb6d67a1c502
|
||||
display: block; }
|
||||
|
||||
/**
|
||||
* 1. Correct `inline-block` display not defined in IE 8/9.
|
||||
* 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
|
||||
*/
|
||||
<<<<<<< HEAD
|
||||
audio, canvas, progress, video {
|
||||
=======
|
||||
audio,
|
||||
canvas,
|
||||
progress,
|
||||
video {
|
||||
>>>>>>> df5d306088635c119947b46a6aafbb6d67a1c502
|
||||
display: inline-block;
|
||||
/* 1 */
|
||||
vertical-align: baseline;
|
||||
@@ -210,7 +310,12 @@ audio:not([controls]) {
|
||||
* Address `[hidden]` styling not present in IE 8/9/10.
|
||||
* Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
|
||||
*/
|
||||
<<<<<<< HEAD
|
||||
[hidden], template {
|
||||
=======
|
||||
[hidden],
|
||||
template {
|
||||
>>>>>>> df5d306088635c119947b46a6aafbb6d67a1c502
|
||||
display: none; }
|
||||
|
||||
/* Links
|
||||
@@ -224,7 +329,12 @@ a {
|
||||
/**
|
||||
* Improve readability when focused and also mouse hovered in all browsers.
|
||||
*/
|
||||
<<<<<<< HEAD
|
||||
a:active, a:hover {
|
||||
=======
|
||||
a:active,
|
||||
a:hover {
|
||||
>>>>>>> df5d306088635c119947b46a6aafbb6d67a1c502
|
||||
outline: 0; }
|
||||
|
||||
/* Text-level semantics
|
||||
@@ -238,7 +348,12 @@ abbr[title] {
|
||||
/**
|
||||
* Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
|
||||
*/
|
||||
<<<<<<< HEAD
|
||||
b, strong {
|
||||
=======
|
||||
b,
|
||||
strong {
|
||||
>>>>>>> df5d306088635c119947b46a6aafbb6d67a1c502
|
||||
font-weight: bold; }
|
||||
|
||||
/**
|
||||
@@ -271,7 +386,12 @@ small {
|
||||
/**
|
||||
* Prevent `sub` and `sup` affecting `line-height` in all browsers.
|
||||
*/
|
||||
<<<<<<< HEAD
|
||||
sub, sup {
|
||||
=======
|
||||
sub,
|
||||
sup {
|
||||
>>>>>>> df5d306088635c119947b46a6aafbb6d67a1c502
|
||||
font-size: 75%;
|
||||
line-height: 0;
|
||||
position: relative;
|
||||
@@ -321,7 +441,14 @@ pre {
|
||||
/**
|
||||
* Address odd `em`-unit font size rendering in all browsers.
|
||||
*/
|
||||
<<<<<<< HEAD
|
||||
code, kbd, pre, samp {
|
||||
=======
|
||||
code,
|
||||
kbd,
|
||||
pre,
|
||||
samp {
|
||||
>>>>>>> df5d306088635c119947b46a6aafbb6d67a1c502
|
||||
font-family: monospace, monospace;
|
||||
font-size: 1em; }
|
||||
|
||||
@@ -337,7 +464,15 @@ code, kbd, pre, samp {
|
||||
* 2. Correct font properties not being inherited.
|
||||
* 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
|
||||
*/
|
||||
<<<<<<< HEAD
|
||||
button, input, optgroup, select, textarea {
|
||||
=======
|
||||
button,
|
||||
input,
|
||||
optgroup,
|
||||
select,
|
||||
textarea {
|
||||
>>>>>>> df5d306088635c119947b46a6aafbb6d67a1c502
|
||||
color: inherit;
|
||||
/* 1 */
|
||||
font: inherit;
|
||||
@@ -357,7 +492,12 @@ button {
|
||||
* Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
|
||||
* Correct `select` style inheritance in Firefox.
|
||||
*/
|
||||
<<<<<<< HEAD
|
||||
button, select {
|
||||
=======
|
||||
button,
|
||||
select {
|
||||
>>>>>>> df5d306088635c119947b46a6aafbb6d67a1c502
|
||||
text-transform: none; }
|
||||
|
||||
/**
|
||||
@@ -367,7 +507,14 @@ button, select {
|
||||
* 3. Improve usability and consistency of cursor style between image-type
|
||||
* `input` and others.
|
||||
*/
|
||||
<<<<<<< HEAD
|
||||
button, html input[type="button"], input[type="reset"], input[type="submit"] {
|
||||
=======
|
||||
button,
|
||||
html input[type="button"],
|
||||
input[type="reset"],
|
||||
input[type="submit"] {
|
||||
>>>>>>> df5d306088635c119947b46a6aafbb6d67a1c502
|
||||
-webkit-appearance: button;
|
||||
/* 2 */
|
||||
cursor: pointer;
|
||||
@@ -376,13 +523,23 @@ button, html input[type="button"], input[type="reset"], input[type="submit"] {
|
||||
/**
|
||||
* Re-set default cursor for disabled elements.
|
||||
*/
|
||||
<<<<<<< HEAD
|
||||
button[disabled], html input[disabled] {
|
||||
=======
|
||||
button[disabled],
|
||||
html input[disabled] {
|
||||
>>>>>>> df5d306088635c119947b46a6aafbb6d67a1c502
|
||||
cursor: default; }
|
||||
|
||||
/**
|
||||
* Remove inner padding and border in Firefox 4+.
|
||||
*/
|
||||
<<<<<<< HEAD
|
||||
button::-moz-focus-inner, input::-moz-focus-inner {
|
||||
=======
|
||||
button::-moz-focus-inner,
|
||||
input::-moz-focus-inner {
|
||||
>>>>>>> df5d306088635c119947b46a6aafbb6d67a1c502
|
||||
border: 0;
|
||||
padding: 0; }
|
||||
|
||||
@@ -400,7 +557,12 @@ input {
|
||||
* 1. Address box sizing set to `content-box` in IE 8/9/10.
|
||||
* 2. Remove excess padding in IE 8/9/10.
|
||||
*/
|
||||
<<<<<<< HEAD
|
||||
input[type="checkbox"], input[type="radio"] {
|
||||
=======
|
||||
input[type="checkbox"],
|
||||
input[type="radio"] {
|
||||
>>>>>>> df5d306088635c119947b46a6aafbb6d67a1c502
|
||||
box-sizing: border-box;
|
||||
/* 1 */
|
||||
padding: 0;
|
||||
@@ -411,7 +573,12 @@ input[type="checkbox"], input[type="radio"] {
|
||||
* `font-size` values of the `input`, it causes the cursor style of the
|
||||
* decrement button to change from `default` to `text`.
|
||||
*/
|
||||
<<<<<<< HEAD
|
||||
input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button {
|
||||
=======
|
||||
input[type="number"]::-webkit-inner-spin-button,
|
||||
input[type="number"]::-webkit-outer-spin-button {
|
||||
>>>>>>> df5d306088635c119947b46a6aafbb6d67a1c502
|
||||
height: auto; }
|
||||
|
||||
/**
|
||||
@@ -430,7 +597,12 @@ input[type="search"] {
|
||||
* Safari (but not Chrome) clips the cancel button when the search input has
|
||||
* padding (and `textfield` appearance).
|
||||
*/
|
||||
<<<<<<< HEAD
|
||||
input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration {
|
||||
=======
|
||||
input[type="search"]::-webkit-search-cancel-button,
|
||||
input[type="search"]::-webkit-search-decoration {
|
||||
>>>>>>> df5d306088635c119947b46a6aafbb6d67a1c502
|
||||
-webkit-appearance: none; }
|
||||
|
||||
/**
|
||||
@@ -473,6 +645,7 @@ table {
|
||||
border-collapse: collapse;
|
||||
border-spacing: 0; }
|
||||
|
||||
<<<<<<< HEAD
|
||||
td, th {
|
||||
padding: 0; }
|
||||
|
||||
@@ -541,3 +714,158 @@ td, th {
|
||||
*/
|
||||
.invisible {
|
||||
visibility: hidden; }
|
||||
=======
|
||||
td,
|
||||
th {
|
||||
padding: 0; }
|
||||
|
||||
/* ==========================================================================
|
||||
Fonts
|
||||
========================================================================== */
|
||||
/* ==========================================================================
|
||||
Base
|
||||
========================================================================== */
|
||||
*, *:before, *:after {
|
||||
box-sizing: inherit; }
|
||||
|
||||
html {
|
||||
box-sizing: border-box;
|
||||
font-size: 16px;
|
||||
font-family: sans-serif;
|
||||
line-height: 1.4;
|
||||
color: #222222; }
|
||||
|
||||
::-moz-selection {
|
||||
background: #b3d4fc;
|
||||
text-shadow: none; }
|
||||
|
||||
::selection {
|
||||
background: #b3d4fc;
|
||||
text-shadow: none; }
|
||||
|
||||
hr {
|
||||
display: block;
|
||||
height: 1px;
|
||||
border: 0;
|
||||
border-top: 1px solid #ccc;
|
||||
margin: 1em 0;
|
||||
padding: 0; }
|
||||
|
||||
img, svg {
|
||||
vertical-align: middle;
|
||||
max-width: 100%; }
|
||||
|
||||
textarea {
|
||||
resize: vertical; }
|
||||
|
||||
a {
|
||||
color: #1a0dab; }
|
||||
a:hover {
|
||||
color: #13097c; }
|
||||
|
||||
.container {
|
||||
position: relative;
|
||||
margin: 0 auto; }
|
||||
|
||||
/* ==========================================================================
|
||||
Headings
|
||||
========================================================================== */
|
||||
h1, .h1, .alpha {
|
||||
font-size: 32px;
|
||||
line-height: 1.2;
|
||||
margin-top: 0; }
|
||||
|
||||
h2, .h2, .beta {
|
||||
font-size: 24px;
|
||||
line-height: 1.2;
|
||||
margin-top: 0; }
|
||||
|
||||
h3, .h3, .gamma {
|
||||
font-size: 19px;
|
||||
line-height: 1.2;
|
||||
margin-top: 0; }
|
||||
|
||||
h4, .h4, .delta {
|
||||
font-size: 16px;
|
||||
line-height: 1.2;
|
||||
margin-top: 0; }
|
||||
|
||||
h5, .h5, .epsilon {
|
||||
font-size: 13px;
|
||||
line-height: 1.2;
|
||||
margin-top: 0; }
|
||||
|
||||
h6, .h6, .zeta {
|
||||
font-size: 11px;
|
||||
line-height: 1.2;
|
||||
margin-top: 0; }
|
||||
|
||||
/* ==========================================================================
|
||||
Grid
|
||||
========================================================================== */
|
||||
.grid {
|
||||
position: relative;
|
||||
margin-left: -20px;
|
||||
font-size: 0; }
|
||||
|
||||
.grid--full {
|
||||
margin-left: 0; }
|
||||
.grid--full .grid__item, .grid--full .whole, .grid--full .half, .grid--full .third, .grid--full .two-thirds, .grid--full .quarter, .grid--full .fifth {
|
||||
padding-left: 0;
|
||||
margin-bottom: 0; }
|
||||
|
||||
.grid__item, .whole, .half, .third, .two-thirds, .quarter, .fifth {
|
||||
display: inline-block;
|
||||
width: 100%;
|
||||
vertical-align: top;
|
||||
padding-left: 20px;
|
||||
margin-bottom: 20px; }
|
||||
|
||||
@media (min-width: 1024px) {
|
||||
.half {
|
||||
width: 50%; } }
|
||||
|
||||
@media (min-width: 1024px) {
|
||||
.third {
|
||||
width: 33.33333%; } }
|
||||
|
||||
@media (min-width: 1024px) {
|
||||
.two-thirds {
|
||||
width: 66.66667%; } }
|
||||
|
||||
@media (min-width: 768px) {
|
||||
.quarter {
|
||||
width: 50%; } }
|
||||
@media (min-width: 1024px) {
|
||||
.quarter {
|
||||
width: 25%; } }
|
||||
|
||||
@media (min-width: 768px) {
|
||||
.fifth {
|
||||
width: 50%; } }
|
||||
@media (min-width: 1024px) {
|
||||
.fifth {
|
||||
width: 20%; } }
|
||||
|
||||
/* ==========================================================================
|
||||
Forms
|
||||
========================================================================== */
|
||||
.input, .select, .checkbox {
|
||||
background-color: #cccccc;
|
||||
display: block;
|
||||
border: none;
|
||||
outline: none;
|
||||
color: black;
|
||||
border-radius: 0;
|
||||
-webkit-appearance: none;
|
||||
-moz-appearance: none;
|
||||
appearance: none; }
|
||||
|
||||
.select {
|
||||
min-width: 300px; }
|
||||
|
||||
.checkbox {
|
||||
display: inline-block;
|
||||
width: 30px;
|
||||
height: 30px; }
|
||||
>>>>>>> df5d306088635c119947b46a6aafbb6d67a1c502
|
||||
|
||||
8
project-x/assets/styles/src/_import.scss
vendored
8
project-x/assets/styles/src/_import.scss
vendored
@@ -17,12 +17,4 @@
|
||||
, "generic/helpers"
|
||||
, "generic/normalize"
|
||||
, "generic/trumps"
|
||||
|
||||
;
|
||||
|
||||
p {
|
||||
position: absolute;
|
||||
|
||||
color: red;
|
||||
border: 1px solid red;
|
||||
}
|
||||
|
||||
@@ -12,7 +12,10 @@ html {
|
||||
|
||||
box-sizing: border-box;
|
||||
|
||||
color: $body;
|
||||
font-size : $font-size;
|
||||
font-family : $font-family;
|
||||
line-height : $line-height;
|
||||
color : $color;
|
||||
}
|
||||
|
||||
::selection {
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
Forms
|
||||
========================================================================== */
|
||||
.input {
|
||||
|
||||
background-color: #cccccc;
|
||||
|
||||
display: block;
|
||||
|
||||
width: 100%;
|
||||
@@ -16,6 +19,15 @@
|
||||
appearance: none;
|
||||
}
|
||||
|
||||
.select {
|
||||
@extend .input;
|
||||
min-width: 300px;
|
||||
}
|
||||
|
||||
|
||||
.checkbox {
|
||||
@extend .input;
|
||||
display: inline-block;
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
}
|
||||
|
||||
|
||||
@@ -13,6 +13,16 @@
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<input class="input" type="text">
|
||||
<br><br>
|
||||
<input class="checkbox" type="checkbox">
|
||||
<input class="checkbox" type="checkbox">
|
||||
<br><br>
|
||||
<select class="select" name="" id="">
|
||||
<option value="">sdfds</option>
|
||||
<option value="">sdf</option>
|
||||
<option value="">sdfds</option>
|
||||
</select>
|
||||
|
||||
<script src="assets/scripts/dist/main.js"></script>
|
||||
</body>
|
||||
|
||||
Reference in New Issue
Block a user