Skip to content

Commit

Permalink
fix(vuetify): updated styles to match vuetify@v1.1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
nmsmith22389 committed Jul 25, 2018
1 parent 6dc3cf6 commit 5fa3307
Show file tree
Hide file tree
Showing 100 changed files with 3,965 additions and 3,006 deletions.
9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 4
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
.DS_Store
.sass-cache/
*.css.map
/.idea
/.vscode
/node_modules
npm-debug.log
yarn-error.log
3 changes: 3 additions & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
node_modules/
resources/assets/sass/_settings.scss
public/css/
177 changes: 177 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
module.exports = {
"plugins": [
"stylelint-scss"
],
"rules": {
/**
*! ***************
*! Possible Errors
*! ***************
*/
//* Color
"color-no-invalid-hex": true,

//* Font Family
"font-family-no-duplicate-names": true,
"font-family-no-missing-generic-family-keyword": true,

//* Function
"function-calc-no-unspaced-operator": true,
"function-linear-gradient-no-nonstandard-direction": true,

//* String
"string-no-newline": true,

//* Unit
"unit-no-unknown": true,

//* Property
"property-no-unknown": true,

//* Keyframe Declaration
"keyframe-declaration-no-important": true,

//* Declaration Block
"declaration-block-no-duplicate-properties": true,
"declaration-block-no-shorthand-property-overrides": true,

//* Block
"block-no-empty": true,

//* Selector
"selector-pseudo-class-no-unknown": true,
"selector-pseudo-element-no-unknown": true,
"selector-type-no-unknown": true,

//* Media Feature
"media-feature-name-no-unknown": true,

//* At-Rule
// "at-rule-no-unknown": true,

//* Comment
"comment-no-empty": true,

//* General / Sheet
"no-descending-specificity": null,
"no-duplicate-at-import-rules": true,
"no-duplicate-selectors": true,
"no-empty-source": true,
"no-extra-semicolons": true,
"no-invalid-double-slash-comments": true,

/**
*! ***************
*! Limit Language Features
*! ***************
*/
//* Color
"color-named": "never",

//* Function
"function-url-no-scheme-relative": true,

//* Shorthand Property
"shorthand-property-no-redundant-values": true,

//* Value
"value-no-vendor-prefix": true,

//* Property
"property-no-vendor-prefix": true,

//* Declaration
"declaration-block-no-redundant-longhand-properties": true,
"declaration-no-important": true,

//* Declaration Block
"declaration-block-single-line-max-declarations": 1,

//* General / Sheet
"no-unknown-animations": true,

/**
*! ***************
*! Stylistic Issues
*! ***************
*/
//* Color
"color-hex-case": "lower",
"color-hex-length": "long",

//* Font Family
"font-family-name-quotes": "always-where-recommended",

//* Font Weight
"font-weight-notation": "numeric",

//* Function
"function-comma-newline-after": "always-multi-line",
"function-comma-space-after": "always-single-line",
"function-comma-space-before": "never",
"function-max-empty-lines": 0,
"function-name-case": "lower",
"function-parentheses-space-inside": "never-single-line",
"function-url-quotes": ["always", {"except": ["empty"]}],
"function-whitespace-after": "always",

//* Number
"number-leading-zero": "always",
"number-no-trailing-zeros": true,

//* String
"string-quotes": "single",

//* Length
"length-zero-no-unit": [true, {"ignore": ["custom-properties"]}],

//* Unit
"unit-case": "lower",

//* Value
"value-keyword-case": ["lower", {ignoreProperties: ["/font/"]}],

//* Value List
// "": true,

//* Custom Property
// "": true,

//* Property
// "": true,

//* Declaration
// "": true,

//* Declaration Block
// "": true,

//* Block
// "": true,

//* Selector
// "": true,

//* Selector List
// "": true,

//* Rule
// "": true,

//* Media Feature
// "": true,

//* Media Query List
// "": true,

//* At-Rule
// "": true,

//* Comment
// "": true,

//* General / Sheet
// "": true,

}
}
1 change: 1 addition & 0 deletions _browsers.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@mixin firefox() {
// stylelint-disable-next-line function-url-quotes
@-moz-document url-prefix() {
@content;
}
Expand Down
2 changes: 1 addition & 1 deletion app.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'settings/all';
@import 'generic/all';
@import 'elements/all';
@import 'tools/all';
@import 'elements/all';
@import 'trumps/all';
16 changes: 8 additions & 8 deletions components/_alerts.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// stylelint-disable declaration-no-important
@import '../bootstrap';

.alert {
.v-alert {
border-radius: $alert-border-radius;
border-width: $alert-border-width;
border-style: solid;
border-width: $alert-border-width;
color: #ffffff;
display: flex;
font-size: $alert-font-size;
Expand All @@ -13,14 +13,14 @@
position: relative;
transition: $primary-transition;

.alert__icon.icon,
&__dismissible .icon {
.v-alert__icon.v-icon,
&__dismissible .v-icon {
align-self: center;
color: $alert-icon-color;
font-size: $alert-icon-font-size;
}

&--outline .icon {
&--outline .v-icon {
color: inherit !important;
}

Expand All @@ -43,7 +43,7 @@
}

&--no-icon {
.alert__icon {
.v-alert__icon {
display: none;
}
}
Expand All @@ -60,10 +60,10 @@
}
}

// Double .alert is intended - it increases css specificity
// Double .v-alert is intended - it increases css specificity
// to properly set the border color where alert has set color
// with modifier (for example "red lighten-2")
.alert.alert {
.v-alert.v-alert {
border-color: map-get($material-light, dividers) !important;

&--outline {
Expand Down
13 changes: 11 additions & 2 deletions components/_all.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import 'app';
@import 'alerts';
@import 'autocompletes';
@import 'avatars';
@import 'badges';
@import 'bottom-navs';
Expand All @@ -11,6 +12,7 @@
@import 'carousel';
@import 'chips';
@import 'content';
@import 'counters';
@import 'data-iterator';
@import 'data-table';
@import 'date-picker-header';
Expand All @@ -20,22 +22,28 @@
@import 'dialogs';
@import 'dividers';
@import 'expansion-panel';
@import 'fa-icons';
@import 'footer';
@import 'forms';
@import 'grid';
@import 'icons';
@import 'fa-icons';
@import 'input-groups';
@import 'inputs';
@import 'jumbotrons';
@import 'labels';
@import 'lists';
@import 'menus';
@import 'messages';
@import 'navigation-drawer';
@import 'overflow-buttons';
@import 'overlay';
@import 'pagination';
@import 'parallax';
@import 'pickers';
@import 'progress-circular';
@import 'progress-linear';
@import 'radio-group';
@import 'radios';
@import 'range-sliders';
@import 'ripples';
@import 'select';
@import 'selection-controls';
Expand All @@ -50,6 +58,7 @@
@import 'tables';
@import 'tabs';
@import 'text-fields';
@import 'textarea';
@import 'time-picker-clock';
@import 'time-picker-title';
@import 'toolbar';
Expand Down
16 changes: 10 additions & 6 deletions components/_app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,40 @@
.application {
display: flex;

&--is-rtl {
direction: rtl;
}

&--wrap {
flex: 1 1 auto;
backface-visibility: hidden;
display: flex;
flex: 1 1 auto;
flex-direction: column;
min-height: 100vh;
max-width: 100%;
min-height: 100vh;
position: relative;
}
}

@mixin application($material) {
background: map-get($material, background);
color: map-get(map-get($material, text), primary);
color: map-deep-get($material, text, primary);

a {
cursor: pointer;
}

.text {
&--primary {
color: map-get(map-get($material, text), primary) !important;
color: map-deep-get($material, text, primary) !important;
}

&--secondary {
color: map-get(map-get($material, text), secondary) !important;
color: map-deep-get($material, text, secondary) !important;
}

&--disabled {
color: map-get(map-get($material, text), disabled) !important;
color: map-deep-get($material, text, disabled) !important;
}
}
}
Expand Down

0 comments on commit 5fa3307

Please sign in to comment.