From 8859405eef13113c1aadee808f95882c4e09a0f7 Mon Sep 17 00:00:00 2001 From: simongehrig Date: Sun, 19 Feb 2017 10:56:01 +0100 Subject: [PATCH] Structuring --- .idea/watcherTasks.xml | 25 ++++- Gemfile | 3 - Rakefile | 0 framework.css | 99 ++++++++++++++++++- framework.css.map | 8 +- framework.scss | 23 ++++- mixins/css/_filters.scss | 3 + mixins/css/{reset.scss => _reset.scss} | 0 mixins/css/filters.scss | 0 mixins/fx/{camera.scss => _camera.scss} | 2 +- mixins/layout/{layout.scss => _layout.scss} | 0 ...media-queries.scss => _media-queries.scss} | 0 12 files changed, 143 insertions(+), 20 deletions(-) delete mode 100644 Gemfile delete mode 100644 Rakefile create mode 100644 mixins/css/_filters.scss rename mixins/css/{reset.scss => _reset.scss} (100%) delete mode 100644 mixins/css/filters.scss rename mixins/fx/{camera.scss => _camera.scss} (83%) rename mixins/layout/{layout.scss => _layout.scss} (100%) rename mixins/queries/{media-queries.scss => _media-queries.scss} (100%) diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml index 821fd9c..a4a3a26 100644 --- a/.idea/watcherTasks.xml +++ b/.idea/watcherTasks.xml @@ -2,21 +2,40 @@ - + + + diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 80c8620..0000000 --- a/Gemfile +++ /dev/null @@ -1,3 +0,0 @@ -source :rubygems - -gem "autoprefixer-rails" \ No newline at end of file diff --git a/Rakefile b/Rakefile deleted file mode 100644 index e69de29..0000000 diff --git a/framework.css b/framework.css index 4a4242c..255f47b 100644 --- a/framework.css +++ b/framework.css @@ -1,3 +1,100 @@ /* Simons SCSS Framework */ +/* Basic CSS Functions */ +@CHARSET "ISO-8859-1"; +/* RESET -/*# sourceMappingURL=framework.css.map */ + SOURCE: + http://meyerweb.com/eric/tools/css/reset/ + v2.0 | 20110126 + License: none (public domain) + +*/ +html, body, div, span, applet, object, 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, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; } + +/* HTML5 display-role reset for older browsers */ +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; } + +ol, ul { + list-style: none; } + +blockquote, q { + quotes: none; } + +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; } + +table { + border-collapse: collapse; + border-spacing: 0 !important; } + +/* Layout */ +/* Queries */ +/* + +CONSTANTS + +*/ +/* + +Widths + +*/ +/* + +Queries + +*/ +/* + +QUERY-BUILDER + +*/ +/* FX / Effects */ +/* CONSTANTS */ +/* MIXINS */ +/* Manual Test Content */ +body { + -webkit-filter: blur(10px); + filter: blur(10px); + -webkit-filter: blur(10); + filter: blur(10); } + body:-webkit-full-screen a { + display: -webkit-box; + display: flex; } + body:-moz-full-screen a { + display: flex; } + body:-ms-fullscreen a { + display: -ms-flexbox; + display: flex; } + body:fullscreen a { + display: -webkit-box; + display: -ms-flexbox; + display: flex; } + body a { + -webkit-transform: scale(1.1); + transform: scale(1.1); + width: 99%; } + +/*# sourceMappingURL=framework.css.map */ \ No newline at end of file diff --git a/framework.css.map b/framework.css.map index 5b7ee95..bbc9b41 100644 --- a/framework.css.map +++ b/framework.css.map @@ -1,7 +1 @@ -{ -"version": 3, -"mappings": "AAAA,2BAA2B", -"sources": ["framework.scss"], -"names": [], -"file": "framework.css" -} \ No newline at end of file +{"version":3,"sources":["framework.scss","mixins/css/_reset.scss","mixins/queries/_media-queries.scss","mixins/fx/_camera.scss","mixins/css/_filters.scss"],"names":[],"mappings":"AACA,2BAA2B;AAC3B,yBAAyB;ACFzB,sBAAqB;AAErB;;;;;;;EAOE;AAEF;;;;;;;;;;;;;EAaE,UAAS;EACT,WAAU;EACV,UAAS;EACT,gBAAe;EACf,cAAa;EACb,yBAAwB,EAAA;;AAG1B,iDAAiD;AACjD;;EAEE,eAAc,EAAA;;AAGhB;EACE,iBAAgB,EAAA;;AAGlB;EACE,aAAY,EAAA;;AAGd;;EAEE,YAAW;EACX,cAAa,EAAA;;AAGf;EACE,0BAAyB;EACzB,6BAA4B,EAAA;;ADjD9B,YAAY;AAEZ,aAAa;AEPb;;;;EAIE;AAMF;;;;EAIE;AAOF;;;;EAIE;AAsCF;;;;EAIE;AF1DF,kBAAkB;AGTlB,eAAe;AAaf,YAAY;AHAZ,yBAAyB;AACzB;EACE,2BAAkB;UAAlB,mBAAkB;EIdlB,yBAAoB;UAApB,iBAAoB,EAAA;EJiBpB;IACE,qBAAa;IAAb,cAAa,EAAA;EADf;IACE,cAAa,EAAA;EADf;IACE,qBAAa;IAAb,cAAa,EAAA;EADf;IACE,qBAAa;IAAb,qBAAa;IAAb,cAAa,EAAA;EAEf;IACE,8BAAqB;YAArB,sBAAqB;IACrB,WAAS,EAAA","file":"framework.css"} \ No newline at end of file diff --git a/framework.scss b/framework.scss index 61c9306..eedec80 100644 --- a/framework.scss +++ b/framework.scss @@ -1,13 +1,26 @@ -/* Simons SCSS Framework */ +/* Simons SCSS Framework */ /* Basic CSS Functions */ @import "mixins/css/reset"; - +@import "mixins/css/filters"; /* Layout */ @import "mixins/layout/layout"; - /* Queries */ @import "mixins/queries/media-queries"; - /* FX / Effects */ -@import "mixins/fx/camera"; \ No newline at end of file +@import "mixins/fx/camera"; + + +/* Manual Test Content */ +body { + filter: blur(10px); + @include blur(10); + + &:fullscreen a { + display: flex; + } + a { + transform: scale(1.1); + width:99%; + } +} \ No newline at end of file diff --git a/mixins/css/_filters.scss b/mixins/css/_filters.scss new file mode 100644 index 0000000..83f8f43 --- /dev/null +++ b/mixins/css/_filters.scss @@ -0,0 +1,3 @@ +@mixin blur($pixel){ + filter: blur($pixel); +} \ No newline at end of file diff --git a/mixins/css/reset.scss b/mixins/css/_reset.scss similarity index 100% rename from mixins/css/reset.scss rename to mixins/css/_reset.scss diff --git a/mixins/css/filters.scss b/mixins/css/filters.scss deleted file mode 100644 index e69de29..0000000 diff --git a/mixins/fx/camera.scss b/mixins/fx/_camera.scss similarity index 83% rename from mixins/fx/camera.scss rename to mixins/fx/_camera.scss index 8c3e72b..882dd94 100644 --- a/mixins/fx/camera.scss +++ b/mixins/fx/_camera.scss @@ -18,7 +18,7 @@ $BACKWARD:3; /// @param {int} $direction /// @param {int} $direction -@mixin camera-focus($direction,$seconds:0.5,$pixels,$performance:0) { +@mixin camera-focus($direction,$seconds:0.5,$pixels:10,$performance:0) { /* Camera Focus Effect */ filter: blur($pixels); diff --git a/mixins/layout/layout.scss b/mixins/layout/_layout.scss similarity index 100% rename from mixins/layout/layout.scss rename to mixins/layout/_layout.scss diff --git a/mixins/queries/media-queries.scss b/mixins/queries/_media-queries.scss similarity index 100% rename from mixins/queries/media-queries.scss rename to mixins/queries/_media-queries.scss