From 9a1de8d3e43e9ca28bb11e02b64dff5276927b55 Mon Sep 17 00:00:00 2001 From: FezVrasta Date: Wed, 8 Oct 2014 14:52:08 +0200 Subject: [PATCH] improved support for Meteor.js (#103) --- less/{_alerts.less => _alerts.import.less} | 0 ...nimations.less => _animations.import.less} | 0 less/{_buttons.less => _buttons.import.less} | 12 ++--- ...heckboxes.less => _checkboxes.import.less} | 0 ...s_old.less => _checkboxes_old.import.less} | 0 ...ess => _icons-material-design.import.less} | 10 ++--- less/{_icons.less => _icons.import.less} | 0 less/{_inputs.less => _inputs.import.less} | 0 less/{_lists.less => _lists.import.less} | 0 less/{_mixins.less => _mixins.import.less} | 0 less/{_navbar.less => _navbar.import.less} | 0 ...er.less => _plugin-nouislider.import.less} | 0 ...ize.less => _plugin-selectize.import.less} | 0 ...js.less => _plugin-snackbarjs.import.less} | 0 less/{_popups.less => _popups.import.less} | 0 .../{_progress.less => _progress.import.less} | 0 less/{_radios.less => _radios.import.less} | 0 less/{_shadows.less => _shadows.import.less} | 0 less/{_tabs.less => _tabs.import.less} | 0 ..._variables.less => _variables.import.less} | 3 +- ..._welljumbo.less => _welljumbo.import.less} | 9 +--- less/material.less | 42 +++++++++--------- sass/{_alerts.scss => _alerts.import.scss} | 0 ...nimations.scss => _animations.import.scss} | 0 sass/{_buttons.scss => _buttons.import.scss} | 0 sass/{_cards.scss => _cards.import.scss} | 2 +- ...heckboxes.scss => _checkboxes.import.scss} | 0 sass/{_icons.scss => _icons.import.scss} | 0 sass/{_inputs.scss => _inputs.import.scss} | 0 sass/{_lists.scss => _lists.import.scss} | 0 sass/{_mixins.scss => _mixins.import.scss} | 2 +- sass/{_navbar.scss => _navbar.import.scss} | 0 ...er.scss => _plugin-nouislider.import.scss} | 0 ...js.scss => _plugin-snackbarjs.import.scss} | 0 sass/{_popups.scss => _popups.import.scss} | 0 .../{_progress.scss => _progress.import.scss} | 0 sass/{_radios.scss => _radios.import.scss} | 0 sass/{_shadows.scss => _shadows.import.scss} | 0 sass/{_tabs.scss => _tabs.import.scss} | 0 ..._variables.scss => _variables.import.scss} | 44 +++++++++---------- ..._welljumbo.scss => _welljumbo.import.scss} | 0 sass/material.scss | 40 ++++++++--------- 42 files changed, 79 insertions(+), 85 deletions(-) rename less/{_alerts.less => _alerts.import.less} (100%) rename less/{_animations.less => _animations.import.less} (100%) rename less/{_buttons.less => _buttons.import.less} (91%) rename less/{_checkboxes.less => _checkboxes.import.less} (100%) rename less/{_checkboxes_old.less => _checkboxes_old.import.less} (100%) rename less/{_icons-material-design.less => _icons-material-design.import.less} (98%) rename less/{_icons.less => _icons.import.less} (100%) rename less/{_inputs.less => _inputs.import.less} (100%) rename less/{_lists.less => _lists.import.less} (100%) rename less/{_mixins.less => _mixins.import.less} (100%) rename less/{_navbar.less => _navbar.import.less} (100%) rename less/{_plugin-nouislider.less => _plugin-nouislider.import.less} (100%) rename less/{_plugin-selectize.less => _plugin-selectize.import.less} (100%) rename less/{_plugin-snackbarjs.less => _plugin-snackbarjs.import.less} (100%) rename less/{_popups.less => _popups.import.less} (100%) rename less/{_progress.less => _progress.import.less} (100%) rename less/{_radios.less => _radios.import.less} (100%) rename less/{_shadows.less => _shadows.import.less} (100%) rename less/{_tabs.less => _tabs.import.less} (100%) rename less/{_variables.less => _variables.import.less} (97%) rename less/{_welljumbo.less => _welljumbo.import.less} (91%) rename sass/{_alerts.scss => _alerts.import.scss} (100%) rename sass/{_animations.scss => _animations.import.scss} (100%) rename sass/{_buttons.scss => _buttons.import.scss} (100%) rename sass/{_cards.scss => _cards.import.scss} (99%) rename sass/{_checkboxes.scss => _checkboxes.import.scss} (100%) rename sass/{_icons.scss => _icons.import.scss} (100%) rename sass/{_inputs.scss => _inputs.import.scss} (100%) rename sass/{_lists.scss => _lists.import.scss} (100%) rename sass/{_mixins.scss => _mixins.import.scss} (99%) rename sass/{_navbar.scss => _navbar.import.scss} (100%) rename sass/{_plugin-nouislider.scss => _plugin-nouislider.import.scss} (100%) rename sass/{_plugin-snackbarjs.scss => _plugin-snackbarjs.import.scss} (100%) rename sass/{_popups.scss => _popups.import.scss} (100%) rename sass/{_progress.scss => _progress.import.scss} (100%) rename sass/{_radios.scss => _radios.import.scss} (100%) rename sass/{_shadows.scss => _shadows.import.scss} (100%) rename sass/{_tabs.scss => _tabs.import.scss} (100%) rename sass/{_variables.scss => _variables.import.scss} (74%) rename sass/{_welljumbo.scss => _welljumbo.import.scss} (100%) diff --git a/less/_alerts.less b/less/_alerts.import.less similarity index 100% rename from less/_alerts.less rename to less/_alerts.import.less diff --git a/less/_animations.less b/less/_animations.import.less similarity index 100% rename from less/_animations.less rename to less/_animations.import.less diff --git a/less/_buttons.less b/less/_buttons.import.less similarity index 91% rename from less/_buttons.less rename to less/_buttons.import.less index 7958a616..19f2dbd9 100644 --- a/less/_buttons.less +++ b/less/_buttons.import.less @@ -20,10 +20,10 @@ text-decoration: none; color: @darkbg-text; - &:hover, &:focus { + &:hover { color: @darkbg-text; } - &:hover:not(.btn-link), &:focus:not(.btn-link) { + &:hover:not(.btn-link) { .shadow-z-2-hover(); } transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1); @@ -38,12 +38,12 @@ // This is needed to style buttons which has not a variation suffix (they must stiled as btn-default) .btn-link, .btn:not([class^="btn btn-"]), .btn-default { color: @lightbg-text; - &:hover, &:focus { + &:hover { color: @lightbg-text; } } .btn:not([class^="btn btn-"]), .btn-default { - &:hover, &:focus { + &:hover { background-color: rgba(255,255,255,0.5); } } @@ -57,7 +57,7 @@ } .btn-flat { box-shadow: none !important; - &.btn-default:hover, &.btn-default:focus { + &.btn-default:hover { background: none; } } @@ -92,7 +92,7 @@ font-size: 26px; width: 56px; height: 56px; - &, &:hover, &:focus { + &, &:hover { .variations(~"", background-color, transparent); } &, .ripple-wrapper { diff --git a/less/_checkboxes.less b/less/_checkboxes.import.less similarity index 100% rename from less/_checkboxes.less rename to less/_checkboxes.import.less diff --git a/less/_checkboxes_old.less b/less/_checkboxes_old.import.less similarity index 100% rename from less/_checkboxes_old.less rename to less/_checkboxes_old.import.less diff --git a/less/_icons-material-design.less b/less/_icons-material-design.import.less similarity index 98% rename from less/_icons-material-design.less rename to less/_icons-material-design.import.less index c63e4f4c..ba69c532 100644 --- a/less/_icons-material-design.less +++ b/less/_icons-material-design.import.less @@ -1,10 +1,10 @@ @font-face { font-family: "Material-Design"; - src:url("../fonts/Material-Design.eot?2u7a7w"); - src:url("../fonts/Material-Design.eot?#iefix2u7a7w") format("embedded-opentype"), - url("../fonts/Material-Design.woff?2u7a7w") format("woff"), - url("../fonts/Material-Design.ttf?2u7a7w") format("truetype"), - url("../fonts/Material-Design.svg?2u7a7w#Material-Design") format("svg"); + src:url("@{material-font-path}/Material-Design.eot?2u7a7w"); + src:url("@{material-font-path}/Material-Design.eot?#iefix2u7a7w") format("embedded-opentype"), + url("@{material-font-path}/Material-Design.woff?2u7a7w") format("woff"), + url("@{material-font-path}/Material-Design.ttf?2u7a7w") format("truetype"), + url("@{material-font-path}/Material-Design.svg?2u7a7w#Material-Design") format("svg"); font-weight: normal; font-style: normal; } diff --git a/less/_icons.less b/less/_icons.import.less similarity index 100% rename from less/_icons.less rename to less/_icons.import.less diff --git a/less/_inputs.less b/less/_inputs.import.less similarity index 100% rename from less/_inputs.less rename to less/_inputs.import.less diff --git a/less/_lists.less b/less/_lists.import.less similarity index 100% rename from less/_lists.less rename to less/_lists.import.less diff --git a/less/_mixins.less b/less/_mixins.import.less similarity index 100% rename from less/_mixins.less rename to less/_mixins.import.less diff --git a/less/_navbar.less b/less/_navbar.import.less similarity index 100% rename from less/_navbar.less rename to less/_navbar.import.less diff --git a/less/_plugin-nouislider.less b/less/_plugin-nouislider.import.less similarity index 100% rename from less/_plugin-nouislider.less rename to less/_plugin-nouislider.import.less diff --git a/less/_plugin-selectize.less b/less/_plugin-selectize.import.less similarity index 100% rename from less/_plugin-selectize.less rename to less/_plugin-selectize.import.less diff --git a/less/_plugin-snackbarjs.less b/less/_plugin-snackbarjs.import.less similarity index 100% rename from less/_plugin-snackbarjs.less rename to less/_plugin-snackbarjs.import.less diff --git a/less/_popups.less b/less/_popups.import.less similarity index 100% rename from less/_popups.less rename to less/_popups.import.less diff --git a/less/_progress.less b/less/_progress.import.less similarity index 100% rename from less/_progress.less rename to less/_progress.import.less diff --git a/less/_radios.less b/less/_radios.import.less similarity index 100% rename from less/_radios.less rename to less/_radios.import.less diff --git a/less/_shadows.less b/less/_shadows.import.less similarity index 100% rename from less/_shadows.less rename to less/_shadows.import.less diff --git a/less/_tabs.less b/less/_tabs.import.less similarity index 100% rename from less/_tabs.less rename to less/_tabs.import.less diff --git a/less/_variables.less b/less/_variables.import.less similarity index 97% rename from less/_variables.less rename to less/_variables.import.less index 2f0a33ef..9b6230c3 100644 --- a/less/_variables.less +++ b/less/_variables.import.less @@ -1,6 +1,7 @@ // main: material.less - +// material icons path +@material-font-path: "../fonts"; // Material colors palette @red: #F44336; diff --git a/less/_welljumbo.less b/less/_welljumbo.import.less similarity index 91% rename from less/_welljumbo.less rename to less/_welljumbo.import.less index fe882152..c114fdee 100644 --- a/less/_welljumbo.less +++ b/less/_welljumbo.import.less @@ -2,13 +2,6 @@ body, .container, .container-fluid { .well, .well:not([class^="well well-material-"]) { - - &.well-sm { - padding: 9px; - } - &.well-lg { - padding: 24px; - } &, .form-control { color: @lightbg-text; } @@ -37,7 +30,7 @@ body, .container, .container-fluid { &, .form-control, .floating-label { color: @darkbg-text; } - .form-control { + .form-control { border-bottom-color: @darkbg-text; &::-webkit-input-placeholder { color: @darkbg-text; diff --git a/less/material.less b/less/material.less index f260ef28..069ea0d6 100644 --- a/less/material.less +++ b/less/material.less @@ -1,11 +1,11 @@ // Material Theme 0.0.1 // ----------------------------------------------------- -@import "_variables.less"; -@import "_mixins.less"; -@import "_icons-material-design.less"; -@import "_animations.less"; -@import "_shadows.less"; +@import "_variables.import.less"; +@import "_mixins.import.less"; +@import "_icons-material-design.import.less"; +@import "_animations.import.less"; +@import "_shadows.import.less"; body { background-color: #EEEEEE; @@ -18,23 +18,23 @@ body { } body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { - font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Roboto Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif; } // Well and Jumbotrons -@import "_welljumbo.less"; +@import "_welljumbo.import.less"; // Buttons -@import "_buttons.less"; +@import "_buttons.import.less"; // Checkboxes -@import "_checkboxes.less"; +@import "_checkboxes.import.less"; // Radios -@import "_radios.less"; +@import "_radios.import.less"; // Text inputs -@import "_inputs.less"; +@import "_inputs.import.less"; legend { border-bottom: 0; @@ -56,10 +56,10 @@ legend { } // Lists -@import "_lists.less"; +@import "_lists.import.less"; // Navbar -@import "_navbar.less"; +@import "_navbar.import.less"; .dropdown-menu { border: 0; @@ -77,10 +77,10 @@ legend { } // Alerts -@import "_alerts.less"; +@import "_alerts.import.less"; // Progress bar -@import "_progress.less"; +@import "_progress.import.less"; // Typography .text-warning { @@ -99,14 +99,14 @@ legend { color: @btn-info; } -@import "_tabs.less"; +@import "_tabs.import.less"; -@import "_popups.less"; +@import "_popups.import.less"; -@import "_icons.less"; +@import "_icons.import.less"; // External plugins -@import "_plugin-snackbarjs.less"; -@import "_plugin-nouislider.less"; -@import "_plugin-selectize.less"; +@import "_plugin-snackbarjs.import.less"; +@import "_plugin-nouislider.import.less"; +@import "_plugin-selectize.import.less"; diff --git a/sass/_alerts.scss b/sass/_alerts.import.scss similarity index 100% rename from sass/_alerts.scss rename to sass/_alerts.import.scss diff --git a/sass/_animations.scss b/sass/_animations.import.scss similarity index 100% rename from sass/_animations.scss rename to sass/_animations.import.scss diff --git a/sass/_buttons.scss b/sass/_buttons.import.scss similarity index 100% rename from sass/_buttons.scss rename to sass/_buttons.import.scss diff --git a/sass/_cards.scss b/sass/_cards.import.scss similarity index 99% rename from sass/_cards.scss rename to sass/_cards.import.scss index 69f4e7b0..5122af1a 100644 --- a/sass/_cards.scss +++ b/sass/_cards.import.scss @@ -127,4 +127,4 @@ } .card-material-lightgrey { @include card-variant($lightgrey, darken(#FFFFFF, 10%), darken($lightgrey, 10%)); -} \ No newline at end of file +} diff --git a/sass/_checkboxes.scss b/sass/_checkboxes.import.scss similarity index 100% rename from sass/_checkboxes.scss rename to sass/_checkboxes.import.scss diff --git a/sass/_icons.scss b/sass/_icons.import.scss similarity index 100% rename from sass/_icons.scss rename to sass/_icons.import.scss diff --git a/sass/_inputs.scss b/sass/_inputs.import.scss similarity index 100% rename from sass/_inputs.scss rename to sass/_inputs.import.scss diff --git a/sass/_lists.scss b/sass/_lists.import.scss similarity index 100% rename from sass/_lists.scss rename to sass/_lists.import.scss diff --git a/sass/_mixins.scss b/sass/_mixins.import.scss similarity index 99% rename from sass/_mixins.scss rename to sass/_mixins.import.scss index 66714175..31e4e889 100644 --- a/sass/_mixins.scss +++ b/sass/_mixins.import.scss @@ -29,4 +29,4 @@ @mixin icon-variant($color) { color: $color; -} \ No newline at end of file +} diff --git a/sass/_navbar.scss b/sass/_navbar.import.scss similarity index 100% rename from sass/_navbar.scss rename to sass/_navbar.import.scss diff --git a/sass/_plugin-nouislider.scss b/sass/_plugin-nouislider.import.scss similarity index 100% rename from sass/_plugin-nouislider.scss rename to sass/_plugin-nouislider.import.scss diff --git a/sass/_plugin-snackbarjs.scss b/sass/_plugin-snackbarjs.import.scss similarity index 100% rename from sass/_plugin-snackbarjs.scss rename to sass/_plugin-snackbarjs.import.scss diff --git a/sass/_popups.scss b/sass/_popups.import.scss similarity index 100% rename from sass/_popups.scss rename to sass/_popups.import.scss diff --git a/sass/_progress.scss b/sass/_progress.import.scss similarity index 100% rename from sass/_progress.scss rename to sass/_progress.import.scss diff --git a/sass/_radios.scss b/sass/_radios.import.scss similarity index 100% rename from sass/_radios.scss rename to sass/_radios.import.scss diff --git a/sass/_shadows.scss b/sass/_shadows.import.scss similarity index 100% rename from sass/_shadows.scss rename to sass/_shadows.import.scss diff --git a/sass/_tabs.scss b/sass/_tabs.import.scss similarity index 100% rename from sass/_tabs.scss rename to sass/_tabs.import.scss diff --git a/sass/_variables.scss b/sass/_variables.import.scss similarity index 74% rename from sass/_variables.scss rename to sass/_variables.import.scss index 0cef9df8..a977e733 100644 --- a/sass/_variables.scss +++ b/sass/_variables.import.scss @@ -3,30 +3,30 @@ // Material colors palette -$red: #F44336; -$pink: #E91E63; -$purple: #9C27B0; -$deeppurple: #673AB7; -$indigo: #3F51B5; -$lightblue: #03A9F4; -$cyan: #00BCD4; -$teal: #009688; -$lightgreen: #8BC34A; -$lime: #CDDC39; -$lightyellow: #FFEB3B; -$orange: #FF9800; -$deeporange: #FF5722; -$grey: #9E9E9E; -$bluegrey: #607D8B; -$brown: #795548; -$lightgrey: #ECECEC; +$red: #F44336 !default; +$pink: #E91E63 !default; +$purple: #9C27B0 !default; +$deeppurple: #673AB7 !default; +$indigo: #3F51B5 !default; +$lightblue: #03A9F4 !default; +$cyan: #00BCD4 !default; +$teal: #009688 !default; +$lightgreen: #8BC34A !default; +$lime: #CDDC39 !default; +$lightyellow: #FFEB3B !default; +$orange: #FF9800 !default; +$deeporange: #FF5722 !default; +$grey: #9E9E9E !default; +$bluegrey: #607D8B !default; +$brown: #795548 !default; +$lightgrey: #ECECEC !default; // Bootstrap shades -$primary: #4285F4; -$success: #0F9D58; -$info: $lightblue; -$warning: $deeporange; -$danger: $red; +$primary: #4285F4 !default; +$success: #0F9D58 !default; +$info: $lightblue !default; +$warning: $deeporange !default; +$danger: $red !default; // Typography elements for Material $darkbg-text: rgba(255,255,255,0.84); diff --git a/sass/_welljumbo.scss b/sass/_welljumbo.import.scss similarity index 100% rename from sass/_welljumbo.scss rename to sass/_welljumbo.import.scss diff --git a/sass/material.scss b/sass/material.scss index 371bb31a..2eb126fb 100644 --- a/sass/material.scss +++ b/sass/material.scss @@ -1,10 +1,10 @@ // Material Theme 0.0.1 // ----------------------------------------------------- -@import "_variables.scss"; -@import "_mixins.scss"; -@import "_animations.scss"; -@import "_shadows.scss"; +@import "_variables.import.scss"; +@import "_mixins.import.scss"; +@import "_animations.import.scss"; +@import "_shadows.import.scss"; body { background-color: #EEEEEE; @@ -17,23 +17,23 @@ body { } body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { - font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Roboto Condensed", "Helvetica Neue", Helvetica, Arial, sans-serif; } // Well and Jumbotrons -@import "_welljumbo.scss"; +@import "_welljumbo.import.scss"; // Buttons -@import "_buttons.scss"; +@import "_buttons.import.scss"; // Checkboxes -@import "_checkboxes.scss"; +@import "_checkboxes.import.scss"; // Radios -@import "_radios.scss"; +@import "_radios.import.scss"; // Text inputs -@import "_inputs.scss"; +@import "_inputs.import.scss"; legend { border-bottom: 0; @@ -55,10 +55,10 @@ legend { } // Lists -@import "_lists.scss"; +@import "_lists.import.scss"; // Navbar -@import "_navbar.scss"; +@import "_navbar.import.scss"; .dropdown-menu { border: 0; @@ -76,13 +76,13 @@ legend { } // Alerts -@import "_alerts.scss"; +@import "_alerts.import.scss"; // Progress bar -@import "_progress.scss"; +@import "_progress.import.scss"; // Panels -@import "_cards.scss"; +@import "_cards.import.scss"; // Typography .text-warning { @@ -101,13 +101,13 @@ legend { color: $btn-info; } -@import "_tabs.scss"; +@import "_tabs.import.scss"; -@import "_popups.scss"; +@import "_popups.import.scss"; -@import "_icons.scss"; +@import "_icons.import.scss"; // External plugins -@import "_plugin-snackbarjs.scss"; -@import "_plugin-nouislider.scss"; +@import "_plugin-snackbarjs.import.scss"; +@import "_plugin-nouislider.import.scss";