Merge pull request #81 from ericf/code-formatting

Improve consistency of code formatting
This commit is contained in:
Tilo 2013-06-10 07:55:58 -07:00
commit ec4f27cc45
9 changed files with 114 additions and 123 deletions

View File

@ -22,12 +22,9 @@
transition: 0.1s linear box-shadow;
}
.pure-button-hover,
.pure-button:hover {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#00000000', GradientType=0);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(transparent), color-stop(40%, rgba(0,0,0, 0.05)), to(rgba(0,0,0, 0.05)));
background-image: -webkit-linear-gradient(transparent, rgba(0,0,0, 0.05) 40%, rgba(0,0,0, 0.15));
background-image: -moz-linear-gradient(top, rgba(0,0,0, 0.05) 0%, rgba(0,0,0, 0.05));
@ -57,7 +54,7 @@
}
.pure-button-hidden {
display:none;
display: none;
}
/* Firefox: Get rid of the inner focus border */

View File

@ -50,12 +50,13 @@
margin: 1.5em 0 0 0;
}
/* note: pure-help-inline is deprecated. Use .pure-form-message-inline instead */
/* NOTE: pure-help-inline is deprecated. Use .pure-form-message-inline instead. */
.pure-form .pure-help-inline,
.pure-form-message-inline,
.pure-form-message {
display: block;
font-size: 80%;
padding: 0.2em 0 0.8em; /* increased bottom padding to make it group with its related input element */
/* Increased bottom padding to make it group with its related input element. */
padding: 0.2em 0 0.8em;
}
}

View File

