Skip to content

Commit

Permalink
Lint fix for syntax
Browse files Browse the repository at this point in the history
  • Loading branch information
jackhowa committed Aug 7, 2020
1 parent 9d65e72 commit a3fd5fd
Show file tree
Hide file tree
Showing 22 changed files with 294 additions and 243 deletions.
30 changes: 15 additions & 15 deletions scss/_breakpoints.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
//
// Styleguide 1.2.1
$spacers: (
xxs: 0.25rem,
xs: 0.5rem,
sm: 1rem,
md: 1.5rem,
lg: 2rem,
xl: 3rem,
xxl: 4rem
xxs: 0.25rem,
xs: 0.5rem,
sm: 1rem,
md: 1.5rem,
lg: 2rem,
xl: 3rem,
xxl: 4rem
) !default;

// $grid-breakpoints
Expand All @@ -24,14 +24,14 @@ $spacers: (
//
// Styleguide 1.2.2
$grid-breakpoints: (
sm: 0rem,
md: 48rem,
lg: 64rem,
xl: 90rem
sm: 0,
md: 48rem,
lg: 64rem,
xl: 90rem
) !default;

$grid-breakpoints-max:(
sm: 47.9375rem,
md: 63.9375rem,
lg: 89.9375rem
$grid-breakpoints-max: (
sm: 47.9375rem,
md: 63.9375rem,
lg: 89.9375rem
) !default;
70 changes: 36 additions & 34 deletions scss/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,74 +21,76 @@
// Styleguide 6.0.0

.btn {
background-color: $primary-color;
border: 2px solid transparent;
border-radius: 2px;
color: $ui-btn-white-color;
display: inline-block;
&.btn-block{
display: block;
}
font-family: $secondary-font-family;
font-weight: $font-weight-bold;
font-size: calculateRem(16px);
font-weight: $font-weight-bold;
line-height: $headings-line-height;
color: $ui-btn-white-color;
background-color: $primary-color;

padding: map-get($spacers, 'sm') map-get($spacers, 'md');
text-align: center;
vertical-align: middle;
transition: all 0.3s ease 0s;
// box-shadow: 0 1px 2px 0 rgba(0,0,0,0.2);
user-select: none;
border: 2px solid transparent;
border-radius: 2px;
transition: all 0.3s ease 0s;
vertical-align: middle;

&.btn-block {
display: block;
}

padding: map-get($spacers, "sm") map-get($spacers, "md");
&.btn-lg {
padding: map-get($spacers, "md") map-get($spacers, "md");
padding: map-get($spacers, 'md') map-get($spacers, 'md');
}

&.btn-sm {
padding: map-get($spacers, "xs") map-get($spacers, "md");
padding: map-get($spacers, 'xs') map-get($spacers, 'md');
}

&.disabled,
&:disabled {
background-color: #b8c1cb;
color: $ui-btn-white-color;
background-color: #B8C1CB;
}

&:not(:disabled):not(.disabled):active,
&:not(:disabled):not(.disabled):hover {
&:hover {
background-color: lighten( $primary-color, 20% );
background-color: lighten($primary-color, 20%);
text-decoration: none;
}


&:active {
background-color: lighten( $primary-color, 20% );
border: 2px solid rgba(0,0,0,0.25);
background-color: lighten($primary-color, 20%);
border: 2px solid rgba(0, 0, 0, 0.25);
}
}


}

.btn-outline {
color: $primary-color;
background-color: transparent;
border: 1px solid $primary-color;
color: $primary-color;

&:not(:disabled):not(.disabled):active,
&:not(:disabled):not(.disabled):hover{
&:not(:disabled):not(.disabled):hover {
&:hover {
background-color: lighten($primary-color, 20%);
color: $ui-btn-white-color;
background-color: lighten( $primary-color, 20% );
text-decoration: none;
}


&:active {
background-color: lighten($primary-color, 20%);
border: 2px solid rgba(0, 0, 0, 0.25);
color: $ui-btn-white-color;
background-color: lighten( $primary-color, 20% );
border: 2px solid rgba(0,0,0,0.25);
}
}

Expand All @@ -97,20 +99,20 @@

@each $color, $value in $button-state-colors {
.btn-#{$color} {
color: $ui-btn-white-color;
background-color: $value;
color: $ui-btn-white-color;

&:not(:disabled):not(.disabled):active,
&:not(:disabled):not(.disabled):hover{
&:not(:disabled):not(.disabled):hover {
&:hover {
background-color: lighten( $value, 20% );
background-color: lighten($value, 20%);
text-decoration: none;
}


&:active {
background-color: lighten( $value, 20% );
border: 2px solid rgba(0,0,0,0.25);
background-color: lighten($value, 20%);
border: 2px solid rgba(0, 0, 0, 0.25);
}
}

Expand All @@ -119,24 +121,24 @@

@each $color, $value in $button-state-colors {
.btn-outline-#{$color} {
color: $value;
border: 1px solid $value;
background-color: transparent;
border: 1px solid $value;
color: $value;

&:not(:disabled):not(.disabled):active,
&:not(:disabled):not(.disabled):hover{
&:not(:disabled):not(.disabled):hover {
&:hover {
color: $ui-btn-white-color;
background-color: lighten($value, 20%);
border: 1px solid transparent;
background-color: lighten( $value, 20% );
color: $ui-btn-white-color;
text-decoration: none;
}


&:active {
background-color: lighten($value, 20%);
border: 2px solid rgba(0, 0, 0, 0.25);
color: $ui-btn-white-color;
background-color: lighten( $value, 20% );
border: 2px solid rgba(0,0,0,0.25);
}
}

Expand Down
22 changes: 11 additions & 11 deletions scss/_colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,27 @@
//
//
// Styleguide 3.1.0
$primary-color: #1B6FA6 !default;
$primary-color: #1b6fa6 !default;
$secondary-color: $primary-color !default;
$success-color: #00A321 !default;
$warning-color: #E07000 !default;
$danger-color: #DB0A07 !default;
$ui-light-gray: #DADADA !default;
$success-color: #00a321 !default;
$warning-color: #e07000 !default;
$danger-color: #db0a07 !default;
$ui-light-gray: #dadada !default;
$ui-medium-gray: #575757 !default;
$ui-dark-gray: #191919 !default;
$border-rule-color: $ui-light-gray !default;
$image-caption-rule-color: #9A9A9A !default;
$image-caption-rule-color: #9a9a9a !default;
$ui-primary-font-color: #191919 !default;
$ui-primary-header-color: $ui-dark-gray !default;
$link-color: $primary-color !default;
$ui-dark-secondary-color: $ui-dark-gray;

$ui-btn-white-color: #FFFFFF;
$ui-btn-white-color: #fff;
$button-state-colors: (
success: $success-color,
warning: $warning-color,
danger: $danger-color,
)
success: $success-color,
warning: $warning-color,
danger: $danger-color,
);



Expand Down
26 changes: 19 additions & 7 deletions scss/_css_reset.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,39 @@ html {
* {
box-sizing: inherit;

&:before, &:after {
&::before,
&::after {
box-sizing: inherit;
}
}

body, h1, h2, h3, h4, h5, h6, p, ol, ul {
body,
h1,
h2,
h3,
h4,
h5,
h6,
p,
ol,
ul {
font-weight: normal;
margin: 0;
padding: 0;
font-weight: normal;
}

html, body {
width: 100%;
html,
body {
height: 100%;
width: 100%;
}

ol, ul {
ol,
ul {
list-style: none;
}

img {
max-width: 100%;
height: auto;
max-width: 100%;
}
7 changes: 3 additions & 4 deletions scss/_functions.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "variables";
@import 'variables';
// Scss Functions
//
// Styleguide 1.3.0
Expand Down Expand Up @@ -27,8 +27,7 @@
$character: str-slice($value, $i, $i);

@if not (index(map-keys($numbers), $character) or $character == '.') {
@return to-length(if($minus, -$result, $result), str-slice($value, $i))
}
@return to-length(if($minus, -$result, $result), str-slice($value, $i)); }

@if $character == '.' {
$digits: 1;
Expand Down Expand Up @@ -96,7 +95,7 @@
// $size: Can be either a number or string with the 'px' added
//
// Styleguide 1.3.5
@function calculateRem($size){
@function calculateRem($size) {
$size: strip-unit($size);
$remSize: $size / $default-font-size;
@return #{$remSize}rem;
Expand Down
55 changes: 34 additions & 21 deletions scss/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,54 @@ html {
font-size: 16px;
}

*, *:before, *:after {
*,
*::before,
*::after {
box-sizing: inherit;
}

body, h1, h2, h3, h4, h5, h6, p, ol, ul {
body,
h1,
h2,
h3,
h4,
h5,
h6,
p,
ol,
ul {
font-weight: normal;
margin: 0;
padding: 0;
font-weight: normal;
}

html, body {
width: 100%;
html,
body {
height: 100%;
width: 100%;
}

ol, ul {
ol,
ul {
list-style: none;
}

img {
max-width: 100%;
height: auto;
max-width: 100%;
}

@import "./variables";
@import "./functions";
@import "./breakpoints";
@import "./margins";
@import "./mixins";
@import "./padding";
@import "./colors";
@import "./typography/index";
@import "grid/index";
@import "utils/utils";
@import "./buttons";
@import "./links";
@import "components/figure_caption";
@import "components/chain_spacing";
@import './variables';
@import './functions';
@import './breakpoints';
@import './margins';
@import './mixins';
@import './padding';
@import './colors';
@import './typography/index';
@import 'grid/index';
@import 'utils/utils';
@import './buttons';
@import './links';
@import 'components/figure_caption';
@import 'components/chain_spacing';
Loading

0 comments on commit a3fd5fd

Please sign in to comment.