From d37878985d43b283024a7c4d0be0d27b6d6cf2da Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Fri, 23 Aug 2013 10:27:50 -0500 Subject: [PATCH] structure --- adam/css/framework/normalize-css/.bower.json | 23 --------- adam/css/framework/normalize-css/LICENSE.md | 19 ------- adam/css/framework/normalize-css/README.md | 49 ------------------- adam/css/framework/normalize-css/bower.json | 12 ----- adam/css/framework/theme.css | 0 {adam/css => css}/framework/framework.min.css | 0 adam/index.html => index.html | 1 + {adam/js => js}/angular/angular.js | 0 {adam/js => js}/framework/framework-init.js | 0 {adam/js => js}/framework/framework.min.js | 0 {adam/js => js}/framework/glue/angularGlue.js | 0 .../framework/components/_buttons.scss | 0 scss/framework/framework.scss | 43 ++++++++++++++++ .../framework/normalize.scss | 18 ++++++- 14 files changed, 60 insertions(+), 105 deletions(-) delete mode 100644 adam/css/framework/normalize-css/.bower.json delete mode 100644 adam/css/framework/normalize-css/LICENSE.md delete mode 100644 adam/css/framework/normalize-css/README.md delete mode 100644 adam/css/framework/normalize-css/bower.json delete mode 100644 adam/css/framework/theme.css rename {adam/css => css}/framework/framework.min.css (100%) rename adam/index.html => index.html (90%) rename {adam/js => js}/angular/angular.js (100%) rename {adam/js => js}/framework/framework-init.js (100%) rename {adam/js => js}/framework/framework.min.js (100%) rename {adam/js => js}/framework/glue/angularGlue.js (100%) rename adam/css/framework/structure.css => scss/framework/components/_buttons.scss (100%) create mode 100755 scss/framework/framework.scss rename adam/css/framework/normalize-css/normalize.css => scss/framework/normalize.scss (96%) mode change 100644 => 100755 diff --git a/adam/css/framework/normalize-css/.bower.json b/adam/css/framework/normalize-css/.bower.json deleted file mode 100644 index eedc1e0e89..0000000000 --- a/adam/css/framework/normalize-css/.bower.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "normalize-css", - "version": "2.1.2", - "main": "normalize.css", - "author": "Nicolas Gallagher", - "ignore": [ - "CHANGELOG.md", - "CONTRIBUTING.md", - "component.json", - "test.html" - ], - "homepage": "https://github.com/necolas/normalize.css", - "_release": "2.1.2", - "_resolution": { - "type": "version", - "tag": "v2.1.2", - "commit": "783d337293754992a56066df68ade69732231fc0" - }, - "_source": "git://github.com/necolas/normalize.css.git", - "_target": "~2.1.2", - "_originalSource": "normalize-css", - "_direct": true -} \ No newline at end of file diff --git a/adam/css/framework/normalize-css/LICENSE.md b/adam/css/framework/normalize-css/LICENSE.md deleted file mode 100644 index c6bcc9bf2d..0000000000 --- a/adam/css/framework/normalize-css/LICENSE.md +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) Nicolas Gallagher and Jonathan Neal - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/adam/css/framework/normalize-css/README.md b/adam/css/framework/normalize-css/README.md deleted file mode 100644 index 87b60ea559..0000000000 --- a/adam/css/framework/normalize-css/README.md +++ /dev/null @@ -1,49 +0,0 @@ -# normalize.css v2 - -Normalize.css is a customisable CSS file that makes browsers render all -elements more consistently and in line with modern standards. We researched the -differences between default browser styles in order to precisely target only -the styles that need normalizing. - -[Check out the demo](http://necolas.github.io/normalize.css/latest/test.html) - -[Legacy browser support is available in v1](https://github.com/necolas/normalize.css/tree/v1) - -## Install - -Download from the [project page](http://necolas.github.io/normalize.css/). - -Install with [Bower](http://bower.io/): `bower install --save normalize-css` - -## What does it do? - -* Preserves useful defaults, unlike many CSS resets. -* Normalizes styles for a wide range of elements. -* Corrects bugs and common browser inconsistencies. -* Improves usability with subtle improvements. -* Explains what code does using detailed comments. - -## How to use it - -Normalize.css is intended to be used as an alternative to CSS resets. - -It's suggested that you read the `normalize.css` file and consider customising -it to meet your needs. Alternatively, include the file in your project and -override the defaults later in your CSS. - -## Browser support - -* Google Chrome -* Mozilla Firefox 4+ -* Apple Safari 5+ -* Opera 12+ -* Internet Explorer 8+ - -## Contribute - -Please read the CONTRIBUTING.md - -## Acknowledgements - -Normalize.css is a project by [Nicolas Gallagher](https://github.com/necolas), -co-created with [Jonathan Neal](https://github.com/jonathantneal). diff --git a/adam/css/framework/normalize-css/bower.json b/adam/css/framework/normalize-css/bower.json deleted file mode 100644 index c96b7cd34d..0000000000 --- a/adam/css/framework/normalize-css/bower.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "normalize-css", - "version": "2.1.2", - "main": "normalize.css", - "author": "Nicolas Gallagher", - "ignore": [ - "CHANGELOG.md", - "CONTRIBUTING.md", - "component.json", - "test.html" - ] -} diff --git a/adam/css/framework/theme.css b/adam/css/framework/theme.css deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/adam/css/framework/framework.min.css b/css/framework/framework.min.css similarity index 100% rename from adam/css/framework/framework.min.css rename to css/framework/framework.min.css diff --git a/adam/index.html b/index.html similarity index 90% rename from adam/index.html rename to index.html index e56d7331c3..c8133ba87b 100644 --- a/adam/index.html +++ b/index.html @@ -1,5 +1,6 @@ + Framework Demo Home
diff --git a/adam/js/angular/angular.js b/js/angular/angular.js similarity index 100% rename from adam/js/angular/angular.js rename to js/angular/angular.js diff --git a/adam/js/framework/framework-init.js b/js/framework/framework-init.js similarity index 100% rename from adam/js/framework/framework-init.js rename to js/framework/framework-init.js diff --git a/adam/js/framework/framework.min.js b/js/framework/framework.min.js similarity index 100% rename from adam/js/framework/framework.min.js rename to js/framework/framework.min.js diff --git a/adam/js/framework/glue/angularGlue.js b/js/framework/glue/angularGlue.js similarity index 100% rename from adam/js/framework/glue/angularGlue.js rename to js/framework/glue/angularGlue.js diff --git a/adam/css/framework/structure.css b/scss/framework/components/_buttons.scss similarity index 100% rename from adam/css/framework/structure.css rename to scss/framework/components/_buttons.scss diff --git a/scss/framework/framework.scss b/scss/framework/framework.scss new file mode 100755 index 0000000000..075686e2ce --- /dev/null +++ b/scss/framework/framework.scss @@ -0,0 +1,43 @@ +// Make sure the charset is set appropriately +@charset "UTF-8"; + +// This includes all of the foundation global elements that are needed to work with any of the other files. +@import "foundation/variables"; + +// Foundation Components +@import + "foundation/components/global", + "foundation/components/grid", + "foundation/components/visibility", + "foundation/components/block-grid", + "foundation/components/type", + "foundation/components/buttons", + "foundation/components/forms", + "foundation/components/button-groups", + "foundation/components/dropdown-buttons", + "foundation/components/split-buttons", + "foundation/components/flex-video", + "foundation/components/section", + "foundation/components/top-bar", + "foundation/components/orbit", + "foundation/components/reveal", + "foundation/components/joyride", + "foundation/components/clearing", + "foundation/components/alert-boxes", + "foundation/components/breadcrumbs", + "foundation/components/custom-forms", + "foundation/components/keystrokes", + "foundation/components/labels", + "foundation/components/inline-lists", + "foundation/components/pagination", + "foundation/components/panels", + "foundation/components/pricing-tables", + "foundation/components/progress-bars", + "foundation/components/side-nav", + "foundation/components/sub-nav", + "foundation/components/switch", + "foundation/components/magellan", + "foundation/components/tables", + "foundation/components/thumbs", + "foundation/components/tooltips", + "foundation/components/dropdown"; \ No newline at end of file diff --git a/adam/css/framework/normalize-css/normalize.css b/scss/framework/normalize.scss old mode 100644 new mode 100755 similarity index 96% rename from adam/css/framework/normalize-css/normalize.css rename to scss/framework/normalize.scss index 6adf56e798..332bc56987 --- a/adam/css/framework/normalize-css/normalize.css +++ b/scss/framework/normalize.scss @@ -44,13 +44,19 @@ audio:not([controls]) { } /** - * Address styling not present in IE 8/9. + * Address `[hidden]` styling not present in IE 8/9. + * Hide the `template` element in IE, Safari, and Firefox < 22. */ -[hidden] { +[hidden], +template { display: none; } +script { + display: none !important; +} + /* ========================================================================== Base ========================================================================== */ @@ -79,6 +85,14 @@ body { Links ========================================================================== */ +/** + * Remove the gray background color from active links in IE 10. + */ + +a { + background: transparent; +} + /** * Address `outline` inconsistency between Chrome and other browsers. */