@ -14,21 +14,21 @@
.pure-form input[type="color"],
.pure-form select,
.pure-form textarea {
padding: 0.5em 0.6em;
display: inline-block;
border: 1px solid #ccc;
font-size: 0.8em;
box-shadow: inset 0 1px 3px #ddd;
border-radius: 4px;
-webkit-transition: 0.3s linear border;
-moz-transition: 0.3s linear border;
-ms-transition: 0.3s linear border;
-o-transition: 0.3s linear border;
transition: 0.3s linear border;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
-webkit-font-smoothing: antialiased;
padding: 0.5em 0.6em;
display: inline-block;
border: 1px solid #ccc;
font-size: 0.8em;
box-shadow: inset 0 1px 3px #ddd;
border-radius: 4px;
-webkit-transition: 0.3s linear border;
-moz-transition: 0.3s linear border;
-ms-transition: 0.3s linear border;
-o-transition: 0.3s linear border;
transition: 0.3s linear border;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
-webkit-font-smoothing: antialiased;
}
.pure-form input[type="text"]:focus,
@ -47,21 +47,21 @@
.pure-form input[type="color"]:focus,
.pure-form select:focus,
.pure-form textarea:focus {
outline: 0;
outline: thin dotted \9; /* IE6-9 */
border-color: #129FEA;
outline: 0;
outline: thin dotted \9; /* IE6-9 */
border-color: #129FEA;
}
.pure-form input[type="file"]:focus,
.pure-form input[type="radio"]:focus,
.pure-form input[type="checkbox"]:focus {
outline: thin dotted #333;
outline: 1px auto #129FEA;
outline: thin dotted #333;
outline: 1px auto #129FEA;
}
.pure-form .pure-checkbox,
.pure-form .pure-radio {
margin: 0.5em 0;
display: block;
margin: 0.5em 0;
display: block;
}
.pure-form input[type="text"][disabled],
.pure-form input[type="password"][disabled],
@ -82,52 +82,52 @@
.pure-form input[readonly],
.pure-form select[readonly],
.pure-form textarea[readonly] {
cursor: not-allowed;
background-color: #eaeded;
color: #cad2d3;
border-color: transparent;
cursor: not-allowed;
background-color: #eaeded;
color: #cad2d3;
border-color: transparent;
}
.pure-form input:focus:invalid,
.pure-form textarea:focus:invalid,
.pure-form select:focus:invalid {
color: #b94a48;
border: 1px solid #ee5f5b;
color: #b94a48;
border: 1px solid #ee5f5b;
}
.pure-form input:focus:invalid:focus,
.pure-form textarea:focus:invalid:focus,
.pure-form select:focus:invalid:focus {
border-color: #e9322d;
border-color: #e9322d;
}
.pure-form input[type="file"]:focus:invalid:focus,
.pure-form input[type="radio"]:focus:invalid:focus,
.pure-form input[type="checkbox"]:focus:invalid:focus {
outline-color: #e9322d;
outline-color: #e9322d;
}
.pure-form select {
border: 1px solid #ccc;
background-color: white;
border: 1px solid #ccc;
background-color: white;
}
.pure-form select[multiple] {
height: auto;
height: auto;
}
.pure-form label {
margin: 0.5em 0 0.2em;
color: #999;
font-size:90%;
margin: 0.5em 0 0.2em;
color: #999;
font-size: 90%;
}
.pure-form fieldset {
margin: 0;
padding: 0.35em 0 0.75em;
border: 0;
margin: 0;
padding: 0.35em 0 0.75em;
border: 0;
}
.pure-form legend {
display: block;
width: 100%;
padding: 0.3em 0;
margin-bottom: 0.3em;
font-size: 125%;
color: #333;
border-bottom: 1px solid #e5e5e5;
display: block;
width: 100%;
padding: 0.3em 0;
margin-bottom: 0.3em;
font-size: 125%;
color: #333;
border-bottom: 1px solid #e5e5e5;
}
.pure-form-stacked input[type="text"],
@ -146,99 +146,99 @@
.pure-form-stacked input[type="color"],
.pure-form-stacked select,
.pure-form-stacked label {
display: block;
display: block;
}
.pure-form-aligned input,
.pure-form-aligned textarea,
.pure-form-aligned select,
/* note: pure-help-inline is deprecated. Use .pure-form-message-inline instead */
/* NOTE: pure-help-inline is deprecated. Use .pure-form-message-inline instead. */
.pure-form-aligned .pure-help-inline,
.pure-form-message-inline {
display: inline-block;
*display: inline; /* IE7 inline-block hack */
*zoom: 1;
vertical-align: middle;
display: inline-block;
*display: inline;
*zoom: 1;
vertical-align: middle;
}
/* aligned Forms */
/* Aligned Forms */
.pure-form-aligned .pure-control-group {
margin-bottom: 0.5em;
margin-bottom: 0.5em;
}
.pure-form-aligned .pure-control-group label {
text-align: right;
display: inline-block;
vertical-align: middle;
width: 10em;
margin: 0 1em 0 0;
text-align: right;
display: inline-block;
vertical-align: middle;
width: 10em;
margin: 0 1em 0 0;
}
.pure-form-aligned .pure-controls {
margin: 1.5em 0 0 10em;
margin: 1.5em 0 0 10em;
}
/* Rounded Inputs */
.pure-form .pure-input-rounded {
border-radius: 20px;
padding-left: 1em;
border-radius: 20px;
padding-left: 1em;
}
/* Grouped Inputs */
.pure-form .pure-group fieldset {
margin-bottom: 10px;
margin-bottom: 10px;
}
.pure-form .pure-group input {
display: block;
padding: 10px;
margin: 0;
border-radius: 0;
position: relative;
top: -1px;
display: block;
padding: 10px;
margin: 0;
border-radius: 0;
position: relative;
top: -1px;
}
.pure-form .pure-group input:focus {
z-index: 2;
z-index: 2;
}
.pure-form .pure-group input:first-child {
top: 1px;
border-radius: 4px 4px 0 0;
top: 1px;
border-radius: 4px 4px 0 0;
}
.pure-form .pure-group input:last-child {
top: -2px;
border-radius: 0 0 4px 4px;
top: -2px;
border-radius: 0 0 4px 4px;
}
.pure-form .pure-group button {
margin: 0.35em 0;
margin: 0.35em 0;
}
.pure-form .pure-input-1 {
width: 100%;
width: 100%;
}
.pure-form .pure-input-2-3 {
width: 66%;
width: 66%;
}
.pure-form .pure-input-1-2 {
width: 50%;
width: 50%;
}
.pure-form .pure-input-1-3 {
width: 33%;
width: 33%;
}
.pure-form .pure-input-1-4 {
width: 25%;
width: 25%;
}
/* Inline help for forms */
/* Note: pure-help-inline is deprecated. Use .pure-form-message-inline instead */
/* NOTE: pure-help-inline is deprecated. Use .pure-form-message-inline instead. */
.pure-form .pure-help-inline,
.pure-form-message-inline {
display: inline-block;
padding-left: 0.3em;
color: #666;
vertical-align: middle;
font-size: 90%;
display: inline-block;
padding-left: 0.3em;
color: #666;
vertical-align: middle;
font-size: 90%;
}
/* Block help for forms */
.pure-form-message {
display: block;
color: #666;
font-size: 90%;
display: block;
color: #666;
font-size: 90%;
}

