Skip to content

Commit 9f06762

Browse files
author
Wessel Grift
committed
Merged branch feature into master
2 parents f476d3c + 5e53419 commit 9f06762

12 files changed

+290
-433
lines changed

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
v2.0.1 & v2.0.2
2+
=======================================================
3+
- Removed form inputs with buttons on the left and right (opinionated)
4+
- Fixed form usability issues with :focus
5+
- Fixed minor bugs
6+
17
v2.0.0
28
=======================================================
39
(february 14 2017)

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
## A solid startingpoint without the bloat.
99

1010

11-
##### TLDR;
11+
##### TL;DR
1212

1313
- Lightweight. Only 26kb minified.
1414
- Versatile fully responsive grid system.

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pavilion",
3-
"version": "2.0.1",
3+
"version": "2.0.2",
44
"description": "Pavilion CSS Framework. A solid starting point without the bloat.",
55
"homepage": "http://www.pavilion.io",
66
"license": "MIT",

demo/css/pavilion.css

+106-142
Original file line numberDiff line numberDiff line change
@@ -1624,10 +1624,6 @@ body {
16241624
}
16251625
}
16261626

1627-
*:focus, *:visited {
1628-
outline: none !important;
1629-
}
1630-
16311627
p {
16321628
margin-top: 0;
16331629
margin-bottom: 1em;
@@ -1636,18 +1632,15 @@ p {
16361632

16371633
a {
16381634
color: #0080ff;
1639-
outline: none;
16401635
text-decoration: none;
16411636
}
16421637

16431638
a:visited {
16441639
color: #0080ff;
1645-
outline: none;
16461640
}
16471641

1648-
a:hover, a:focus {
1642+
a:focus, a:hover {
16491643
color: #005ab3;
1650-
outline: none;
16511644
text-decoration: underline;
16521645
}
16531646

@@ -1877,7 +1870,7 @@ mark {
18771870

18781871
.button {
18791872
display: inline-block;
1880-
text-decoration: none;
1873+
text-decoration: none !important;
18811874
font-family: inherit;
18821875
line-height: 1.45;
18831876
margin-right: 1rem;
@@ -1888,13 +1881,12 @@ mark {
18881881
cursor: pointer;
18891882
}
18901883

1891-
.button:active {
1892-
transform: scale(0.97);
1884+
.button:focus {
1885+
outline: none;
18931886
}
18941887

1895-
.button[disabled="true"], .button[disabled="disabled"], .button[disabled] {
1896-
pointer-events: none;
1897-
opacity: 0.5;
1888+
.button:active {
1889+
transform: scale(0.97);
18981890
}
18991891

19001892
.button.h1, .button.h2, .button.h3, .button.h4, .button.h5, .button.h6 {
@@ -1998,17 +1990,17 @@ form {
19981990
margin-bottom: 1.5rem;
19991991
}
20001992

1993+
label {
1994+
display: block;
1995+
margin-bottom: 0.5rem;
1996+
}
1997+
20011998
.form-part {
20021999
border: 0;
20032000
padding: 0;
20042001
margin: 0 0 1.5rem;
20052002
}
20062003

2007-
label {
2008-
display: block;
2009-
margin-bottom: 0.5rem;
2010-
}
2011-
20122004
.checkbox, .radio {
20132005
padding-left: 25px;
20142006
margin-top: 0;
@@ -2052,7 +2044,17 @@ label {
20522044
margin-bottom: 0;
20532045
}
20542046

2055-
input,
2047+
input[type="text"],
2048+
input[type="search"],
2049+
input[type="email"],
2050+
input[type="password"],
2051+
input[type="tel"],
2052+
input[type="url"],
2053+
input[type="number"],
2054+
input[type="date"],
2055+
input[type="month"],
2056+
input[type="time"],
2057+
input[type="datetime-local"],
20562058
select,
20572059
textarea {
20582060
font-family: inherit;
@@ -2063,137 +2065,102 @@ textarea {
20632065
border-radius: 4px;
20642066
line-height: 1.45;
20652067
padding: 0.5rem 0.8rem;
2066-
}
2067-
2068-
input:focus,
2069-
select:focus,
2070-
textarea:focus {
2071-
border-color: #0080ff;
2072-
}
2073-
2074-
input:not([type="checkbox"]):not([type="radio"]),
2075-
select:not([type="checkbox"]):not([type="radio"]),
2076-
textarea:not([type="checkbox"]):not([type="radio"]) {
20772068
-webkit-appearance: none;
20782069
-moz-appearance: none;
2079-
-o-appearance: none;
2080-
-ms-appearance: none;
2070+
appearance: none;
20812071
background-color: white;
20822072
}
20832073

2084-
input[type="file"],
2085-
select[type="file"],
2086-
textarea[type="file"] {
2087-
line-height: 1;
2088-
font-size: 16px;
2089-
border: 0;
2090-
padding-left: 0;
2091-
padding-right: 0;
2092-
}
2093-
2094-
input[type="password"],
2095-
select[type="password"],
2096-
textarea[type="password"] {
2097-
font-family: verdana;
2098-
}
2099-
2074+
input[type="text"]::-webkit-input-placeholder,
2075+
input[type="search"]::-webkit-input-placeholder,
2076+
input[type="email"]::-webkit-input-placeholder,
21002077
input[type="password"]::-webkit-input-placeholder,
2101-
select[type="password"]::-webkit-input-placeholder,
2102-
textarea[type="password"]::-webkit-input-placeholder {
2103-
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
2104-
}
2105-
2106-
input[type="password"]:-moz-placeholder,
2107-
select[type="password"]:-moz-placeholder,
2108-
textarea[type="password"]:-moz-placeholder {
2109-
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
2110-
}
2111-
2112-
input[type="password"]::-moz-placeholder,
2113-
select[type="password"]::-moz-placeholder,
2114-
textarea[type="password"]::-moz-placeholder {
2115-
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
2116-
}
2117-
2118-
input[type="password"]:-ms-input-placeholder,
2119-
select[type="password"]:-ms-input-placeholder,
2120-
textarea[type="password"]:-ms-input-placeholder {
2121-
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
2122-
}
2123-
2124-
input::-webkit-input-placeholder,
2078+
input[type="tel"]::-webkit-input-placeholder,
2079+
input[type="url"]::-webkit-input-placeholder,
2080+
input[type="number"]::-webkit-input-placeholder,
2081+
input[type="date"]::-webkit-input-placeholder,
2082+
input[type="month"]::-webkit-input-placeholder,
2083+
input[type="time"]::-webkit-input-placeholder,
2084+
input[type="datetime-local"]::-webkit-input-placeholder,
21252085
select::-webkit-input-placeholder,
21262086
textarea::-webkit-input-placeholder {
21272087
color: #737373;
2088+
opacity: 1;
21282089
}
21292090

2130-
input:-moz-placeholder,
2131-
select:-moz-placeholder,
2132-
textarea:-moz-placeholder {
2133-
color: #737373;
2134-
}
2135-
2136-
input::-moz-placeholder,
2137-
select::-moz-placeholder,
2138-
textarea::-moz-placeholder {
2139-
color: #737373;
2140-
}
2141-
2142-
input:-ms-input-placeholder,
2091+
input[type="text"]:-ms-input-placeholder,
2092+
input[type="search"]:-ms-input-placeholder,
2093+
input[type="email"]:-ms-input-placeholder,
2094+
input[type="password"]:-ms-input-placeholder,
2095+
input[type="tel"]:-ms-input-placeholder,
2096+
input[type="url"]:-ms-input-placeholder,
2097+
input[type="number"]:-ms-input-placeholder,
2098+
input[type="date"]:-ms-input-placeholder,
2099+
input[type="month"]:-ms-input-placeholder,
2100+
input[type="time"]:-ms-input-placeholder,
2101+
input[type="datetime-local"]:-ms-input-placeholder,
21432102
select:-ms-input-placeholder,
21442103
textarea:-ms-input-placeholder {
21452104
color: #737373;
2105+
opacity: 1;
2106+
}
2107+
2108+
input[type="text"]::placeholder,
2109+
input[type="search"]::placeholder,
2110+
input[type="email"]::placeholder,
2111+
input[type="password"]::placeholder,
2112+
input[type="tel"]::placeholder,
2113+
input[type="url"]::placeholder,
2114+
input[type="number"]::placeholder,
2115+
input[type="date"]::placeholder,
2116+
input[type="month"]::placeholder,
2117+
input[type="time"]::placeholder,
2118+
input[type="datetime-local"]::placeholder,
2119+
select::placeholder,
2120+
textarea::placeholder {
2121+
color: #737373;
2122+
opacity: 1;
2123+
}
2124+
2125+
input[type="text"]:focus,
2126+
input[type="search"]:focus,
2127+
input[type="email"]:focus,
2128+
input[type="password"]:focus,
2129+
input[type="tel"]:focus,
2130+
input[type="url"]:focus,
2131+
input[type="number"]:focus,
2132+
input[type="date"]:focus,
2133+
input[type="month"]:focus,
2134+
input[type="time"]:focus,
2135+
input[type="datetime-local"]:focus,
2136+
select:focus,
2137+
textarea:focus {
2138+
border-color: #0080ff;
2139+
outline: none;
21462140
}
21472141

2148-
.input-with-button {
2149-
width: 100%;
2150-
display: table;
2151-
border-collapse: separate;
2152-
}
2153-
2154-
.input-with-button label {
2155-
width: 100%;
2156-
display: table-caption;
2157-
}
2158-
2159-
.input-with-button .button-wrapper {
2160-
display: table-cell;
2161-
width: 1%;
2162-
white-space: nowrap;
2163-
position: relative;
2164-
}
2165-
2166-
.input-with-button .button-wrapper .button {
2167-
margin: 0;
2168-
min-width: 100%;
2169-
padding: 0.5rem 1rem;
2170-
}
2171-
2172-
.input-with-button .button-wrapper .button:active {
2173-
transform: none;
2174-
}
2175-
2176-
.input-with-button input[type="text"] {
2177-
width: 100%;
2178-
display: table-cell;
2179-
margin: 0;
2180-
position: relative;
2142+
input[type="password"] {
2143+
font-family: verdana;
21812144
}
21822145

2183-
.input-with-button.button-left .button-wrapper .button {
2184-
border-radius: 4px 0 0 4px;
2146+
input[type="password"]::-webkit-input-placeholder {
2147+
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
21852148
}
21862149

2187-
.input-with-button.button-left input[type="text"] {
2188-
border-radius: 0 4px 4px 0;
2150+
input[type="password"]:-ms-input-placeholder {
2151+
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
21892152
}
21902153

2191-
.input-with-button.button-right .button-wrapper .button {
2192-
border-radius: 0 4px 4px 0;
2154+
input[type="password"]::placeholder {
2155+
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
21932156
}
21942157

2195-
.input-with-button.button-right input[type="text"] {
2196-
border-radius: 4px 0 0 4px;
2158+
input[type="file"] {
2159+
line-height: 1;
2160+
font-size: 16px;
2161+
border: 0;
2162+
padding-left: 0;
2163+
padding-right: 0;
21972164
}
21982165

21992166
textarea {
@@ -2203,7 +2170,6 @@ textarea {
22032170

22042171
select {
22052172
cursor: pointer;
2206-
overflow: scroll;
22072173
}
22082174

22092175
select:not([multiple]) {
@@ -2231,29 +2197,27 @@ select::-ms-expand {
22312197
}
22322198
}
22332199

2200+
progress, meter, input[type="range"] {
2201+
width: 100%;
2202+
}
2203+
22342204
hr {
22352205
margin-top: 1.5rem;
22362206
margin-bottom: 1.5rem;
22372207
border: 0;
22382208
border-top: 1px solid #D9D9D9;
22392209
}
22402210

2241-
label[disabled="true"], label[disabled="disabled"], label[disabled], label.disabled,
2242-
input[disabled="true"],
2243-
input[disabled="disabled"],
2244-
input[disabled],
2245-
input.disabled,
2246-
select[disabled="true"],
2247-
select[disabled="disabled"],
2248-
select[disabled],
2249-
select.disabled,
2250-
textarea[disabled="true"],
2251-
textarea[disabled="disabled"],
2252-
textarea[disabled],
2253-
textarea.disabled {
2211+
.disabled,
2212+
[disabled] {
22542213
pointer-events: none;
2255-
opacity: 0.5;
22562214
cursor: default;
2215+
opacity: 0.5;
2216+
}
2217+
2218+
.disabled [disabled],
2219+
[disabled] [disabled] {
2220+
opacity: 1;
22572221
}
22582222

22592223
table {

demo/index.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212

1313
<body>
1414
<div class="container-tl">
15-
<h2>Howdy!</h2>
15+
<h3>Howdy!</h3>
1616
</div>
17-
1817
<!-- Scripts -->
1918
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.2/jquery.min.js"></script>
2019
<script src="js/site.js"></script>

0 commit comments

Comments
 (0)