From f4edecb3b022fae2f282e442ca32ec25657404a4 Mon Sep 17 00:00:00 2001 From: FezVrasta Date: Fri, 31 Oct 2014 09:26:12 +0100 Subject: [PATCH] removed references of the old less compiler --- less/_alerts.less | 1 - less/_buttons.less | 2 - less/_checkboxes.less | 1 - less/_checkboxes_old.less | 191 ----------------------------------- less/_inputs.less | 2 - less/_lists.less | 1 - less/_mixins.less | 2 - less/_navbar.less | 2 - less/_plugin-nouislider.less | 1 - less/_plugin-snackbarjs.less | 2 - less/_popups.less | 2 - less/_progress.less | 2 - less/_radios.less | 2 - less/_shadows.less | 3 - less/_tabs.less | 2 - less/_variables.less | 2 - less/_welljumbo.less | 1 - less/material.less | 3 - package.json | 5 +- sass/_alerts.scss | 2 - sass/_buttons.scss | 2 - sass/_checkboxes.scss | 2 - sass/_icons.scss | 2 - sass/_inputs.scss | 2 - sass/_lists.scss | 1 - sass/_navbar.scss | 6 +- sass/_plugin-nouislider.scss | 1 - sass/_plugin-snackbarjs.scss | 2 - sass/_popups.scss | 2 - sass/_progress.scss | 2 - sass/_radios.scss | 2 - sass/_shadows.scss | 3 - sass/_tabs.scss | 2 - sass/_variables.scss | 5 +- screenshots/Thumbs.db | Bin 6656 -> 0 bytes 35 files changed, 6 insertions(+), 257 deletions(-) delete mode 100644 less/_checkboxes_old.less delete mode 100644 screenshots/Thumbs.db diff --git a/less/_alerts.less b/less/_alerts.less index 2c109739..28fac8e3 100644 --- a/less/_alerts.less +++ b/less/_alerts.less @@ -1,4 +1,3 @@ -// main: material.less .alert { border: 0px; border-radius: 0; diff --git a/less/_buttons.less b/less/_buttons.less index f9d44d09..395b4e95 100644 --- a/less/_buttons.less +++ b/less/_buttons.less @@ -1,5 +1,3 @@ -// main: material.less - .btn { position: relative; padding: 8px 30px; diff --git a/less/_checkboxes.less b/less/_checkboxes.less index 3082e80e..131ea90b 100644 --- a/less/_checkboxes.less +++ b/less/_checkboxes.less @@ -1,4 +1,3 @@ - .form-horizontal .checkbox { padding-top: 20px; } diff --git a/less/_checkboxes_old.less b/less/_checkboxes_old.less deleted file mode 100644 index 9e6b8b6e..00000000 --- a/less/_checkboxes_old.less +++ /dev/null @@ -1,191 +0,0 @@ -// main: material.less - -.form-horizontal .checkbox { - padding-top: 15px; -} -.checkbox { - transform: rotate(0deg); - label { - cursor: pointer; - padding-left: 45px; - position: relative; - span { - display: block; - position: absolute; - left: 0px; - transition-duration: 0.2s; - } - .check:after { - display: block; - position: absolute; - content: ""; - background-color: @lightbg-text; - left: -5px; - top: -15px; - height: 50px; - width: 50px; - border-radius: 100%; - z-index: 1; - opacity: 0; - margin: 0; - } - .check:before { - display: block; - content: ""; - border: 2px solid @lightbg-text; - height: 20px; - width: 20px; - transition-delay: 0.2s; - } - } - - // Variations - .variations(~" .check", color, @success); - - // Hide native checkbox - input[type=checkbox] { opacity: 0; } - - input[type=checkbox] ~ .check:before { - position: absolute; - top: 2px; - left: 11px; - width: 18px; - height: 18px; - border: solid 2px; - border-color: #5a5a5a; - animation: uncheck 300ms ease-out forwards; - } - - input[type=checkbox]:focus ~ .check:after { - opacity: 0.2; - } - - input[type=checkbox]:checked ~ .check:before { - animation: check 300ms ease-out forwards; - } - - // Ripple effect on click - input[type=checkbox]:not(:checked) ~ .check:after { - animation: rippleOff 500ms linear forwards; - } - input[type=checkbox]:checked ~ .check:after { - animation: rippleOn 500ms linear forwards; - } - - // Make animate quickly when not hover - &:not(:hover) input[type=checkbox] ~ .check { - &:before, &:after { - animation-duration: 1ms; - } - } - - // Style for disabled inputs - input[type=checkbox][disabled]:not(:checked) ~ .check:before { - opacity: 0.5; - } - input[type=checkbox][disabled] ~ .check:after { - background-color: @lightbg-text; - transform: rotate(-45deg); - } - - .variations(~" input[type=checkbox]:checked ~ .check:after", background-color, @success); -} - -@keyframes uncheck { - 0% { - top: -3px; - left: 17px; - width: 10px; - height: 21px; - border-color: #0f9d58; - border-left-color: transparent; - border-top-color: transparent; - transform: rotate(45deg); - } - 50% { - top: 14px; - left: 17px; - width: 4px; - height: 4px; - transform: rotate(45deg); - border-color: #0f9d58; - border-left-color: transparent; - border-top-color: transparent; - } - 51% { - border-color: #5a5a5a; - border-left-color: #5a5a5a; - border-top-color: #5a5a5a; - } - 100% { - top: 1px; - left: 12px; - width: 18px; - height: 18px; - transform: rotate(0deg); - border-color: #5a5a5a; - border-left-color: #5a5a5a; - border-top-color: #5a5a5a; - } -} - -@keyframes check { - 100% { - top: -3px; - left: 17px; - width: 10px; - height: 21px; - transform: rotate(45deg); - border-color: #0f9d58; - border-left-color: transparent; - border-top-color: transparent; - } - 51% { - border-left: transparent; - border-top-color: transparent; - } - 50% { - top: 14px; - left: 17px; - width: 4px; - height: 4px; - transform: rotate(45deg); - border-color: #5a5a5a; - border-left-color: #5a5a5a; - border-top-color: #5a5a5a; - } - 0% { - top: 1px; - left: 12px; - width: 18px; - height: 18px; - transform: rotate(0deg); - border-color: #5a5a5a; - border-left-color: #5a5a5a; - border-top-color: #5a5a5a; - } -} - -@keyframes rippleOn { - 0% { - opacity: 0; - } - 50% { - opacity: 0.2; - } - 100% { - opacity: 0; - } -} - -@keyframes rippleOff { - 0% { - opacity: 0; - } - 50% { - opacity: 0.2; - } - 100% { - opacity: 0; - } -} diff --git a/less/_inputs.less b/less/_inputs.less index 9a762a7a..07e633e3 100644 --- a/less/_inputs.less +++ b/less/_inputs.less @@ -1,5 +1,3 @@ -// main: material.less - fieldset[disabled] .form-control, .form-control-wrapper .form-control, .form-control { &, &:focus, &.focus { &:not(textarea):not(select) { diff --git a/less/_lists.less b/less/_lists.less index b789e9de..f69f994b 100644 --- a/less/_lists.less +++ b/less/_lists.less @@ -1,4 +1,3 @@ -// main: material.less .list-group { border-radius: 0; .list-group-item { diff --git a/less/_mixins.less b/less/_mixins.less index 73ccffd0..488370fc 100644 --- a/less/_mixins.less +++ b/less/_mixins.less @@ -1,5 +1,3 @@ -// main: material.less - // usage: .variations(~" .check", color, transparent); .variations(@extra, @property, @default) { // Bootstrap shades diff --git a/less/_navbar.less b/less/_navbar.less index d7b3e2aa..e075777b 100644 --- a/less/_navbar.less +++ b/less/_navbar.less @@ -1,5 +1,3 @@ -// main: material.less - .navbar { background-color: @navbar-default-bg; border: 0; diff --git a/less/_plugin-nouislider.less b/less/_plugin-nouislider.less index 62873b38..46ed245f 100644 --- a/less/_plugin-nouislider.less +++ b/less/_plugin-nouislider.less @@ -1,4 +1,3 @@ -// main: material.less .noUi-target, .noUi-target * { -webkit-touch-callout: none; diff --git a/less/_plugin-snackbarjs.less b/less/_plugin-snackbarjs.less index 1c20899e..7c5e1892 100644 --- a/less/_plugin-snackbarjs.less +++ b/less/_plugin-snackbarjs.less @@ -1,5 +1,3 @@ -// main: material.less - // Support for SnackbarJS plugin // https://github.com/FezVrasta/snackbarjs diff --git a/less/_popups.less b/less/_popups.less index 433aae43..9d4f8ee1 100644 --- a/less/_popups.less +++ b/less/_popups.less @@ -1,5 +1,3 @@ -// main: material.less - .popover, .tooltip-inner { background: #323232; color: #FFF; diff --git a/less/_progress.less b/less/_progress.less index d2f9e1c2..8405f8fe 100644 --- a/less/_progress.less +++ b/less/_progress.less @@ -1,5 +1,3 @@ -// main: material.less - .progress { height: 4px; border-radius: 0; diff --git a/less/_radios.less b/less/_radios.less index ff0b42f4..6251705d 100644 --- a/less/_radios.less +++ b/less/_radios.less @@ -1,5 +1,3 @@ -// main: material.less - .form-horizontal .radio { margin-bottom: 10px; } diff --git a/less/_shadows.less b/less/_shadows.less index 5506d290..c3770817 100644 --- a/less/_shadows.less +++ b/less/_shadows.less @@ -1,6 +1,3 @@ -// main: material.less - - .shadow-z-1 { box-shadow: 0 1px 3px rgba(0,0,0, .12), 0 1px 2px rgba(0,0,0, .24) ; diff --git a/less/_tabs.less b/less/_tabs.less index efa0f710..8f734cf4 100644 --- a/less/_tabs.less +++ b/less/_tabs.less @@ -1,5 +1,3 @@ -// main: material.less - .nav-tabs { background: @navbar-default-bg; > li { diff --git a/less/_variables.less b/less/_variables.less index a246323c..78e0a7b3 100644 --- a/less/_variables.less +++ b/less/_variables.less @@ -1,5 +1,3 @@ -// main: material.less - // material icons path @material-font-path: "../fonts"; diff --git a/less/_welljumbo.less b/less/_welljumbo.less index c114fdee..23b5c335 100644 --- a/less/_welljumbo.less +++ b/less/_welljumbo.less @@ -1,4 +1,3 @@ -// main: material.less body, .container, .container-fluid { .well, .well:not([class^="well well-material-"]) { diff --git a/less/material.less b/less/material.less index aa02d6f4..087a5e8c 100644 --- a/less/material.less +++ b/less/material.less @@ -1,6 +1,3 @@ -// Material Theme 0.0.1 -// ----------------------------------------------------- - @import "_variables.less"; @import "_mixins.less"; @import "_icons-material-design.less"; diff --git a/package.json b/package.json index 32639804..e2fcf8db 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "bootstrap-material", - "version": "0.1.4", - "description": "Material Design for Bootstrap", + "version": "0.1.5", + "description": "Material Design for Bootstrap 3", "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" @@ -19,7 +19,6 @@ "devDependencies": { "grunt": "^0.4.5", "grunt-autoprefixer": "^1.0.1", - "grunt-contrib-clean": "^0.6.0", "grunt-contrib-connect": "^0.8.0", "grunt-contrib-copy": "^0.6.0", "grunt-contrib-cssmin": "^0.10.0", diff --git a/sass/_alerts.scss b/sass/_alerts.scss index 3d42e0db..aa0a3f0b 100644 --- a/sass/_alerts.scss +++ b/sass/_alerts.scss @@ -1,5 +1,3 @@ -// main: _material.scss - .alert { border: 0px; border-radius: 0; diff --git a/sass/_buttons.scss b/sass/_buttons.scss index 719ab562..5461bf2e 100644 --- a/sass/_buttons.scss +++ b/sass/_buttons.scss @@ -1,5 +1,3 @@ -// main: _material.scss - @mixin btn-shadow(){ @extend .shadow-z-2; transition: box-shadow transform 0.28s cubic-bezier(0.4, 0, 0.2, 1); diff --git a/sass/_checkboxes.scss b/sass/_checkboxes.scss index dbea75c4..8b8c72ac 100644 --- a/sass/_checkboxes.scss +++ b/sass/_checkboxes.scss @@ -1,5 +1,3 @@ -// main: _material.scss - .form-horizontal .checkbox { padding-top: 15px; } diff --git a/sass/_icons.scss b/sass/_icons.scss index 1ada364c..1ace7d3e 100644 --- a/sass/_icons.scss +++ b/sass/_icons.scss @@ -1,5 +1,3 @@ -// main: _material.scss - .icon {} // Navbar alternate diff --git a/sass/_inputs.scss b/sass/_inputs.scss index 7ff943ff..6699d1d6 100644 --- a/sass/_inputs.scss +++ b/sass/_inputs.scss @@ -1,5 +1,3 @@ -// main: _material.scss - fieldset[disabled] .form-control, .form-control-wrapper .form-control, .form-control { &, &:focus, &.focus { &:not(textarea):not(select) { diff --git a/sass/_lists.scss b/sass/_lists.scss index 476e4c8e..65ead8fc 100644 --- a/sass/_lists.scss +++ b/sass/_lists.scss @@ -1,4 +1,3 @@ -// main: _material.scss .list-group { border-radius: 0; .list-group-item { diff --git a/sass/_navbar.scss b/sass/_navbar.scss index 04f9ad76..27846fb4 100644 --- a/sass/_navbar.scss +++ b/sass/_navbar.scss @@ -1,5 +1,3 @@ -// main: _material.scss - .navbar { background-color: $navbar-default-bg; border: 0; @@ -19,8 +17,8 @@ .navbar-text { color: $navbar-color; - margin-top: 20px; - margin-bottom: 20px; + margin-top: 20px; + margin-bottom: 20px; } .navbar-nav { diff --git a/sass/_plugin-nouislider.scss b/sass/_plugin-nouislider.scss index f0651509..c3ed256b 100644 --- a/sass/_plugin-nouislider.scss +++ b/sass/_plugin-nouislider.scss @@ -1,4 +1,3 @@ -// main: _material.scss .noUi-target, .noUi-target * { -webkit-touch-callout: none; diff --git a/sass/_plugin-snackbarjs.scss b/sass/_plugin-snackbarjs.scss index f99b15f1..ed6e39c1 100644 --- a/sass/_plugin-snackbarjs.scss +++ b/sass/_plugin-snackbarjs.scss @@ -1,5 +1,3 @@ -// main: _material.scss - // Support for SnackbarJS plugin // https://github.com/FezVrasta/snackbarjs diff --git a/sass/_popups.scss b/sass/_popups.scss index 46a0089c..9d4f8ee1 100644 --- a/sass/_popups.scss +++ b/sass/_popups.scss @@ -1,5 +1,3 @@ -// main: _material.scss - .popover, .tooltip-inner { background: #323232; color: #FFF; diff --git a/sass/_progress.scss b/sass/_progress.scss index 5ea95f26..ff089c0b 100644 --- a/sass/_progress.scss +++ b/sass/_progress.scss @@ -1,5 +1,3 @@ -// main: _material.scss - .progress { height: 4px; border-radius: 0; diff --git a/sass/_radios.scss b/sass/_radios.scss index 1d594c19..c9fb1ac9 100644 --- a/sass/_radios.scss +++ b/sass/_radios.scss @@ -1,5 +1,3 @@ -// main: _material.scss - .form-horizontal .radio { margin-bottom: 10px; } diff --git a/sass/_shadows.scss b/sass/_shadows.scss index cc173c60..c3770817 100644 --- a/sass/_shadows.scss +++ b/sass/_shadows.scss @@ -1,6 +1,3 @@ -// main: _material.scss - - .shadow-z-1 { box-shadow: 0 1px 3px rgba(0,0,0, .12), 0 1px 2px rgba(0,0,0, .24) ; diff --git a/sass/_tabs.scss b/sass/_tabs.scss index 47db0806..21461680 100644 --- a/sass/_tabs.scss +++ b/sass/_tabs.scss @@ -1,5 +1,3 @@ -// main: _material.scss - .nav-tabs { background: $navbar-default-bg; > li { diff --git a/sass/_variables.scss b/sass/_variables.scss index 64e1edf2..da92ea75 100644 --- a/sass/_variables.scss +++ b/sass/_variables.scss @@ -1,6 +1,5 @@ -// main: _material.scss - - +// material icons path +$material-font-path: "../fonts"; // Material colors palette $red: #F44336 !default; diff --git a/screenshots/Thumbs.db b/screenshots/Thumbs.db deleted file mode 100644 index 64ebe4d725b0e46762d243d415a43a18d7592881..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6656 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