diff --git a/src/_includes/section-one.html b/src/_includes/section-one.html index 7dec8a6..3e3db3d 100644 --- a/src/_includes/section-one.html +++ b/src/_includes/section-one.html @@ -6,13 +6,5 @@ eget augue amet aliquet nisl cep donec

Aliquam ut ex ut augue consectetur interdum. Donec amet imperdiet eleifend
fringilla tincidunt. Nullam dui leo Aenean mi ligula, rhoncus ullamcorper.

- diff --git a/src/assets/styles/ie8.scss b/src/assets/styles/ie8.scss index 6676bb0..24c0656 100644 --- a/src/assets/styles/ie8.scss +++ b/src/assets/styles/ie8.scss @@ -26,7 +26,7 @@ /* Form */ label { - color: _palette(accent7, fg-bold); + color: _palette(accent2, fg-bold); } input[type="text"], @@ -34,7 +34,7 @@ input[type="email"], select, textarea { - border: solid 1px _palette(accent7, border); + border: solid 1px _palette(accent2, border); } /* Button */ @@ -44,7 +44,7 @@ input[type="button"], button, .button { - border: solid 2px _palette(accent7, border); + border: solid 2px _palette(accent2, border); &.special { border: 0 !important; diff --git a/src/assets/styles/libs/_vars.scss b/src/assets/styles/libs/_vars.scss index 4916f9b..af36180 100644 --- a/src/assets/styles/libs/_vars.scss +++ b/src/assets/styles/libs/_vars.scss @@ -50,41 +50,19 @@ border2: rgba(0,0,0,0.25), border2-bg: rgba(255,255,255,0.2) ), - + accent2: ( - bg: #00ffcc, - fg-bold: #ffffff, - fg: mix(#00ffcc, #ffffff, 25%), - fg-light: mix(#00ffcc, #ffffff, 40%), - border: rgba(0,0,0,0.125), - border-bg: rgba(255,255,255,0.075), - border2: rgba(0,0,0,0.25), - border2-bg: rgba(255,255,255,0.2) + bg: #ffffff, + fg-bold: #2E3842, + fg: #4E4852, + fg-light: #8E8892, + border: #dfdfdf, + border-bg: rgba(0,0,0,0.0375), + border2: #bfbfbf, + border2-bg: rgba(0,0,0,0.1) ), accent3: ( - bg: #00f0ff, - fg-bold: #ffffff, - fg: mix(#00f0ff, #ffffff, 25%), - fg-light: mix(#00f0ff, #ffffff, 40%), - border: rgba(0,0,0,0.125), - border-bg: rgba(255,255,255,0.075), - border2: rgba(0,0,0,0.25), - border2-bg: rgba(255,255,255,0.2) - ), - - accent4: ( - bg: #76ddff, - fg-bold: #ffffff, - fg: mix(#76ddff, #ffffff, 25%), - fg-light: mix(#76ddff, #ffffff, 40%), - border: rgba(0,0,0,0.125), - border-bg: rgba(255,255,255,0.075), - border2: rgba(0,0,0,0.25), - border2-bg: rgba(255,255,255,0.2) - ), - - accent5: ( bg: #505393, fg-bold: #ffffff, fg: mix(#505393, #ffffff, 25%), @@ -95,7 +73,7 @@ border2-bg: rgba(255,255,255,0.2) ), - accent6: ( + accent4: ( bg: #ed4933, fg-bold: #ffffff, fg: mix(#ed4933, #ffffff, 25%), @@ -104,16 +82,5 @@ border-bg: rgba(255,255,255,0.075), border2: rgba(0,0,0,0.25), border2-bg: rgba(255,255,255,0.2) - ), - - accent7: ( - bg: #ffffff, - fg-bold: _palette(bg), - fg: #4E4852, - fg-light: #8E8892, - border: #dfdfdf, - border-bg: rgba(0,0,0,0.0375), - border2: #bfbfbf, - border2-bg: rgba(0,0,0,0.1) ) ); \ No newline at end of file diff --git a/src/assets/styles/main.scss b/src/assets/styles/main.scss index 7657ea6..c4e7c7e 100644 --- a/src/assets/styles/main.scss +++ b/src/assets/styles/main.scss @@ -485,15 +485,15 @@ input[type="radio"] { } &.style1 { - color: _palette(accent2, bg); + color: _palette(accent1, bg); } &.style2 { - color: _palette(accent3, bg); + color: _palette(accent2, bg); } &.style3 { - color: _palette(accent4, bg); + color: _palette(accent3, bg); } } @@ -852,16 +852,16 @@ button, } &.special { - background-color: _palette(accent6, bg); + background-color: _palette(accent4, bg); box-shadow: none !important; - color: _palette(accent6, fg-bold) !important; + color: _palette(accent4, fg-bold) !important; &:hover { - background-color: lighten(_palette(accent6, bg), 5) !important; + background-color: lighten(_palette(accent4, bg), 5) !important; } &:active { - background-color: darken(_palette(accent6, bg), 5) !important; + background-color: darken(_palette(accent4, bg), 5) !important; } } @@ -904,7 +904,7 @@ button, &:before { display: block; - color: _palette(accent2, bg); + color: _palette(accent1, bg); position: absolute; left: 1.75em; top: 2.75em; @@ -1242,7 +1242,7 @@ button, } &.style3 { - @include wrapper(accent5); + @include wrapper(accent3); } &.style4 { @@ -1250,7 +1250,7 @@ button, } &.style5 { - @include wrapper(accent7); + @include wrapper(accent2); } @include breakpoint(medium) {