Skip to content

Commit

Permalink
Lots of improvements to the structure. Bower and Composer support.
Browse files Browse the repository at this point in the history
  • Loading branch information
hperrin committed Dec 21, 2014
1 parent a3404ad commit 6a40839
Show file tree
Hide file tree
Showing 18 changed files with 919 additions and 873 deletions.
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ PFORM_IELT8_LESS = ./less/pform-ie-lt-8.less
#

build:
recess --compile ${PFORM_LESS} > pform.css
recess --compress ${PFORM_LESS} > pform.min.css
recess --compile ${PFORM_BOOTSTRAP_LESS} > pform-bootstrap.css
recess --compress ${PFORM_BOOTSTRAP_LESS} > pform-bootstrap.min.css
recess --compile ${PFORM_IELT6_LESS} > pform-ie-lt-6.css
recess --compress ${PFORM_IELT6_LESS} > pform-ie-lt-6.min.css
recess --compile ${PFORM_IELT8_LESS} > pform-ie-lt-8.css
recess --compress ${PFORM_IELT8_LESS} > pform-ie-lt-8.min.css
recess --compile ${PFORM_LESS} > css/pform.css
recess --compress ${PFORM_LESS} > css/pform.min.css
recess --compile ${PFORM_BOOTSTRAP_LESS} > css/pform-bootstrap.css
recess --compress ${PFORM_BOOTSTRAP_LESS} > css/pform-bootstrap.min.css
recess --compile ${PFORM_IELT6_LESS} > css/pform-ie-lt-6.css
recess --compress ${PFORM_IELT6_LESS} > css/pform-ie-lt-6.min.css
recess --compile ${PFORM_IELT8_LESS} > css/pform-ie-lt-8.css
recess --compress ${PFORM_IELT8_LESS} > css/pform-ie-lt-8.min.css
15 changes: 15 additions & 0 deletions bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"name": "pform",
"version": "3.2",
"main": "css/pform.css",
"ignore": [
"*.html",
"composer.json",
"includes"
],
"keywords": [
"form layout",
"html",
"css"
]
}
30 changes: 30 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"name": "sciactive/pform",
"description": "Pixel perfect CSS form layouts.",
"version": "3.2",
"type": "library",
"keywords": [
"form layout",
"html",
"css"
],
"homepage": "http://sciactive.com/pform/",
"time": "2014-12-21",
"license": "LGPL",
"authors": [
{
"name": "Hunter Perrin",
"email": "[email protected]",
"homepage": "https://github.com/hperrin",
"role": "Developer"
}
],
"support": {
"issues": "https://github.com/sciactive/pform/issues",
"wiki": "https://github.com/sciactive/pform/wiki",
"source": "https://github.com/sciactive/pform"
},
"archive": {
"exclude": ["*.html", "bower.json", "includes"]
}
}
File renamed without changes.
1 change: 1 addition & 0 deletions css/pform-bootstrap.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
69 changes: 51 additions & 18 deletions pform.css → css/pform.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
PForm 3.1
PForm 3.2
license: http://www.gnu.org/licenses/gpl.html
license: http://www.gnu.org/licenses/lgpl.html
Expand All @@ -8,180 +8,210 @@ author: Hunter Perrin <[email protected]>
copyright: SciActive.com
link: http://sciactive.com/pform/
*/

.pf-form:after,
.pf-form fieldset:after {
content: ".";
display: block;
height: 0;
clear: both;
content: ".";
visibility: hidden;
}

.pf-form fieldset {
padding: 5.6px 10px 12px;
border: 1px solid #cccccc;
}

.pf-form fieldset.pf-group {
display: block;
clear: left;
margin-bottom: 25px;
clear: left;
}

.pf-form .pf-clearing {
clear: both;
height: 1px;
clear: both;
}

.pf-form .pf-element {
float: left;
clear: left;
padding-bottom: 25px;
clear: left;
}

.pf-form .pf-element.pf-full-width {
width: 100%;
}

.pf-form .pf-element .pf-label,
.pf-form .pf-element .pf-note {
width: 180px;
float: left;
width: 180px;
}

.pf-form .pf-element .pf-note {
margin-top: .5em;
clear: left;
font-size: 75%;
opacity: .8;
}

.pf-form .pf-element .pf-required {
color: #ff0000;
}

.pf-form .pf-element .pf-completed,
.pf-form .pf-element.pf-completed .pf-required {
color: #00cc00;
}

.pf-form .pf-element .pf-field {
float: none;
margin-left: 15px;
}

.pf-form .pf-element .pf-field.pf-full-width {
display: block;
margin-left: 195px;
}

.pf-form .pf-element .pf-group {
margin-left: 180px;
display: block;
margin-left: 180px;
}

.pf-form .pf-element .pf-group .pf-note {
display: inline;
width: auto;
margin-top: 0;
text-align: left;
clear: none;
text-align: left;
}

.pf-form.pf-labels-right .pf-label,
.pf-form .pf-labels-right .pf-label,
.pf-form.pf-labels-right .pf-note,
.pf-form .pf-labels-right .pf-note {
text-align: right;
}

.pf-form .pf-labels-right.pf-note,
.pf-form .pf-labels-right.pf-label {
text-align: right;
}

.pf-form.pf-labels-left .pf-label,
.pf-form .pf-labels-left .pf-label,
.pf-form.pf-labels-left .pf-note,
.pf-form .pf-labels-left .pf-note {
text-align: left;
}

.pf-form .pf-labels-left.pf-note,
.pf-form .pf-labels-left.pf-label {
text-align: left;
}

