From 2c66ff3770b6ed52bb7aec6faf808b95040a3741 Mon Sep 17 00:00:00 2001 From: FezVrasta Date: Sat, 18 Oct 2014 16:17:31 +0200 Subject: [PATCH] removed .import extension from styles --- less/{_alerts.import.less => _alerts.less} | 0 ...nimations.import.less => _animations.less} | 0 less/{_buttons.import.less => _buttons.less} | 12 ++--- less/{_cards.import.less => _cards.less} | 4 +- ...heckboxes.import.less => _checkboxes.less} | 0 ...s_old.import.less => _checkboxes_old.less} | 0 less/{_dialogs.import.less => _dialogs.less} | 2 +- ...mport.less => _icons-material-design.less} | 0 less/{_icons.import.less => _icons.less} | 0 less/{_inputs.import.less => _inputs.less} | 0 less/{_lists.import.less => _lists.less} | 0 less/{_mixins.import.less => _mixins.less} | 0 less/{_navbar.import.less => _navbar.less} | 0 ...er.import.less => _plugin-nouislider.less} | 0 ...ize.import.less => _plugin-selectize.less} | 0 ...js.import.less => _plugin-snackbarjs.less} | 0 less/{_popups.import.less => _popups.less} | 0 .../{_progress.import.less => _progress.less} | 0 less/{_radios.import.less => _radios.less} | 0 less/{_shadows.import.less => _shadows.less} | 0 less/{_tabs.import.less => _tabs.less} | 16 +++---- ..._variables.import.less => _variables.less} | 0 ..._welljumbo.import.less => _welljumbo.less} | 0 less/material.less | 44 +++++++++---------- sass/{_alerts.import.scss => _alerts.scss} | 0 ...animations.import.scss => _animations.css} | 0 sass/{_buttons.import.scss => _buttons.scss} | 0 sass/{_cards.import.scss => _cards.scss} | 0 ...heckboxes.import.scss => _checkboxes.scss} | 0 sass/{_icons.import.scss => _icons.scss} | 0 sass/{_inputs.import.scss => _inputs.scss} | 0 sass/{_lists.import.scss => _lists.scss} | 0 sass/{_mixins.import.scss => _mixins.scss} | 0 sass/{_navbar.import.scss => _navbar.scss} | 0 ...er.import.scss => _plugin-nouislider.scss} | 0 ...js.import.scss => _plugin-snackbarjs.scss} | 0 sass/{_popups.import.scss => _popups.scss} | 0 .../{_progress.import.scss => _progress.scss} | 0 sass/{_radios.import.scss => _radios.scss} | 0 sass/{_shadows.import.scss => _shadows.scss} | 0 sass/{_tabs.import.scss => _tabs.scss} | 0 ..._variables.import.scss => _variables.scss} | 0 ..._welljumbo.import.scss => _welljumbo.scss} | 0 sass/material.scss | 38 ++++++++-------- template/material/js/material.js | 8 +++- 45 files changed, 64 insertions(+), 60 deletions(-) rename less/{_alerts.import.less => _alerts.less} (100%) rename less/{_animations.import.less => _animations.less} (100%) rename less/{_buttons.import.less => _buttons.less} (98%) rename less/{_cards.import.less => _cards.less} (97%) rename less/{_checkboxes.import.less => _checkboxes.less} (100%) rename less/{_checkboxes_old.import.less => _checkboxes_old.less} (100%) rename less/{_dialogs.import.less => _dialogs.less} (99%) rename less/{_icons-material-design.import.less => _icons-material-design.less} (100%) rename less/{_icons.import.less => _icons.less} (100%) rename less/{_inputs.import.less => _inputs.less} (100%) rename less/{_lists.import.less => _lists.less} (100%) rename less/{_mixins.import.less => _mixins.less} (100%) rename less/{_navbar.import.less => _navbar.less} (100%) rename less/{_plugin-nouislider.import.less => _plugin-nouislider.less} (100%) rename less/{_plugin-selectize.import.less => _plugin-selectize.less} (100%) rename less/{_plugin-snackbarjs.import.less => _plugin-snackbarjs.less} (100%) rename less/{_popups.import.less => _popups.less} (100%) rename less/{_progress.import.less => _progress.less} (100%) rename less/{_radios.import.less => _radios.less} (100%) rename less/{_shadows.import.less => _shadows.less} (100%) rename less/{_tabs.import.less => _tabs.less} (75%) rename less/{_variables.import.less => _variables.less} (100%) rename less/{_welljumbo.import.less => _welljumbo.less} (100%) rename sass/{_alerts.import.scss => _alerts.scss} (100%) rename sass/{_animations.import.scss => _animations.css} (100%) rename sass/{_buttons.import.scss => _buttons.scss} (100%) rename sass/{_cards.import.scss => _cards.scss} (100%) rename sass/{_checkboxes.import.scss => _checkboxes.scss} (100%) rename sass/{_icons.import.scss => _icons.scss} (100%) rename sass/{_inputs.import.scss => _inputs.scss} (100%) rename sass/{_lists.import.scss => _lists.scss} (100%) rename sass/{_mixins.import.scss => _mixins.scss} (100%) rename sass/{_navbar.import.scss => _navbar.scss} (100%) rename sass/{_plugin-nouislider.import.scss => _plugin-nouislider.scss} (100%) rename sass/{_plugin-snackbarjs.import.scss => _plugin-snackbarjs.scss} (100%) rename sass/{_popups.import.scss => _popups.scss} (100%) rename sass/{_progress.import.scss => _progress.scss} (100%) rename sass/{_radios.import.scss => _radios.scss} (100%) rename sass/{_shadows.import.scss => _shadows.scss} (100%) rename sass/{_tabs.import.scss => _tabs.scss} (100%) rename sass/{_variables.import.scss => _variables.scss} (100%) rename sass/{_welljumbo.import.scss => _welljumbo.scss} (100%) diff --git a/less/_alerts.import.less b/less/_alerts.less similarity index 100% rename from less/_alerts.import.less rename to less/_alerts.less diff --git a/less/_animations.import.less b/less/_animations.less similarity index 100% rename from less/_animations.import.less rename to less/_animations.less diff --git a/less/_buttons.import.less b/less/_buttons.less similarity index 98% rename from less/_buttons.import.less rename to less/_buttons.less index 4af36c4b..15ecb8ae 100644 --- a/less/_buttons.import.less +++ b/less/_buttons.less @@ -13,7 +13,7 @@ &:hover:not(.btn-link):not(.btn-flat) { .shadow-z-2-hover(); - } + } &:active:not(.btn-link):not(.btn-flat) { .shadow-z-3(); } @@ -22,12 +22,12 @@ background-color: @background-disabled !important; box-shadow: none; } - + transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1); outline: none !important; .variations(~":not(.btn-link)", background-color, @btn-default); - + &.btn-flat { background: none; box-shadow: none; @@ -51,11 +51,11 @@ color: @danger; } } - + &.btn-raised { .btn-shadow(); } - + &.btn-fab { margin: 0; padding: 15px; @@ -125,4 +125,4 @@ &:active:not(.btn-link) { .shadow-z-3(); } -} \ No newline at end of file +} diff --git a/less/_cards.import.less b/less/_cards.less similarity index 97% rename from less/_cards.import.less rename to less/_cards.less index 8e915977..2fb0cd2c 100644 --- a/less/_cards.import.less +++ b/less/_cards.less @@ -17,7 +17,7 @@ } /**************************************************************************/ - + border-radius: 2px; color: @card-body-text; @@ -57,7 +57,7 @@ margin: 0 !important; position: relative; bottom: 25px; - width: auto; + width: auto; &:first-child { left: -15px; } diff --git a/less/_checkboxes.import.less b/less/_checkboxes.less similarity index 100% rename from less/_checkboxes.import.less rename to less/_checkboxes.less diff --git a/less/_checkboxes_old.import.less b/less/_checkboxes_old.less similarity index 100% rename from less/_checkboxes_old.import.less rename to less/_checkboxes_old.less diff --git a/less/_dialogs.import.less b/less/_dialogs.less similarity index 99% rename from less/_dialogs.import.less rename to less/_dialogs.less index 47b6559f..f6698e2b 100644 --- a/less/_dialogs.import.less +++ b/less/_dialogs.less @@ -35,4 +35,4 @@ .modal-backdrop { display: none; -} \ No newline at end of file +} diff --git a/less/_icons-material-design.import.less b/less/_icons-material-design.less similarity index 100% rename from less/_icons-material-design.import.less rename to less/_icons-material-design.less diff --git a/less/_icons.import.less b/less/_icons.less similarity index 100% rename from less/_icons.import.less rename to less/_icons.less diff --git a/less/_inputs.import.less b/less/_inputs.less similarity index 100% rename from less/_inputs.import.less rename to less/_inputs.less diff --git a/less/_lists.import.less b/less/_lists.less similarity index 100% rename from less/_lists.import.less rename to less/_lists.less diff --git a/less/_mixins.import.less b/less/_mixins.less similarity index 100% rename from less/_mixins.import.less rename to less/_mixins.less diff --git a/less/_navbar.import.less b/less/_navbar.less similarity index 100% rename from less/_navbar.import.less rename to less/_navbar.less diff --git a/less/_plugin-nouislider.import.less b/less/_plugin-nouislider.less similarity index 100% rename from less/_plugin-nouislider.import.less rename to less/_plugin-nouislider.less diff --git a/less/_plugin-selectize.import.less b/less/_plugin-selectize.less similarity index 100% rename from less/_plugin-selectize.import.less rename to less/_plugin-selectize.less diff --git a/less/_plugin-snackbarjs.import.less b/less/_plugin-snackbarjs.less similarity index 100% rename from less/_plugin-snackbarjs.import.less rename to less/_plugin-snackbarjs.less diff --git a/less/_popups.import.less b/less/_popups.less similarity index 100% rename from less/_popups.import.less rename to less/_popups.less diff --git a/less/_progress.import.less b/less/_progress.less similarity index 100% rename from less/_progress.import.less rename to less/_progress.less diff --git a/less/_radios.import.less b/less/_radios.less similarity index 100% rename from less/_radios.import.less rename to less/_radios.less diff --git a/less/_shadows.import.less b/less/_shadows.less similarity index 100% rename from less/_shadows.import.less rename to less/_shadows.less diff --git a/less/_tabs.import.less b/less/_tabs.less similarity index 75% rename from less/_tabs.import.less rename to less/_tabs.less index b25cf484..4130b0bf 100644 --- a/less/_tabs.import.less +++ b/less/_tabs.less @@ -1,9 +1,9 @@ // main: material.less -.nav-tabs { +.nav-tabs { background: @navbar-default-bg; - > li { - > a { + > li { + > a { color: #FFFFFF; border: 0; margin: 0; @@ -12,11 +12,11 @@ border: 0; } } - &.active > a, - &.active > - a:hover, - &.open > a, - &.open > + &.active > a, + &.active > + a:hover, + &.open > a, + &.open > &:hover { background-color: transparent !important; border: 0 !important; diff --git a/less/_variables.import.less b/less/_variables.less similarity index 100% rename from less/_variables.import.less rename to less/_variables.less diff --git a/less/_welljumbo.import.less b/less/_welljumbo.less similarity index 100% rename from less/_welljumbo.import.less rename to less/_welljumbo.less diff --git a/less/material.less b/less/material.less index 463283db..89ca952f 100644 --- a/less/material.less +++ b/less/material.less @@ -1,11 +1,11 @@ // Material Theme 0.0.1 // ----------------------------------------------------- -@import "_variables.import.less"; -@import "_mixins.import.less"; -@import "_icons-material-design.import.less"; -@import "_animations.import.less"; -@import "_shadows.import.less"; +@import "_variables.less"; +@import "_mixins.less"; +@import "_icons-material-design.less"; +@import "_animations.less"; +@import "_shadows.less"; body { background-color: #EEEEEE; @@ -29,29 +29,29 @@ h5, h6{ } // Well and Jumbotrons -@import "_welljumbo.import.less"; +@import "_welljumbo.less"; // Buttons -@import "_buttons.import.less"; +@import "_buttons.less"; // Checkboxes -@import "_checkboxes.import.less"; +@import "_checkboxes.less"; // Radios -@import "_radios.import.less"; +@import "_radios.less"; // Text inputs -@import "_inputs.import.less"; +@import "_inputs.less"; legend { border-bottom: 0; } // Lists -@import "_lists.import.less"; +@import "_lists.less"; // Navbar -@import "_navbar.import.less"; +@import "_navbar.less"; .dropdown-menu { border: 0; @@ -71,10 +71,10 @@ legend { } // Alerts -@import "_alerts.import.less"; +@import "_alerts.less"; // Progress bar -@import "_progress.import.less"; +@import "_progress.less"; // Typography .text-warning { @@ -93,17 +93,17 @@ legend { color: @btn-info; } -@import "_tabs.import.less"; +@import "_tabs.less"; -@import "_popups.import.less"; +@import "_popups.less"; -@import "_icons.import.less"; +@import "_icons.less"; -@import "_cards.import.less"; +@import "_cards.less"; -@import "_dialogs.import.less"; +@import "_dialogs.less"; // External plugins -@import "_plugin-snackbarjs.import.less"; -@import "_plugin-nouislider.import.less"; -@import "_plugin-selectize.import.less"; +@import "_plugin-snackbarjs.less"; +@import "_plugin-nouislider.less"; +@import "_plugin-selectize.less"; diff --git a/sass/_alerts.import.scss b/sass/_alerts.scss similarity index 100% rename from sass/_alerts.import.scss rename to sass/_alerts.scss diff --git a/sass/_animations.import.scss b/sass/_animations.css similarity index 100% rename from sass/_animations.import.scss rename to sass/_animations.css diff --git a/sass/_buttons.import.scss b/sass/_buttons.scss similarity index 100% rename from sass/_buttons.import.scss rename to sass/_buttons.scss diff --git a/sass/_cards.import.scss b/sass/_cards.scss similarity index 100% rename from sass/_cards.import.scss rename to sass/_cards.scss diff --git a/sass/_checkboxes.import.scss b/sass/_checkboxes.scss similarity index 100% rename from sass/_checkboxes.import.scss rename to sass/_checkboxes.scss diff --git a/sass/_icons.import.scss b/sass/_icons.scss similarity index 100% rename from sass/_icons.import.scss rename to sass/_icons.scss diff --git a/sass/_inputs.import.scss b/sass/_inputs.scss similarity index 100% rename from sass/_inputs.import.scss rename to sass/_inputs.scss diff --git a/sass/_lists.import.scss b/sass/_lists.scss similarity index 100% rename from sass/_lists.import.scss rename to sass/_lists.scss diff --git a/sass/_mixins.import.scss b/sass/_mixins.scss similarity index 100% rename from sass/_mixins.import.scss rename to sass/_mixins.scss diff --git a/sass/_navbar.import.scss b/sass/_navbar.scss similarity index 100% rename from sass/_navbar.import.scss rename to sass/_navbar.scss diff --git a/sass/_plugin-nouislider.import.scss b/sass/_plugin-nouislider.scss similarity index 100% rename from sass/_plugin-nouislider.import.scss rename to sass/_plugin-nouislider.scss diff --git a/sass/_plugin-snackbarjs.import.scss b/sass/_plugin-snackbarjs.scss similarity index 100% rename from sass/_plugin-snackbarjs.import.scss rename to sass/_plugin-snackbarjs.scss diff --git a/sass/_popups.import.scss b/sass/_popups.scss similarity index 100% rename from sass/_popups.import.scss rename to sass/_popups.scss diff --git a/sass/_progress.import.scss b/sass/_progress.scss similarity index 100% rename from sass/_progress.import.scss rename to sass/_progress.scss diff --git a/sass/_radios.import.scss b/sass/_radios.scss similarity index 100% rename from sass/_radios.import.scss rename to sass/_radios.scss diff --git a/sass/_shadows.import.scss b/sass/_shadows.scss similarity index 100% rename from sass/_shadows.import.scss rename to sass/_shadows.scss diff --git a/sass/_tabs.import.scss b/sass/_tabs.scss similarity index 100% rename from sass/_tabs.import.scss rename to sass/_tabs.scss diff --git a/sass/_variables.import.scss b/sass/_variables.scss similarity index 100% rename from sass/_variables.import.scss rename to sass/_variables.scss diff --git a/sass/_welljumbo.import.scss b/sass/_welljumbo.scss similarity index 100% rename from sass/_welljumbo.import.scss rename to sass/_welljumbo.scss diff --git a/sass/material.scss b/sass/material.scss index 2eb126fb..11601a42 100644 --- a/sass/material.scss +++ b/sass/material.scss @@ -1,10 +1,10 @@ // Material Theme 0.0.1 // ----------------------------------------------------- -@import "_variables.import.scss"; -@import "_mixins.import.scss"; -@import "_animations.import.scss"; -@import "_shadows.import.scss"; +@import "_variables.scss"; +@import "_mixins.scss"; +@import "_animations.scss"; +@import "_shadows.scss"; body { background-color: #EEEEEE; @@ -21,19 +21,19 @@ body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { } // Well and Jumbotrons -@import "_welljumbo.import.scss"; +@import "_welljumbo.scss"; // Buttons -@import "_buttons.import.scss"; +@import "_buttons.scss"; // Checkboxes -@import "_checkboxes.import.scss"; +@import "_checkboxes.scss"; // Radios -@import "_radios.import.scss"; +@import "_radios.scss"; // Text inputs -@import "_inputs.import.scss"; +@import "_inputs.scss"; legend { border-bottom: 0; @@ -55,10 +55,10 @@ legend { } // Lists -@import "_lists.import.scss"; +@import "_lists.scss"; // Navbar -@import "_navbar.import.scss"; +@import "_navbar.scss"; .dropdown-menu { border: 0; @@ -76,13 +76,13 @@ legend { } // Alerts -@import "_alerts.import.scss"; +@import "_alerts.scss"; // Progress bar -@import "_progress.import.scss"; +@import "_progress.scss"; // Panels -@import "_cards.import.scss"; +@import "_cards.scss"; // Typography .text-warning { @@ -101,13 +101,13 @@ legend { color: $btn-info; } -@import "_tabs.import.scss"; +@import "_tabs.scss"; -@import "_popups.import.scss"; +@import "_popups.scss"; -@import "_icons.import.scss"; +@import "_icons.scss"; // External plugins -@import "_plugin-snackbarjs.import.scss"; -@import "_plugin-nouislider.import.scss"; +@import "_plugin-snackbarjs.scss"; +@import "_plugin-nouislider.scss"; diff --git a/template/material/js/material.js b/template/material/js/material.js index cc45a442..4bcd2f95 100644 --- a/template/material/js/material.js +++ b/template/material/js/material.js @@ -65,9 +65,13 @@ $(function (){ $(document).on("keydown", ".form-control", function(e) { var $this = $(this); - if($this.val() !== "" || isChar(e)) { + if(isChar(e)) { $this.removeClass("empty"); - } else { + } + }); + $(document).on("keyup", ".form-control", function() { + var $this = $(this); + if($this.val() === "") { $this.addClass("empty"); } });