Skip to content

Commit

Permalink
Merge pull request #8 from ravasthi/package-upgrades
Browse files Browse the repository at this point in the history
Package upgrades
  • Loading branch information
ravasthi authored Dec 2, 2017
2 parents dd1d51b + d324017 commit 682e9aa
Show file tree
Hide file tree
Showing 5 changed files with 472 additions and 119 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "css3-foundation",
"version": "6.0.3",
"version": "6.1.0",
"description": "A simple CSS3/HTML5 bootstrap for static sites and web apps",
"main": "index.html",
"repository": "[email protected]:ravasthi/css3-foundation.git",
Expand All @@ -24,7 +24,7 @@
"sass-loader": "^6.0.6",
"style-loader": "0.19.0",
"stylelint": "^8.1.1",
"stylelint-config-standard": "^17.0.0",
"stylelint-config-standard": "^18.0.0",
"stylelint-order": "0.7.0",
"susy": "^3.0.1",
"url-loader": "0.6.2",
Expand Down
122 changes: 61 additions & 61 deletions source/styles/shared/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -155,42 +155,61 @@ a.button {
text-decoration: none;
}

/*----------[ form layout ]-----------------------------------------------------
*/
.field {
input + span.form-help {
margin-left: $horizontal-spacing / 2;
}

/*---------------[ forms in tables ]--------------------------------------------
*/
table.form {
margin-top: 0;
input + p.form-help {
margin-top: $vertical-nudge;
margin-left: $horizontal-nudge;
}
}

/*----------[ validation ]------------------------------------------------------
*/
.error {
&,
th,
td {
border-style: none;
td,
th {
background-color: lighten($error-feedback, 55);
}

.section-heading th {
color: $form-section-heading-text-color;
label,
.form-help {
color: $error-feedback;
}

font-weight: $form-section-heading-text-weight;
label {
font-weight: bold;
}

.field-label {
padding-right: $horizontal-spacing;
input[type=email],
input[type=password],
input[type=search],
input[type=tel],
input[type=text],
input[type=url],
select,
textarea {
border-color: darken($error-feedback, 5);
}

line-height: $button-height;
font-weight: normal;
ul.error-explanation {
margin: $vertical-nudge;
margin-left: $horizontal-spacing;

text-align: right;
vertical-align: top;
}
color: $error-feedback;

.field,
.button-bar {
padding-left: 0;
@include secondary-text;
}
}

/*----------[ form layout ]-----------------------------------------------------
*/

/*---------------[ stacked forms ]----------------------------------------------
*/
.stacked,
.radio-group,
.checkbox-group {
Expand All @@ -199,19 +218,6 @@ table.form {
}
}

.field {
input + span.form-help {
margin-left: $horizontal-spacing / 2;
}

input + p.form-help {
margin-top: $vertical-nudge;
margin-left: $horizontal-nudge;
}
}

/*---------------[ stacked forms ]----------------------------------------------
*/
.stacked {
margin-left: -$horizontal-nudge;

Expand All @@ -232,42 +238,36 @@ table.form {
}
}

/*----------[ validation ]------------------------------------------------------
/*---------------[ forms in tables ]--------------------------------------------
*/
.error {
table.form {
margin-top: 0;

&,
td,
th {
background-color: lighten($error-feedback, 55);
th,
td {
border-style: none;
}

label,
.form-help {
color: $error-feedback;
}
.section-heading th {
color: $form-section-heading-text-color;

label {
font-weight: bold;
font-weight: $form-section-heading-text-weight;
}

input[type=email],
input[type=password],
input[type=search],
input[type=tel],
input[type=text],
input[type=url],
select,
textarea {
border-color: darken($error-feedback, 5);
}
.field-label {
padding-right: $horizontal-spacing;

ul.error-explanation {
margin: $vertical-nudge;
margin-left: $horizontal-spacing;
line-height: $button-height;
font-weight: normal;

color: $error-feedback;
text-align: right;
vertical-align: top;
}

@include secondary-text;
.field,
.button-bar {
padding-left: 0;
}
}

Expand Down
34 changes: 20 additions & 14 deletions source/styles/shared/_foundation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,11 @@ em {
font-style: italic;
}

ol,
ul {
margin-left: $horizontal-spacing;
}

h1 {
margin-bottom: $section-spacing;
padding: 0;
Expand Down Expand Up @@ -141,11 +146,7 @@ hr {
background-color: $stroke;
}

ol,
ul {
margin-left: $horizontal-spacing;
}

/* stylelint-disable-next-line no-descending-specificity */
ol {
list-style-type: decimal;

Expand All @@ -158,12 +159,19 @@ ol {
}
}

/* stylelint-disable-next-line no-descending-specificity */
ul {
list-style-type: disc;
}

/* stylelint-disable no-descending-specificity */
dl dl,
ol ol,
ul ul {
margin-top: 0;
margin-bottom: 0;
}
/* stylelint-enable no-descending-specificity */

code,
pre {
Expand Down Expand Up @@ -212,9 +220,8 @@ table {
width: 100%;
}

table,
thead th {
border-bottom: 2px solid $light-stroke;
th {
text-align: left;
}

td,
Expand All @@ -231,18 +238,17 @@ th {
}
}

th {
text-align: left;
/* stylelint-disable no-descending-specificity */
table,
thead th {
border-bottom: 2px solid $light-stroke;
}

tbody th,
td {
border-bottom: 1px solid $light-stroke;
}

ul {
list-style-type: disc;
}
/* stylelint-enable no-descending-specificity */

/*----------[ non-semantic styles ]---------------------------------------------
** Purely presentational styles with non-semantic names.
Expand Down
5 changes: 3 additions & 2 deletions source/styles/shared/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,11 @@
@content;
}

&:-moz-placeholder { /* Firefox 18- */
&::-moz-placeholder { /* Firefox 19+ */
@content;
}

&::-moz-placeholder { /* Firefox 19+ */
&:-moz-placeholder { /* Firefox 18- */
@content;
}

Expand Down Expand Up @@ -249,6 +249,7 @@
}
}

/* stylelint-disable-next-line no-descending-specificity */
.parallax-layer {
position: absolute;
top: 0;
Expand Down
Loading

0 comments on commit 682e9aa

Please sign in to comment.