Skip to content

Commit

Permalink
Lint files with sass-convert
Browse files Browse the repository at this point in the history
  • Loading branch information
wolfy1339 committed Nov 15, 2016
1 parent 6f7f83d commit 75053a3
Show file tree
Hide file tree
Showing 52 changed files with 4,543 additions and 4,229 deletions.
110 changes: 56 additions & 54 deletions src/scss/override/_alerts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,70 +5,72 @@ $alert-glyph-base: 48px;

// Override
.alert {
position: relative;
border: 0;
padding: spacing(xxs) spacing(xxs) spacing(xxs) spacing(xs, -4);
min-height: $alert-glyph-base;
position: relative;
border: 0;
padding: spacing(xxs) spacing(xxs) spacing(xxs) spacing(xs, -4);
min-height: $alert-glyph-base;

&.alert-dismissible {
padding-right: spacing(md);
}
&.alert-dismissible {
padding-right: spacing(md);
}

.alert-title {
@include type(t6, set-line-height);
margin-bottom: spacing(xxs, -7);
margin-top: spacing(xxs, -11);
}
.alert-title {
@include type(t6, set-line-height);

p {
@include type(t8, set-line-height);
margin: 0;
padding: spacing(xxs, -8) 0 0;
}
margin-bottom: spacing(xxs, -7);
margin-top: spacing(xxs, -11);
}

.close {
position: absolute;
top: 0;
right: 0;
z-index: 1;
line-height: 1;
opacity: 1;
height: $alert-glyph-base;
width: $alert-glyph-base;
p {
@include type(t8, set-line-height);

span {
font-size: 16px;
top: -5px;
position: relative;
}
}
margin: 0;
padding: spacing(xxs, -8) 0 0;
}

&.with-glyph {
padding-left: spacing(md);
}
.close {
position: absolute;
top: 0;
right: 0;
z-index: 1;
line-height: 1;
opacity: 1;
height: $alert-glyph-base;
width: $alert-glyph-base;

.alert-glyph {
position: absolute;
top: spacing(xxs);
left: spacing(xxs);
width: $alert-glyph-base / 2;
height: $alert-glyph-base / 2;
font-size: $alert-glyph-base / 2;
span {
font-size: 16px;
top: -5px;
position: relative;
}
}

// Color
color: $color-type-primary;
&.with-glyph {
padding-left: spacing(md);
}

&.alert-info {
background-color: $color-bg-light-vivid-mid;
color: $color-type-primary;
}
.alert-glyph {
position: absolute;
top: spacing(xxs);
left: spacing(xxs);
width: $alert-glyph-base / 2;
height: $alert-glyph-base / 2;
font-size: $alert-glyph-base / 2;
}

&.alert-warning {
background-color: rgba($color-lightyellow, .4);
}
// Color
color: $color-type-primary;

&.alert-danger {
background-color: rgba($color-alert, .3);
}
&.alert-info {
background-color: $color-bg-light-vivid-mid;
color: $color-type-primary;
}

&.alert-warning {
background-color: rgba($color-lightyellow, 0.4);
}

&.alert-danger {
background-color: rgba($color-alert, 0.3);
}
}
15 changes: 14 additions & 1 deletion src/scss/override/_bootstrap-optional.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Variables
// Variables
@import "bootstrap-sass/assets/stylesheets/bootstrap/variables";

// Mixins: Utilities
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/hide-text";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/opacity";
Expand All @@ -10,10 +11,12 @@
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/resize";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/responsive-visibility";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/size";

// @import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/tab-focus";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/text-emphasis";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/text-overflow";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/vendor-prefixes";

// Mixins: Components
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/alerts";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/buttons";
Expand All @@ -24,28 +27,34 @@
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/forms";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/progress-bar";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/table-row";

// Mixins: Skins
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/background-variant";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/border-radius";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/gradients";

// Mixins: Layout
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/center-block";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/nav-vertical-align";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/grid-framework";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/grid";

// Reset and dependencies
@import "bootstrap-sass/assets/stylesheets/bootstrap/normalize";
@import "bootstrap-sass/assets/stylesheets/bootstrap/print";

// @import "bootstrap-sass/assets/stylesheets/bootstrap/glyphicons";
// Core CSS
@import "bootstrap-sass/assets/stylesheets/bootstrap/scaffolding";
@import "bootstrap-sass/assets/stylesheets/bootstrap/type";
@import "bootstrap-sass/assets/stylesheets/bootstrap/code";

// @import "bootstrap-sass/assets/stylesheets/bootstrap/grid";
@import "bootstrap-sass/assets/stylesheets/bootstrap/tables";
@import "bootstrap-sass/assets/stylesheets/bootstrap/forms";
@import "bootstrap-sass/assets/stylesheets/bootstrap/buttons";

// Components
@import "bootstrap-sass/assets/stylesheets/bootstrap/component-animations";
@import "bootstrap-sass/assets/stylesheets/bootstrap/dropdowns";
Expand All @@ -59,19 +68,23 @@
@import "bootstrap-sass/assets/stylesheets/bootstrap/labels";
@import "bootstrap-sass/assets/stylesheets/bootstrap/badges";
@import "bootstrap-sass/assets/stylesheets/bootstrap/jumbotron";

// @import "bootstrap-sass/assets/stylesheets/bootstrap/thumbnails";
@import "bootstrap-sass/assets/stylesheets/bootstrap/alerts";
@import "bootstrap-sass/assets/stylesheets/bootstrap/progress-bars";

// @import "bootstrap-sass/assets/stylesheets/bootstrap/media";
@import "bootstrap-sass/assets/stylesheets/bootstrap/list-group";
@import "bootstrap-sass/assets/stylesheets/bootstrap/panels";
@import "bootstrap-sass/assets/stylesheets/bootstrap/responsive-embed";
@import "bootstrap-sass/assets/stylesheets/bootstrap/wells";
@import "bootstrap-sass/assets/stylesheets/bootstrap/close";

// Components w/ JavaScript
@import "bootstrap-sass/assets/stylesheets/bootstrap/modals";
@import "bootstrap-sass/assets/stylesheets/bootstrap/tooltip";
@import "bootstrap-sass/assets/stylesheets/bootstrap/popovers";

// @import "bootstrap-sass/assets/stylesheets/bootstrap/carousel";
// Utility classes
@import "bootstrap-sass/assets/stylesheets/bootstrap/utilities";
Expand Down
14 changes: 13 additions & 1 deletion src/scss/override/_bootstrap.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Variables
// Variables
@import "bootstrap-sass/assets/stylesheets/bootstrap/variables";

// Mixins: Utilities
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/hide-text";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/opacity";
Expand All @@ -10,10 +11,12 @@
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/resize";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/responsive-visibility";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/size";

// @import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/tab-focus";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/text-emphasis";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/text-overflow";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/vendor-prefixes";

// Mixins: Components
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/alerts";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/buttons";
Expand All @@ -24,19 +27,23 @@
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/forms";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/progress-bar";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/table-row";

// Mixins: Skins
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/background-variant";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/border-radius";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/gradients";

// Mixins: Layout
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/center-block";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/nav-vertical-align";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/grid-framework";
@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins/grid";

// Reset and dependencies
@import "bootstrap-sass/assets/stylesheets/bootstrap/normalize";
@import "bootstrap-sass/assets/stylesheets/bootstrap/print";

// @import "bootstrap-sass/assets/stylesheets/bootstrap/glyphicons";
// Core CSS
@import "bootstrap-sass/assets/stylesheets/bootstrap/scaffolding";
Expand All @@ -46,6 +53,7 @@
@import "bootstrap-sass/assets/stylesheets/bootstrap/tables";
@import "bootstrap-sass/assets/stylesheets/bootstrap/forms";
@import "bootstrap-sass/assets/stylesheets/bootstrap/buttons";

// Components
@import "bootstrap-sass/assets/stylesheets/bootstrap/component-animations";
@import "bootstrap-sass/assets/stylesheets/bootstrap/dropdowns";
Expand All @@ -59,20 +67,24 @@
@import "bootstrap-sass/assets/stylesheets/bootstrap/labels";
@import "bootstrap-sass/assets/stylesheets/bootstrap/badges";
@import "bootstrap-sass/assets/stylesheets/bootstrap/jumbotron";

// @import "bootstrap-sass/assets/stylesheets/bootstrap/thumbnails";
@import "bootstrap-sass/assets/stylesheets/bootstrap/alerts";
@import "bootstrap-sass/assets/stylesheets/bootstrap/progress-bars";

// @import "bootstrap-sass/assets/stylesheets/bootstrap/media";
@import "bootstrap-sass/assets/stylesheets/bootstrap/list-group";
@import "bootstrap-sass/assets/stylesheets/bootstrap/panels";
@import "bootstrap-sass/assets/stylesheets/bootstrap/responsive-embed";
@import "bootstrap-sass/assets/stylesheets/bootstrap/wells";
@import "bootstrap-sass/assets/stylesheets/bootstrap/close";

// Components w/ JavaScript
@import "bootstrap-sass/assets/stylesheets/bootstrap/modals";
@import "bootstrap-sass/assets/stylesheets/bootstrap/tooltip";
@import "bootstrap-sass/assets/stylesheets/bootstrap/popovers";
@import "bootstrap-sass/assets/stylesheets/bootstrap/carousel";

// Utility classes
@import "bootstrap-sass/assets/stylesheets/bootstrap/utilities";
@import "bootstrap-sass/assets/stylesheets/bootstrap/responsive-utilities";
9 changes: 4 additions & 5 deletions src/scss/override/_breadcrumb.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.breadcrumb {
.breadcrumb {
margin: spacing(xs, -4) 0 spacing(xs, +1);

@include type(t8);

a {
Expand All @@ -9,9 +10,9 @@
text-decoration: underline;
}
}

li {
margin: 0;
margin: 0;
}

> li + li:before {
Expand All @@ -24,7 +25,6 @@
&,
&.theme-default,
&.theme-light {

a {
&,
&:hover {
Expand All @@ -44,7 +44,6 @@

&.theme-alt,
&.theme-dark {

a {
&,
&:hover {
Expand Down
Loading

0 comments on commit 75053a3

Please sign in to comment.