.pf-form .pf-buttons {
clear: both;
padding-bottom: 0;
padding-left: 175px;
clear: both;
}

.pf-form .pf-buttons.pf-centered {
width: 100%;
padding-left: 0;
text-align: center;
}

.pf-form .pf-buttons .pf-button {
float: none;
margin-left: 20px;
margin-bottom: 20px;
margin-left: 20px;
}

.pf-form .pf-heading {
width: 100%;
border-bottom: 1px solid #cccccc;
padding-bottom: 0;
margin-bottom: 20px;
border-bottom: 1px solid #cccccc;
}

.pf-form.pf-layout-block .pf-element .pf-label,
.pf-form .pf-layout-block .pf-element .pf-label,
.pf-form .pf-element.pf-layout-block .pf-label,
.pf-form.pf-layout-block .pf-element .pf-note,
.pf-form .pf-layout-block .pf-element .pf-note,
.pf-form .pf-element.pf-layout-block .pf-note {
width: auto;
float: none;
display: block;
float: none;
width: auto;
margin-bottom: 5px;
}

.pf-form.pf-layout-block .pf-element .pf-group,
.pf-form .pf-layout-block .pf-element .pf-group,
.pf-form .pf-element.pf-layout-block .pf-group {
margin-left: 0;
}

.pf-form.pf-layout-block .pf-element .pf-group .pf-note,
.pf-form .pf-layout-block .pf-element .pf-group .pf-note,
.pf-form .pf-element.pf-layout-block .pf-group .pf-note {
display: inline;
width: auto;
margin-top: 0;
text-align: left;
clear: none;
text-align: left;
}

.pf-form.pf-layout-block .pf-element .pf-field,
.pf-form .pf-layout-block .pf-element .pf-field,
.pf-form .pf-element.pf-layout-block .pf-field {
float: none;
margin-left: 0;
}

.pf-form.pf-layout-block .pf-element .pf-field.pf-full-width,
.pf-form .pf-layout-block .pf-element .pf-field.pf-full-width,
.pf-form .pf-element.pf-layout-block .pf-field.pf-full-width {
display: block;
margin-left: 0;
}

.pf-form.pf-layout-block .pf-buttons,
.pf-form .pf-layout-block .pf-buttons,
.pf-form .pf-buttons.pf-layout-block {
padding-left: 0;
margin-left: -20px;
}

@media print {
.pf-form {
display: block;
}
}

@media (max-width: 480px) {
.pf-form {
display: block;
}
.pf-form .pf-element {
float: none;
clear: left;
margin-bottom: 10px;
clear: left;
}
.pf-form .pf-element.pf-full-width .pf-full-width {
padding-right: .2em;
}
.pf-form .pf-element .pf-label,
.pf-form .pf-element .pf-note {
text-align: left;
display: block;
float: none;
width: auto;
display: block;
margin-bottom: .1em;
text-align: left;
}
.pf-form .pf-element .pf-field {
margin-top: 5px;
Expand All @@ -190,8 +220,8 @@ link: http://sciactive.com/pform/
margin-left: 0;
}
.pf-form .pf-element .pf-group {
margin-left: 0 !important;
display: block;
margin-left: 0 !important;
}
.pf-form .pf-buttons {
padding-left: 0;
Expand All @@ -200,6 +230,7 @@ link: http://sciactive.com/pform/
margin-top: 5px;
}
}

@media (min-width: 481px) and (max-width: 767px) {
.pf-form .pf-element .pf-label,
.pf-form .pf-element .pf-note {
Expand All @@ -226,6 +257,7 @@ link: http://sciactive.com/pform/
margin-left: -15px;
}
}

@media (min-width: 1281px) and (max-width: 1839px) {
.pf-form .pf-element .pf-label,
.pf-form .pf-element .pf-note {
Expand All @@ -252,6 +284,7 @@ link: http://sciactive.com/pform/
margin-left: -20px;
}
}

@media (min-width: 1840px) {
.pf-form .pf-element .pf-label,
.pf-form .pf-element .pf-note {
Expand Down
1 change: 1 addition & 0 deletions css/pform.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 12 additions & 9 deletions includes/style.css
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
/*
Sub-Project Page Styling
SciActive Mini-Project Page Styling
Copyright (C) 2012 SciActive.com. All Rights Reserved.
*/
.page-banner {
padding: 200px 0 170px;
text-align: center;
overflow: hidden;
}
.page-banner, .page-points, .page-section {
margin-bottom: 230px;
}
.page-banner h1 {
font-size: 70px;
line-height: 65px;
line-height: 70px;
}
.page-banner p {
font-size: 30px;
line-height: 48px;
margin-top: 25px;
font-size: 20px;
line-height: 24px;
}
.page-banner .btn-large {
margin-top: 30px;
Expand All @@ -22,6 +26,9 @@ Copyright (C) 2012 SciActive.com. All Rights Reserved.
.page-banner .right-button {
margin-left: 20px;
}
.intro-section {
margin-bottom: 30px;
}
.page-points .row-fluid {
margin-bottom: 30px;
}
Expand Down Expand Up @@ -55,13 +62,9 @@ body .pf-form .pf-heading * {
.page-points .row-fluid {
margin-bottom: 0;
}
#sections {
.container {
padding: 0 .4em;
}
#sections .container-fluid {
padding-left: 0;
padding-right: 0;
}
#fb-root {
display: none; /* Facebook's code makes a horizontal scrollbar. Grr. */
}
Expand Down
Loading

0 comments on commit 6a40839

Please sign in to comment.