From 66593336d951dc6a04c2b867b3906bf2012a33d5 Mon Sep 17 00:00:00 2001 From: Connor Sears Date: Mon, 5 Nov 2012 08:56:54 -0800 Subject: [PATCH 01/13] Oxford comma. We just gotta. --- docs/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.html b/docs/index.html index a32600a..32acbb4 100644 --- a/docs/index.html +++ b/docs/index.html @@ -73,7 +73,7 @@
-

Prototype iPhone apps with simple HTML, CSS and JS components.

+

Prototype iPhone apps with simple HTML, CSS, and JS components.

Download Ratchet
From 3735dbd9bc1d0b45e1255a81d40f436224ae04c7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Nov 2012 16:50:46 -0800 Subject: [PATCH 02/13] Proper comment spacing --- dist/ratchet.css | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/dist/ratchet.css b/dist/ratchet.css index c694f73..13d7670 100644 --- a/dist/ratchet.css +++ b/dist/ratchet.css @@ -158,7 +158,9 @@ a { } .bar-header-secondary ~ .content { top: 88px; -}/* General bar styles +} + +/* General bar styles -------------------------------------------------- */ [class*="bar-"] { @@ -540,7 +542,6 @@ a { border-bottom-width: 0; } - /* List dividers -------------------------------------------------- */ @@ -603,7 +604,9 @@ a { .list .toggle { margin-top: -15px; /* Half height of toggle */ -}/* Forms +} + +/* Forms -------------------------------------------------- */ /* Force form elements to inherit font styles */ @@ -722,7 +725,9 @@ select { padding-left: 0; margin-bottom: 0; border-bottom: 0; -}/* General button styles +} + +/* General button styles -------------------------------------------------- */ [class*="button"] { @@ -842,7 +847,9 @@ select { padding-top: 4px; padding-bottom: 4px; margin-right: 10px; -}/* Chevrons +} + +/* Chevrons -------------------------------------------------- */ .chevron { @@ -871,7 +878,9 @@ select { top: 7px; -webkit-transform: rotate(-45deg); transform: rotate(-45deg); -}/* General count styles +} + +/* General count styles -------------------------------------------------- */ [class*="count"] { @@ -915,7 +924,9 @@ select { background-color: #e71e1e; background-image: -webkit-linear-gradient(top, #e71e1e 0,#c71a1a 100%); background-image: linear-gradient(to bottom, #e71e1e 0, #c71a1a 100%); -}/* Segmented controllers +} + +/* Segmented controllers -------------------------------------------------- */ .segmented-controller { @@ -976,7 +987,9 @@ select { .segmented-controller-item.active { display: block; -}/* Popovers (to be used with popovers.js) +} + +/* Popovers (to be used with popovers.js) -------------------------------------------------- */ .popover { @@ -1128,7 +1141,9 @@ select { border: 1px solid #000; border-radius: 3px; -webkit-overflow-scrolling: touch; -}/* Slider styles (to be used with sliders.js) +} + +/* Slider styles (to be used with sliders.js) -------------------------------------------------- */ /* Width/height of slider */ @@ -1164,7 +1179,9 @@ select { /* Required reset of font-size to same as standard body */ .slider > ul > li > * { font-size: 14px; -}/* Toggle styles (to be used with toggles.js) +} + +/* Toggle styles (to be used with toggles.js) -------------------------------------------------- */ .toggle { @@ -1229,7 +1246,9 @@ select { color: #fff; text-shadow: 0 -1px rgba(0, 0, 0, 0.25); content: "On"; -}/* Push styles (to be used with push.js) +} + +/* Push styles (to be used with push.js) -------------------------------------------------- */ /* Fade animation */ From 4ce4426a8f4e395332a06185c3b4e5f0830731ed Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Nov 2012 16:53:43 -0800 Subject: [PATCH 03/13] nuke the long list of elements, go with * for easy reset --- dist/ratchet.css | 125 ++++++----------------------------------------- 1 file changed, 15 insertions(+), 110 deletions(-) diff --git a/dist/ratchet.css b/dist/ratchet.css index 13d7670..2f29d26 100644 --- a/dist/ratchet.css +++ b/dist/ratchet.css @@ -9,83 +9,7 @@ /* Hard reset -------------------------------------------------- */ -html, -body, -div, -span, -iframe, -h1, -h2, -h3, -h4, -h5, -h6, -p, -blockquote, -pre, -a, -abbr, -acronym, -address, -big, -cite, -code, -del, -dfn, -em, -img, -ins, -kbd, -q, -s, -samp, -small, -strike, -strong, -sub, -sup, -tt, -var, -b, -u, -i, -center, -dl, -dt, -dd, -ol, -ul, -li, -fieldset, -form, -label, -legend, -table, -caption, -tbody, -tfoot, -thead, -tr, -th, -td, -article, -aside, -canvas, -details, -embed, -figure, -figcaption, -footer, -header, -hgroup, -menu, -nav, -output, -section, -summary, -time, -audio, -video { +* { padding: 0; margin: 0; border: 0; @@ -129,8 +53,8 @@ a { background: #fff; -webkit-transition-property: top, bottom; transition-property: top, bottom; - -webkit-transition-duration: .2s, .2s; - transition-duration: .2s, .2s; + -webkit-transition-duration: .2s, .2s; + transition-duration: .2s, .2s; -webkit-transition-timing-function: linear, linear; transition-timing-function: linear, linear; -webkit-overflow-scrolling: touch; @@ -158,9 +82,7 @@ a { } .bar-header-secondary ~ .content { top: 88px; -} - -/* General bar styles +}/* General bar styles -------------------------------------------------- */ [class*="bar-"] { @@ -542,6 +464,7 @@ a { border-bottom-width: 0; } + /* List dividers -------------------------------------------------- */ @@ -604,9 +527,7 @@ a { .list .toggle { margin-top: -15px; /* Half height of toggle */ -} - -/* Forms +}/* Forms -------------------------------------------------- */ /* Force form elements to inherit font styles */ @@ -725,9 +646,7 @@ select { padding-left: 0; margin-bottom: 0; border-bottom: 0; -} - -/* General button styles +}/* General button styles -------------------------------------------------- */ [class*="button"] { @@ -847,9 +766,7 @@ select { padding-top: 4px; padding-bottom: 4px; margin-right: 10px; -} - -/* Chevrons +}/* Chevrons -------------------------------------------------- */ .chevron { @@ -878,9 +795,7 @@ select { top: 7px; -webkit-transform: rotate(-45deg); transform: rotate(-45deg); -} - -/* General count styles +}/* General count styles -------------------------------------------------- */ [class*="count"] { @@ -924,9 +839,7 @@ select { background-color: #e71e1e; background-image: -webkit-linear-gradient(top, #e71e1e 0,#c71a1a 100%); background-image: linear-gradient(to bottom, #e71e1e 0, #c71a1a 100%); -} - -/* Segmented controllers +}/* Segmented controllers -------------------------------------------------- */ .segmented-controller { @@ -987,9 +900,7 @@ select { .segmented-controller-item.active { display: block; -} - -/* Popovers (to be used with popovers.js) +}/* Popovers (to be used with popovers.js) -------------------------------------------------- */ .popover { @@ -1141,9 +1052,7 @@ select { border: 1px solid #000; border-radius: 3px; -webkit-overflow-scrolling: touch; -} - -/* Slider styles (to be used with sliders.js) +}/* Slider styles (to be used with sliders.js) -------------------------------------------------- */ /* Width/height of slider */ @@ -1172,16 +1081,14 @@ select { .slider > ul > li { display: inline-block; vertical-align: top; /* Ensure that li always aligns to top */ - width: 100%; + width: 100%; height: 100%; } /* Required reset of font-size to same as standard body */ .slider > ul > li > * { font-size: 14px; -} - -/* Toggle styles (to be used with toggles.js) +}/* Toggle styles (to be used with toggles.js) -------------------------------------------------- */ .toggle { @@ -1246,9 +1153,7 @@ select { color: #fff; text-shadow: 0 -1px rgba(0, 0, 0, 0.25); content: "On"; -} - -/* Push styles (to be used with push.js) +}/* Push styles (to be used with push.js) -------------------------------------------------- */ /* Fade animation */ From 7f5975793c4e0d87edb5d87f58a9c9ee32f03a91 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Nov 2012 16:56:24 -0800 Subject: [PATCH 04/13] background-color instead of background --- dist/ratchet.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/ratchet.css b/dist/ratchet.css index 2f29d26..ee1b85b 100644 --- a/dist/ratchet.css +++ b/dist/ratchet.css @@ -50,7 +50,7 @@ a { bottom: 0; left: 0; overflow: auto; - background: #fff; + background-color: #fff; -webkit-transition-property: top, bottom; transition-property: top, bottom; -webkit-transition-duration: .2s, .2s; @@ -561,7 +561,7 @@ input[type="color"], height: 40px; padding: 10px; margin-bottom: 10px; - background: #fff; + background-color: #fff; border: 1px solid rgba(0, 0, 0, .2); border-radius: 3px; box-shadow: 0 1px 1px rgba(255, 255, 255, .2), inset 0 1px 1px rgba(0, 0, 0, .1); From 43b0e16a283fcc66b33641210b91ea6fa249a8d2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Nov 2012 17:05:40 -0800 Subject: [PATCH 05/13] fix bg in lib --- lib/css/base.css | 6 +++--- lib/css/forms.css | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/css/base.css b/lib/css/base.css index 6df61a4..7d2f817 100644 --- a/lib/css/base.css +++ b/lib/css/base.css @@ -118,11 +118,11 @@ a { bottom: 0; left: 0; overflow: auto; - background: #fff; + background-color: #fff; -webkit-transition-property: top, bottom; transition-property: top, bottom; - -webkit-transition-duration: .2s, .2s; - transition-duration: .2s, .2s; + -webkit-transition-duration: .2s, .2s; + transition-duration: .2s, .2s; -webkit-transition-timing-function: linear, linear; transition-timing-function: linear, linear; -webkit-overflow-scrolling: touch; diff --git a/lib/css/forms.css b/lib/css/forms.css index 898a748..e2bf4e8 100644 --- a/lib/css/forms.css +++ b/lib/css/forms.css @@ -32,7 +32,7 @@ input[type="color"], height: 40px; padding: 10px; margin-bottom: 10px; - background: #fff; + background-color: #fff; border: 1px solid rgba(0, 0, 0, .2); border-radius: 3px; box-shadow: 0 1px 1px rgba(255, 255, 255, .2), inset 0 1px 1px rgba(0, 0, 0, .1); From af064c33db2ea9e62e2f22a84e08281098e59134 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Nov 2012 17:05:53 -0800 Subject: [PATCH 06/13] * reset in lib --- lib/css/base.css | 78 +----------------------------------------------- 1 file changed, 1 insertion(+), 77 deletions(-) diff --git a/lib/css/base.css b/lib/css/base.css index 7d2f817..839dd0c 100644 --- a/lib/css/base.css +++ b/lib/css/base.css @@ -1,83 +1,7 @@ /* Hard reset -------------------------------------------------- */ -html, -body, -div, -span, -iframe, -h1, -h2, -h3, -h4, -h5, -h6, -p, -blockquote, -pre, -a, -abbr, -acronym, -address, -big, -cite, -code, -del, -dfn, -em, -img, -ins, -kbd, -q, -s, -samp, -small, -strike, -strong, -sub, -sup, -tt, -var, -b, -u, -i, -center, -dl, -dt, -dd, -ol, -ul, -li, -fieldset, -form, -label, -legend, -table, -caption, -tbody, -tfoot, -thead, -tr, -th, -td, -article, -aside, -canvas, -details, -embed, -figure, -figcaption, -footer, -header, -hgroup, -menu, -nav, -output, -section, -summary, -time, -audio, -video { +* { padding: 0; margin: 0; border: 0; From 751a7e37fd12ec962103a84ef78b18c1c5d3fc35 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Nov 2012 17:08:45 -0800 Subject: [PATCH 07/13] remove em and strong from docs.css since you're not resetting it --- docs/css/docs.css | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/docs/css/docs.css b/docs/css/docs.css index 63244b0..2b8e4b0 100644 --- a/docs/css/docs.css +++ b/docs/css/docs.css @@ -16,14 +16,6 @@ body { /* Typography -------------------------------------------------- */ -em { - font-style: italic; -} - -strong { - font-weight: bold; -} - hr { height: 0; margin: 10px 0 30px; @@ -359,7 +351,7 @@ h6 { .iphone .list a[data-transition="slide-out"] { padding: 0; display: inline; - margin: 0; + margin: 0; color: #0882f0; } @@ -1074,7 +1066,7 @@ h6 { [class*="bar-"] { -moz-box-sizing: border-box; } -.bar-title, +.bar-title, .tab-inner { display: -moz-box; -moz-box-orient: horizontal; From f6d79ae0b7e1fbf0ea9b76403b8210317aa5cd2c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Nov 2012 17:09:39 -0800 Subject: [PATCH 08/13] more docs css tweaks --- docs/css/docs.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/css/docs.css b/docs/css/docs.css index 2b8e4b0..b054a4a 100644 --- a/docs/css/docs.css +++ b/docs/css/docs.css @@ -7,7 +7,7 @@ body { font-size: 14px; line-height: 1.6; color: #333; - background: #fff; + background-color: #fff; -webkit-font-smoothing: antialiased; /* Fix for webkit rendering */ -webkit-text-size-adjust: 100%; } @@ -36,6 +36,7 @@ h6 { /* Docs structural styles -------------------------------------------------- */ + .docs-outer-wrapper { position: relative; } From f5202915cc556c984bca63ead34f7f051cd8bd21 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Nov 2012 17:12:53 -0800 Subject: [PATCH 09/13] undo the reset * change since @dhgamache told me to <3 --- lib/css/base.css | 78 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 77 insertions(+), 1 deletion(-) diff --git a/lib/css/base.css b/lib/css/base.css index 839dd0c..7d2f817 100644 --- a/lib/css/base.css +++ b/lib/css/base.css @@ -1,7 +1,83 @@ /* Hard reset -------------------------------------------------- */ -* { +html, +body, +div, +span, +iframe, +h1, +h2, +h3, +h4, +h5, +h6, +p, +blockquote, +pre, +a, +abbr, +acronym, +address, +big, +cite, +code, +del, +dfn, +em, +img, +ins, +kbd, +q, +s, +samp, +small, +strike, +strong, +sub, +sup, +tt, +var, +b, +u, +i, +center, +dl, +dt, +dd, +ol, +ul, +li, +fieldset, +form, +label, +legend, +table, +caption, +tbody, +tfoot, +thead, +tr, +th, +td, +article, +aside, +canvas, +details, +embed, +figure, +figcaption, +footer, +header, +hgroup, +menu, +nav, +output, +section, +summary, +time, +audio, +video { padding: 0; margin: 0; border: 0; From 43f847ede31c75c9029ad9d3efef6589b03d49d6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Nov 2012 17:14:52 -0800 Subject: [PATCH 10/13] rerun make --- dist/ratchet.css | 80 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 2 deletions(-) diff --git a/dist/ratchet.css b/dist/ratchet.css index ee1b85b..ca7fd80 100644 --- a/dist/ratchet.css +++ b/dist/ratchet.css @@ -9,7 +9,83 @@ /* Hard reset -------------------------------------------------- */ -* { +html, +body, +div, +span, +iframe, +h1, +h2, +h3, +h4, +h5, +h6, +p, +blockquote, +pre, +a, +abbr, +acronym, +address, +big, +cite, +code, +del, +dfn, +em, +img, +ins, +kbd, +q, +s, +samp, +small, +strike, +strong, +sub, +sup, +tt, +var, +b, +u, +i, +center, +dl, +dt, +dd, +ol, +ul, +li, +fieldset, +form, +label, +legend, +table, +caption, +tbody, +tfoot, +thead, +tr, +th, +td, +article, +aside, +canvas, +details, +embed, +figure, +figcaption, +footer, +header, +hgroup, +menu, +nav, +output, +section, +summary, +time, +audio, +video { padding: 0; margin: 0; border: 0; @@ -1081,7 +1157,7 @@ select { .slider > ul > li { display: inline-block; vertical-align: top; /* Ensure that li always aligns to top */ - width: 100%; + width: 100%; height: 100%; } From 81519b8fd02ff64ff4b1a70052473068f024a9e5 Mon Sep 17 00:00:00 2001 From: Ryan Stewart Date: Mon, 5 Nov 2012 22:45:49 -0800 Subject: [PATCH 11/13] Fixed a couple of typos in the demo app. --- test/app/choose-theater.html | 2 +- test/app/settings.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/app/choose-theater.html b/test/app/choose-theater.html index 47cc5b9..1bec8dd 100644 --- a/test/app/choose-theater.html +++ b/test/app/choose-theater.html @@ -14,7 +14,7 @@ - + diff --git a/test/app/settings.html b/test/app/settings.html index 3a647d9..eaed189 100644 --- a/test/app/settings.html +++ b/test/app/settings.html @@ -14,7 +14,7 @@ - + From f9641d6afb3fe12e31412ee5b1886b6ac4b82681 Mon Sep 17 00:00:00 2001 From: Patrik Wibron Date: Tue, 6 Nov 2012 11:40:06 +0100 Subject: [PATCH 12/13] Add meta-tag for showing alternative title on iOS 6 --- dist/template.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dist/template.html b/dist/template.html index b8820c1..5772f39 100644 --- a/dist/template.html +++ b/dist/template.html @@ -10,6 +10,9 @@ + + + From 52cd7179145abe7e5ffc263dea97c4aaaf97e1c5 Mon Sep 17 00:00:00 2001 From: Connor Sears Date: Tue, 6 Nov 2012 09:34:41 -0800 Subject: [PATCH 13/13] Decreasing the social buttons padding so they are so thrown of center. --- docs/css/docs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/css/docs.css b/docs/css/docs.css index 63244b0..75fe7d4 100644 --- a/docs/css/docs.css +++ b/docs/css/docs.css @@ -274,7 +274,7 @@ h6 { .social ul { height: 20px; - padding-left: 50px; + padding-left: 20px; list-style: none; text-align: center; }