View File

@ -19,7 +19,7 @@
max-width: 100%;
}
@media (min-width:980px) {
@media (min-width: 980px) {
.pure-visible-phone {
display: none;
}
@ -30,13 +30,15 @@
display: none;
}
}
@media (max-width:480px) {
@media (max-width: 480px) {
.pure-g-r > .pure-u,
.pure-g-r > [class *= "pure-u-"] {
width: 100%;
}
}
@media (max-width:767px) {
@media (max-width: 767px) {
.pure-g-r > .pure-u,
.pure-g-r > [class *= "pure-u-"] {
width: 100%;
@ -48,7 +50,8 @@
display: none;
}
}
@media (min-width:768px) and (max-width:979px) {
@media (min-width: 768px) and (max-width: 979px) {
.pure-hidden-tablet {
display: none;
}

View File

@ -35,7 +35,8 @@
.pure-menu li { position: relative; }
.pure-menu a, .pure-menu .pure-menu-heading {
.pure-menu a,
.pure-menu .pure-menu-heading {
display: block;
color: inherit;
line-height: 1.5em;
@ -64,7 +65,8 @@
.pure-menu-can-have-children > .pure-menu-label:after {
content: '\25B8';
float: right;
font-family: 'Lucida Grande', 'Lucida Sans Unicode', 'DejaVu Sans', sans-serif; /* These specific fonts have the Unicode char we need. */
/* These specific fonts have the Unicode char we need. */
font-family: 'Lucida Grande', 'Lucida Sans Unicode', 'DejaVu Sans', sans-serif;
margin-right: -20px;
margin-top: -1px;
}
@ -89,8 +91,8 @@
/* FIXED MENU */
.pure-menu-fixed {
position: fixed;
top:0;
left:0;
top: 0;
left: 0;
width: 100%;
}
@ -105,7 +107,7 @@
vertical-align: middle;
}
/* Submenus should still be display:block; */
/* Submenus should still be display: block; */
.pure-menu-horizontal li li {
display: block;
}
@ -116,7 +118,7 @@
}
/*Add extra padding to elements that have the arrow so that the hover looks nice */
.pure-menu-horizontal > .pure-menu-children > .pure-menu-can-have-children > .pure-menu-label {
padding-right:30px;
padding-right: 30px;
}
/* Adjusting separator for vertical menus */

View File

@ -21,7 +21,8 @@
.pure-paginator .pure-button:focus {
outline-style: none;
}
.pure-paginator .prev, .pure-paginator .next {
.pure-paginator .prev,
.pure-paginator .next {
color: #C0C1C3;
text-shadow: 0 -1px 0 rgba(0,0,0, 0.45);
}

View File

@ -1,14 +1,10 @@
/* RESPONSIVE */
@media (max-width: 480px) {
.pure-menu-horizontal {
width:100%;
width: 100%;
}
.pure-menu-children li {
display: block;
border-bottom: 1px solid black;
}
}

View File

@ -16,7 +16,6 @@
}
/* LINK STYLES */
.pure-menu a {

View File

@ -1,11 +1,3 @@
/*
* CSS TABLES
* ==========
* Simple CSS for HTML Tables
* Author: tilomitra
*/
/* foundational CSS */
.pure-table {
/* Remove spacing between table cells (from Normalize.css) */
border-collapse: collapse;
@ -46,7 +38,7 @@
/*
striping:
even - #fff (white)
odd - #edf5ff (light blue)
odd - #f2f2f2 (light gray)
*/
.pure-table td {
background-color: transparent;
@ -62,7 +54,7 @@ striping:
/* BORDERED TABLES */
.pure-table-bordered td {
border-bottom:1px solid #cbcbcb;
border-bottom: 1px solid #cbcbcb;
}
.pure-table-bordered tbody > tr:last-child td,
.pure-table-horizontal tbody > tr:last-child td {
@ -75,7 +67,7 @@ striping:
.pure-table-horizontal td,
.pure-table-horizontal th {
border-width: 0 0 1px 0;
border-bottom:1px solid #cbcbcb;
border-bottom: 1px solid #cbcbcb;
}
.pure-table-horizontal tbody > tr:last-child td {
border-bottom-width: 0;