Merge lp:~stephen-stewart/ulysses/remove-sass into lp:ulysses

Proposed by Stephen Stewart
Status: Merged
Approved by: Stephen Stewart
Approved revision: 24
Merged at revision: 13
Proposed branch: lp:~stephen-stewart/ulysses/remove-sass
Merge into: lp:ulysses
Diff against target: 934 lines (+114/-526)
14 files modified
.bzrignore (+1/-0)
Gruntfile.js (+29/-5)
README.md (+11/-0)
bower.json (+7/-0)
package.json (+2/-2)
src/base.css (+1/-0)
src/buttons.css (+3/-13)
src/feedback.css (+3/-30)
src/forms.css (+1/-1)
src/layout.css (+44/-17)
src/navigation.css (+11/-12)
src/normalize.scss (+0/-406)
src/typography.css (+0/-31)
test/index.html (+1/-9)
To merge this branch: bzr merge lp:~stephen-stewart/ulysses/remove-sass
Reviewer Review Type Date Requested Status
Jonas G. Drange (community) Approve
Review via email: mp+200300@code.launchpad.net

Commit message

replace sass with rework, a js based css pre/post processor

Description of the change

Since we're not really using Sass in this style framework, and because Sass comes with a ruby dep, I want to remove it.

At the same time, I like the look of rework [https://github.com/reworkcss/rework] CSS for doing some simple vendor prefix work.

Also, moved base -> typography and now pull in normalize via bower, which is then built as base.css plus any additions from our own src/base.css.

To post a comment you must log in.
Revision history for this message
Jonas G. Drange (jonas-drange) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2013-11-22 17:14:43 +0000
3+++ .bzrignore 2014-01-02 12:51:09 +0000
4@@ -1,4 +1,5 @@
5 *.swp
6+bower_components/
7 node_modules/
8 .sass-cache
9 public/*
10
11=== modified file 'Gruntfile.js'
12--- Gruntfile.js 2013-11-30 17:53:33 +0000
13+++ Gruntfile.js 2014-01-02 12:51:09 +0000
14@@ -20,6 +20,10 @@
15 concat: {
16 build: {
17 files: [
18+ {'public/base.css': [
19+ 'bower_components/normalize-css/normalize.css',
20+ 'public/base.css'
21+ ]},
22 // rollup
23 {'public/<%= pkg.name %>.css': [
24 'public/base.css',
25@@ -27,11 +31,12 @@
26 'public/dropdowns.css',
27 'public/forms.css',
28 'public/layout.css',
29+ 'public/feedback.css',
30 'public/navigation.css',
31- 'public/normalize.css',
32 'public/pagination.css',
33- 'public/tables.css'
34- ]}
35+ 'public/tables.css',
36+ 'public/typography.css'
37+ ]}
38 ]
39 }
40 },
41@@ -77,6 +82,25 @@
42 keepalive: true
43 }
44 }
45+ },
46+ rework: {
47+ files: {
48+ expand: true,
49+ cwd: 'src/',
50+ src: ['**/*.css'],
51+ dest: 'public/',
52+ ext: '.css'
53+ },
54+ options: {
55+ use: [
56+ ['rework.keyframes'],
57+ ['rework.prefix', 'border-radius'],
58+ ['rework.prefix', 'box-shadow'],
59+ ['rework.prefix', 'animation'],
60+ ['rework.prefixValue', 'linear-gradient']
61+ ],
62+ vendors: ['-o-', '-ms-', '-moz-', '-webkit-']
63+ }
64 }
65
66 // TODO a release task for bower package
67@@ -94,15 +118,15 @@
68 grunt.loadNpmTasks('grunt-contrib-copy');
69 grunt.loadNpmTasks('grunt-contrib-csslint');
70 grunt.loadNpmTasks('grunt-contrib-cssmin');
71- grunt.loadNpmTasks('grunt-contrib-sass');
72 grunt.loadNpmTasks('grunt-contrib-watch');
73 grunt.loadNpmTasks('grunt-contrib-connect');
74+ grunt.loadNpmTasks('grunt-rework');
75
76 grunt.registerTask('default',['build']);
77 grunt.registerTask('test', ['csslint']);
78 grunt.registerTask('build', [
79 'clean',
80- 'sass',
81+ 'rework',
82 'concat',
83 'cssmin'
84 ]);
85
86=== modified file 'README.md'
87--- README.md 2013-11-28 18:10:54 +0000
88+++ README.md 2014-01-02 12:51:09 +0000
89@@ -11,8 +11,19 @@
90 Getting Started
91 ===============
92
93+You'll need nodejs, npm, bower and grunt-cli installed; then in the ulysses
94+package directory:
95+
96 ''''
97 npm install
98+bower install
99 grunt
100
101 ''''
102+
103+To run a server showing the test page:
104+
105+''''
106+grunt server
107+
108+''''
109
110=== added file 'bower.json'
111--- bower.json 1970-01-01 00:00:00 +0000
112+++ bower.json 2014-01-02 12:51:09 +0000
113@@ -0,0 +1,7 @@
114+{
115+ "name": "ulysses",
116+ "version": "0.0.1",
117+ "devDependencies": {
118+ "normalize-css": "2.1.3"
119+ }
120+}
121
122=== modified file 'package.json'
123--- package.json 2013-11-29 11:44:50 +0000
124+++ package.json 2014-01-02 12:51:09 +0000
125@@ -17,7 +17,6 @@
126 "devDependencies": {
127 "grunt": "~0.4.2",
128 "grunt-cli": "~0.1.11",
129- "grunt-contrib-sass": "~0.5.0",
130 "grunt-contrib-watch": "~0.5.3",
131 "css-parse": "~1.5.3",
132 "grunt-combine-media-queries": "~1.0.8",
133@@ -28,6 +27,7 @@
134 "grunt-rework": "0.0.5",
135 "grunt-contrib-connect": "~0.5.0",
136 "grunt-contrib-compress": "~0.5.3",
137- "grunt-contrib-copy": "~0.4.1"
138+ "grunt-contrib-copy": "~0.4.1",
139+ "bower": "~1.2.8"
140 }
141 }
142
143=== added file 'src/base.css'
144--- src/base.css 1970-01-01 00:00:00 +0000
145+++ src/base.css 2014-01-02 12:51:09 +0000
146@@ -0,0 +1,1 @@
147+/** anything you want to add to normalize.css or base css like stuff */
148
149=== renamed file 'src/buttons.scss' => 'src/buttons.css'
150--- src/buttons.scss 2013-12-12 14:41:55 +0000
151+++ src/buttons.css 2014-01-02 12:51:09 +0000
152@@ -1,10 +1,5 @@
153 .ues-button {
154 background: #dedede;
155- background: -moz-linear-gradient(top, #efefef 0%, #dedede 100%);
156- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#efefef), color-stop(100%,#dedede));
157- background: -webkit-linear-gradient(top, #efefef 0%,#dedede 100%);
158- background: -o-linear-gradient(top, #efefef 0%,#dedede 100%);
159- background: -ms-linear-gradient(top, #efefef 0%,#dedede 100%);
160 background: linear-gradient(to bottom, #efefef 0%,#dedede 100%);
161 border-radius: 4px;
162 display:inline-block;
163@@ -33,11 +28,6 @@
164
165 .ues-button-primary {
166 background: #dd4814;
167- background: -moz-linear-gradient(top, #f75216 0%, #dd4814 100%);
168- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f75216), color-stop(100%,#dd4814));
169- background: -webkit-linear-gradient(top, #f75216 0%,#dd4814 100%);
170- background: -o-linear-gradient(top, #f75216 0%,#dd4814 100%);
171- background: -ms-linear-gradient(top, #f75216 0%,#dd4814 100%);
172 background: linear-gradient(to bottom, #f75216 0%,#dd4814 100%);
173 color:white;
174 border-color:#dd4814;
175@@ -97,21 +87,21 @@
176 float:left;
177 }
178
179-// first child of >1 buttons
180+/** first child of >1 buttons **/
181 .ues-button-group > .ues-button:first-child:not(:last-child):not(.ues-dropdown-toggle) {
182 border-top-right-radius: 0px;
183 border-bottom-right-radius: 0px;
184 border-right:none;
185 }
186
187-// last child of >1 buttons
188+/** last child of >1 buttonsi **/
189 .ues-button-group > .ues-button:last-child:not(:first-child),
190 .ues-button-group > .ues-dropdown-toggle:not(:first-child) {
191 border-top-left-radius: 0px;
192 border-bottom-left-radius: 0px;
193 }
194
195-// any button surrounded by other buttons
196+/** any button surrounded by other buttons **/
197 .ues-button-group > .ues-button:not(:first-child):not(:last-child):not(.ues-dropdown-toggle) {
198 border-radius:0px;
199 border-right:none;
200
201=== renamed file 'src/dropdowns.scss' => 'src/dropdowns.css'
202=== renamed file 'src/feedback.scss' => 'src/feedback.css'
203--- src/feedback.scss 2013-12-01 00:08:37 +0000
204+++ src/feedback.css 2014-01-02 12:51:09 +0000
205@@ -6,12 +6,13 @@
206 border-color: #AEA79F;
207 color: #555;
208 }
209-/*csslint fallback-colors: false*/
210+
211 .ues-message a:link {
212 color: inherit;
213 color: rgba(0,0,0,0.75);
214 text-decoration: underline;
215 }
216+
217 .ues-message a:hover {
218 color: #000;
219 }
220@@ -40,10 +41,6 @@
221 .ues-message-closeable {
222 position: relative;
223 cursor: pointer;
224- -webkit-transition: 0.3s ease all;
225- -moz-transition: 0.3s ease all;
226- -ms-transition: 0.3s ease all;
227- -o-transition: 0.3s ease all;
228 transition: 0.3s ease all;
229 overflow: hidden;
230 max-height: 1000px;
231@@ -90,32 +87,8 @@
232 from { background: #FFE6E5; }
233 to { background: #FFA09B; }
234 }
235-@-moz-keyframes ues-error-pulsating {
236- from { background: #FFE6E5; }
237- to { background: #FFA09B; }
238-}
239-@-webkit-keyframes ues-error-pulsating {
240- from { background: #FFE6E5; }
241- to { background: #FFA09B; }
242-}
243 .ues-error-pulsating {
244- animation-duration: 0.7s;
245- animation-name: ues-error-pulsating;
246- animation-direction: alternate;
247- animation-iteration-count: infinite;
248- animation-timing-function: ease-in-out;
249-
250- -webkit-animation-duration: 0.7s;
251- -webkit-animation-name: ues-error-pulsating;
252- -webkit-animation-direction: alternate;
253- -webkit-animation-iteration-count: infinite;
254- -webkit-animation-timing-function: ease-in-out;
255-
256- -moz-animation-duration: 0.7s;
257- -moz-animation-name: ues-error-pulsating;
258- -moz-animation-direction: alternate;
259- -moz-animation-iteration-count: infinite;
260- -moz-animation-timing-function: ease-in-out;
261+ animation: ues-error-pulsating 0.7s ease-in-out infinite alternate;
262 }
263 .ues-information {
264 background-color: #B9E9FA;
265
266=== renamed file 'src/forms.scss' => 'src/forms.css'
267--- src/forms.scss 2013-11-22 17:18:41 +0000
268+++ src/forms.css 2014-01-02 12:51:09 +0000
269@@ -11,7 +11,7 @@
270 legend {
271 display:block;
272 width:100%;
273- font-size:23px; // as per .ues-hmedium
274+ font-size:23px;
275 line-height:inherit;
276 border:0;
277 margin:0 0 1em 0;
278
279=== renamed file 'src/layout.scss' => 'src/layout.css'
280--- src/layout.scss 2013-11-22 17:18:41 +0000
281+++ src/layout.css 2014-01-02 12:51:09 +0000
282@@ -1,14 +1,38 @@
283+[class*="ues-"],
284+[class*="ues-"]:before,
285+[class*="ues-"]:after,
286+[class*="ues-"] *,
287+[class*="ues-"] *:before,
288+[class*="ues-"] *:after {
289+ box-sizing: border-box;
290+}
291+
292+/** modifiers/globals **/
293+
294+.pull-left {
295+ float:left;
296+}
297+.pull-right {
298+ float:right;
299+}
300+
301 /**
302- * 1. Banner
303- * 2. Footer
304- * 3. Boxes
305- * 4. Content Types (pages v apps)
306+ * http://nicolasgallagher.com/micro-clearfix-hack/
307 */
308+.clear:before,
309+.clear:after {
310+ content: " ";
311+ display: table;
312+}
313
314+.clear:after {
315+ clear:both;
316+}
317
318 /**
319 * Banner
320 */
321+
322 .ues-banner {
323 }
324
325@@ -23,9 +47,6 @@
326
327 .ues-footer > .ues-footer-row {
328 font-size:11px;
329- @media screen and (max-width: 320px) {
330- font-size:14px;
331- }
332 padding:2em 1em;
333 background-color:#f7f6f5;
334 border-top:1px solid #d8d8d8;
335@@ -33,13 +54,16 @@
336
337 .ues-footer > .ues-footer-row + .ues-footer-row {
338 font-size:12px;
339- @media screen and (max-width: 320px) {
340- font-size:14px;
341- }
342 background-color:#efedec;
343 border-top:1px solid #d8d8d8;
344 }
345
346+@media screen and (max-width: 320px) {
347+ .ues-footer > .ues-footer-row {
348+ font-size:14px;
349+ }
350+}
351+
352 .ues-footer a {
353 color:#333;
354 }
355@@ -69,7 +93,6 @@
356 .ues-box {
357 padding:20px;
358 margin:0 0 2em 0;
359- -webkit-border-radius: 4px;
360 border-radius:12px;
361 padding: 20px;
362 }
363@@ -90,20 +113,24 @@
364 }
365
366 .ues-container {
367- @media screen and (min-width: 767px) {
368- }
369- @media screen and (min-width: 979px) {
370+ margin:0 auto;
371+}
372+
373+@media screen and (min-width: 979px) {
374+ .ues-container {
375 max-width: 970px;
376 }
377- margin:0 auto;
378 }
379
380 .ues-container-small {
381- @media screen and (min-width: 760px) {
382+ margin:0 1em;
383+}
384+
385+@media screen and (min-width: 760px) {
386+ .ues-container-small {
387 max-width: 480px;
388 margin:0 auto;
389 }
390- margin:0 1em;
391 }
392
393 .ues-well {
394
395=== renamed file 'src/navigation.scss' => 'src/navigation.css'
396--- src/navigation.scss 2013-11-22 17:18:41 +0000
397+++ src/navigation.css 2014-01-02 12:51:09 +0000
398@@ -19,7 +19,7 @@
399 .ues-menu li span {
400 display:block;
401 position:relative;
402- padding:10px 15px; // don't use em's as we need predictable spacing
403+ padding:10px 15px; /* don't use em's as we need predictable spacing */
404 }
405
406 .ues-menu li a:hover,
407@@ -67,8 +67,8 @@
408 * **/
409 }
410
411-.ues-navbar-text.welcome {
412- @media screen and (max-width: 720px) {
413+@media screen and (max-width: 720px) {
414+ .ues-navbar-text.welcome {
415 display:none;
416 }
417 }
418@@ -80,7 +80,10 @@
419 border-left:1px solid #f75216;
420 border-right:1px solid #f75216;
421 font-size:22px;
422- @media screen and (min-width: 480px) {
423+}
424+
425+@media screen and (min-width: 480px) {
426+ .ues-navbar-toggle {
427 display:none;
428 }
429 }
430@@ -184,8 +187,8 @@
431 }
432
433
434-.ues-navbar-primary-nav .ues-menu {
435- @media screen and (max-width: 480px) {
436+@media screen and (max-width: 480px) {
437+ .ues-navbar-primary-nav .ues-menu {
438 position:absolute;
439 top:64px;
440 left:0;
441@@ -196,17 +199,13 @@
442 background:#333;
443 transition: all 0.3s ease 0s;
444 }
445-}
446
447-.ues-navbar-primary-nav .ues-menu li {
448- @media screen and (max-width: 480px) {
449+ .ues-navbar-primary-nav .ues-menu li {
450 display:block;
451 float:none;
452 }
453-}
454
455-.ues-navbar-primary-nav.open .ues-menu {
456- @media screen and (max-width: 480px) {
457+ .ues-navbar-primary-nav.open .ues-menu {
458 left:200px;
459 }
460 }
461
462=== removed file 'src/normalize.scss'
463--- src/normalize.scss 2013-11-28 18:10:54 +0000
464+++ src/normalize.scss 1970-01-01 00:00:00 +0000
465@@ -1,406 +0,0 @@
466-/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
467-
468-/* ==========================================================================
469- HTML5 display definitions
470- ========================================================================== */
471-
472-/**
473- * Correct `block` display not defined in IE 8/9.
474- */
475-
476-article,
477-aside,
478-details,
479-figcaption,
480-figure,
481-footer,
482-header,
483-hgroup,
484-main,
485-nav,
486-section,
487-summary {
488- display: block;
489-}
490-
491-/**
492- * Correct `inline-block` display not defined in IE 8/9.
493- */
494-
495-audio,
496-canvas,
497-video {
498- display: inline-block;
499-}
500-
501-/**
502- * Prevent modern browsers from displaying `audio` without controls.
503- * Remove excess height in iOS 5 devices.
504- */
505-
506-audio:not([controls]) {
507- display: none;
508- height: 0;
509-}
510-
511-/**
512- * Address `[hidden]` styling not present in IE 8/9.
513- * Hide the `template` element in IE, Safari, and Firefox < 22.
514- */
515-
516-[hidden],
517-template {
518- display: none;
519-}
520-
521-/* ==========================================================================
522- Base
523- ========================================================================== */
524-
525-/**
526- * 1. Set default font family to sans-serif.
527- * 2. Prevent iOS text size adjust after orientation change, without disabling
528- * user zoom.
529- */
530-
531-html {
532- font-family: sans-serif; /* 1 */
533- -ms-text-size-adjust: 100%; /* 2 */
534- -webkit-text-size-adjust: 100%; /* 2 */
535-}
536-
537-/**
538- * Remove default margin.
539- */
540-
541-body {
542- margin: 0;
543-}
544-
545-/* ==========================================================================
546- Links
547- ========================================================================== */
548-
549-/**
550- * Remove the gray background color from active links in IE 10.
551- */
552-
553-a {
554- background: transparent;
555-}
556-
557-/**
558- * Address `outline` inconsistency between Chrome and other browsers.
559- */
560-
561-a:focus {
562- outline: thin dotted;
563-}
564-
565-/**
566- * Improve readability when focused and also mouse hovered in all browsers.
567- */
568-
569-a:active,
570-a:hover {
571- outline: 0;
572-}
573-
574-/* ==========================================================================
575- Typography
576- ========================================================================== */
577-
578-/**
579- * Address variable `h1` font-size and margin within `section` and `article`
580- * contexts in Firefox 4+, Safari 5, and Chrome.
581- */
582-
583-h1 {
584- font-size: 2em;
585- margin: 0.67em 0;
586-}
587-
588-/**
589- * Address styling not present in IE 8/9, Safari 5, and Chrome.
590- */
591-
592-abbr[title] {
593- border-bottom: 1px dotted;
594-}
595-
596-/**
597- * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
598- */
599-
600-b,
601-strong {
602- font-weight: bold;
603-}
604-
605-/**
606- * Address styling not present in Safari 5 and Chrome.
607- */
608-
609-dfn {
610- font-style: italic;
611-}
612-
613-/**
614- * Address differences between Firefox and other browsers.
615- */
616-
617-hr {
618- -moz-box-sizing: content-box;
619- box-sizing: content-box;
620- height: 0;
621-}
622-
623-/**
624- * Address styling not present in IE 8/9.
625- */
626-
627-mark {
628- background: #ff0;
629- color: #000;
630-}
631-
632-/**
633- * Correct font family set oddly in Safari 5 and Chrome.
634- */
635-
636-code,
637-kbd,
638-pre,
639-samp {
640- font-family: monospace, serif;
641- font-size: 1em;
642-}
643-
644-/**
645- * Improve readability of pre-formatted text in all browsers.
646- */
647-
648-pre {
649- white-space: pre-wrap;
650-}
651-
652-/**
653- * Set consistent quote types.
654- */
655-
656-q {
657- quotes: "\201C" "\201D" "\2018" "\2019";
658-}
659-
660-/**
661- * Address inconsistent and variable font size in all browsers.
662- */
663-
664-small {
665- font-size: 80%;
666-}
667-
668-/**
669- * Prevent `sub` and `sup` affecting `line-height` in all browsers.
670- */
671-
672-sub,
673-sup {
674- font-size: 75%;
675- line-height: 0;
676- position: relative;
677- vertical-align: baseline;
678-}
679-
680-sup {
681- top: -0.5em;
682-}
683-
684-sub {
685- bottom: -0.25em;
686-}
687-
688-/* ==========================================================================
689- Embedded content
690- ========================================================================== */
691-
692-/**
693- * Remove border when inside `a` element in IE 8/9.
694- */
695-
696-img {
697- border: 0;
698-}
699-
700-/**
701- * Correct overflow displayed oddly in IE 9.
702- */
703-
704-svg:not(:root) {
705- overflow: hidden;
706-}
707-
708-/* ==========================================================================
709- Figures
710- ========================================================================== */
711-
712-/**
713- * Address margin not present in IE 8/9 and Safari 5.
714- */
715-
716-figure {
717- margin: 0;
718-}
719-
720-/* ==========================================================================
721- Forms
722- ========================================================================== */
723-
724-/**
725- * Define consistent border, margin, and padding.
726- */
727-
728-fieldset {
729- border: 1px solid #c0c0c0;
730- margin: 0 2px;
731- padding: 0.35em 0.625em 0.75em;
732-}
733-
734-/**
735- * 1. Correct `color` not being inherited in IE 8/9.
736- * 2. Remove padding so people aren't caught out if they zero out fieldsets.
737- */
738-
739-legend {
740- border: 0; /* 1 */
741- padding: 0; /* 2 */
742-}
743-
744-/**
745- * 1. Correct font family not being inherited in all browsers.
746- * 2. Correct font size not being inherited in all browsers.
747- * 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
748- */
749-
750-button,
751-input,
752-select,
753-textarea {
754- font-family: inherit; /* 1 */
755- font-size: 100%; /* 2 */
756- margin: 0; /* 3 */
757-}
758-
759-/**
760- * Address Firefox 4+ setting `line-height` on `input` using `!important` in
761- * the UA stylesheet.
762- */
763-
764-button,
765-input {
766- line-height: normal;
767-}
768-
769-/**
770- * Address inconsistent `text-transform` inheritance for `button` and `select`.
771- * All other form control elements do not inherit `text-transform` values.
772- * Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+.
773- * Correct `select` style inheritance in Firefox 4+ and Opera.
774- */
775-
776-button,
777-select {
778- text-transform: none;
779-}
780-
781-/**
782- * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
783- * and `video` controls.
784- * 2. Correct inability to style clickable `input` types in iOS.
785- * 3. Improve usability and consistency of cursor style between image-type
786- * `input` and others.
787- */
788-
789-button,
790-html input[type="button"], /* 1 */
791-input[type="reset"],
792-input[type="submit"] {
793- -webkit-appearance: button; /* 2 */
794- cursor: pointer; /* 3 */
795-}
796-
797-/**
798- * Re-set default cursor for disabled elements.
799- */
800-
801-button[disabled],
802-html input[disabled] {
803- cursor: default;
804-}
805-
806-/**
807- * 1. Address box sizing set to `content-box` in IE 8/9/10.
808- * 2. Remove excess padding in IE 8/9/10.
809- */
810-
811-input[type="checkbox"],
812-input[type="radio"] {
813- box-sizing: border-box; /* 1 */
814- padding: 0; /* 2 */
815-}
816-
817-/**
818- * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
819- * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
820- * (include `-moz` to future-proof).
821- */
822-
823-input[type="search"] {
824- -webkit-appearance: textfield; /* 1 */
825- -moz-box-sizing: content-box;
826- -webkit-box-sizing: content-box; /* 2 */
827- box-sizing: content-box;
828-}
829-
830-/**
831- * Remove inner padding and search cancel button in Safari 5 and Chrome
832- * on OS X.
833- */
834-
835-input[type="search"]::-webkit-search-cancel-button,
836-input[type="search"]::-webkit-search-decoration {
837- -webkit-appearance: none;
838-}
839-
840-/**
841- * Remove inner padding and border in Firefox 4+.
842- */
843-
844-button::-moz-focus-inner,
845-input::-moz-focus-inner {
846- border: 0;
847- padding: 0;
848-}
849-
850-/**
851- * 1. Remove default vertical scrollbar in IE 8/9.
852- * 2. Improve readability and alignment in all browsers.
853- */
854-
855-textarea {
856- overflow: auto; /* 1 */
857- vertical-align: top; /* 2 */
858-}
859-
860-/* ==========================================================================
861- Tables
862- ========================================================================== */
863-
864-/**
865- * Remove most spacing between table cells.
866- */
867-
868-table {
869- border-collapse: collapse;
870- border-spacing: 0;
871-}
872
873=== renamed file 'src/pagination.scss' => 'src/pagination.css'
874=== renamed file 'src/base.scss' => 'src/typography.css'
875--- src/base.scss 2013-12-11 12:57:13 +0000
876+++ src/typography.css 2014-01-02 12:51:09 +0000
877@@ -3,37 +3,6 @@
878 color: #333;
879 }
880
881-[class*="ues-"],
882-[class*="ues-"]:before,
883-[class*="ues-"]:after,
884-[class*="ues-"] *,
885-[class*="ues-"] *:before,
886-[class*="ues-"] *:after {
887- box-sizing: border-box;
888-}
889-
890-/** modifiers/globals **/
891-
892-.pull-left {
893- float:left;
894-}
895-.pull-right {
896- float:right;
897-}
898-
899-/**
900- * http://nicolasgallagher.com/micro-clearfix-hack/
901- */
902-.clear:before,
903-.clear:after {
904- content: " ";
905- display: table;
906-}
907-
908-.clear:after {
909- clear:both;
910-}
911-
912 /** headlines **/
913
914 h1, h2, h3, h4, h5, h6 {
915
916=== modified file 'test/index.html'
917--- test/index.html 2013-12-12 14:41:55 +0000
918+++ test/index.html 2014-01-02 12:51:09 +0000
919@@ -8,15 +8,7 @@
920
921 <link href='//fonts.googleapis.com/css?family=Ubuntu:400,300,700' rel='stylesheet' type='text/css'>
922
923-<link rel="stylesheet" href="/css/normalize.css">
924-<link rel="stylesheet" href="/css/base.css">
925-<link rel="stylesheet" href="/css/buttons.css">
926-<link rel="stylesheet" href="/css/dropdowns.css">
927-<link rel="stylesheet" href="/css/feedback.css">
928-<link rel="stylesheet" href="/css/forms.css">
929-<link rel="stylesheet" href="/css/layout.css">
930-<link rel="stylesheet" href="/css/navigation.css">
931-<link rel="stylesheet" href="/css/pagination.css">
932+<link rel="stylesheet" href="/css/ulysses.css">
933
934 <!--
935

Subscribers

People subscribed via source and target branches