Skip to content
Snippets Groups Projects
Commit 41030f8e authored by M Miller's avatar M Miller
Browse files

update it-osu-pl-drupal

parent 4295fa5f
No related branches found
No related tags found
2 merge requests!3Theme in progress.,!1Feature/updates
Showing
with 52 additions and 68 deletions
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "82976970a3c6e13d60309848f5ef67d2", "content-hash": "ae5f0300e24328a7383e92f9bebbfeb6",
"packages": [ "packages": [
{ {
"name": "asm89/stack-cors", "name": "asm89/stack-cors",
...@@ -1619,16 +1619,16 @@ ...@@ -1619,16 +1619,16 @@
}, },
{ {
"name": "it-osu-web/it-osu-pl-drupal", "name": "it-osu-web/it-osu-pl-drupal",
"version": "v1.0.0-alpha", "version": "v1.0.0-beta",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/it-osu-web/it-osu-pl-drupal.git", "url": "https://github.com/it-osu-web/it-osu-pl-drupal.git",
"reference": "15fb9127fcaab2e5548ce528cb469dd80c3cfcb5" "reference": "29d27cdab86957e7208c3b03a71da6f683e4c91c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/it-osu-web/it-osu-pl-drupal/zipball/15fb9127fcaab2e5548ce528cb469dd80c3cfcb5", "url": "https://api.github.com/repos/it-osu-web/it-osu-pl-drupal/zipball/29d27cdab86957e7208c3b03a71da6f683e4c91c",
"reference": "15fb9127fcaab2e5548ce528cb469dd80c3cfcb5", "reference": "29d27cdab86957e7208c3b03a71da6f683e4c91c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1646,7 +1646,7 @@ ...@@ -1646,7 +1646,7 @@
} }
], ],
"description": "IT@OSU Pattern Lab assets for Drupal 8 theming", "description": "IT@OSU Pattern Lab assets for Drupal 8 theming",
"time": "2020-03-05T18:37:46+00:00" "time": "2020-03-19T17:42:48+00:00"
}, },
{ {
"name": "masterminds/html5", "name": "masterminds/html5",
...@@ -4185,7 +4185,7 @@ ...@@ -4185,7 +4185,7 @@
"aliases": [], "aliases": [],
"minimum-stability": "alpha", "minimum-stability": "alpha",
"stability-flags": { "stability-flags": {
"it-osu-web/it-osu-pl-drupal": 15 "it-osu-web/it-osu-pl-drupal": 10
}, },
"prefer-stable": true, "prefer-stable": true,
"prefer-lowest": false, "prefer-lowest": false,
......
// Neutrals.
$clear: rgba(0, 0, 0, 0); $clear: rgba(0, 0, 0, 0);
$white: #fff; $white: #fff;
$near-white: #f7f7f7; $near-white: #f2f2f2;
$gray-lightest: #eaeaea; $gray-light: #ccc;
$gray-lighter: #ccc;
$gray-light: #999;
$gray: #666; $gray: #666;
$gray-dark: #444446; $gray-dark: #3c3c3c;
$gray-darker: #303033; $near-black: #202022;
$gray-darkest: #202024;
$black: #000; $black: #000;
//colors // Colors.
$red: #b00; $red: #b00;
$red-dark: #830000; $red-dark: #830000;
$orange: #d65828; $orange: #d65828;
$orange-dark: #c04f24; $orange-dark: #ab4620;
$green: #909738; $green: #909738;
$green-dark: #73792d; $green-dark: #656927;
$teal: #1c7c89; $teal: #26686d;
$purple: #442369;
$purple: #5d3f82; $blue: #667b96;
$blue-dark: #476c97;
$violet: #851e5e; $violet: #851e5e;
// Other.
$gray-border: #ddd;
$color-border: $gray-light;
.sample-grid { .sample-grid {
margin-bottom: 2em; margin-bottom: 2em;
.cell { .cell {
background: $gray-lightest; background: $near-white;
padding: 10px 15px; padding: 10px 15px;
min-height: 80px; min-height: 80px;
} }
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
} }
.demo-animate { .demo-animate {
background-color: $gray-lightest; background-color: $near-white;
cursor: pointer; cursor: pointer;
padding: 1em; padding: 1em;
text-align: center; text-align: center;
......
...@@ -16,7 +16,7 @@ html { ...@@ -16,7 +16,7 @@ html {
body.footer-color { body.footer-color {
&--dk-gray { &--dk-gray {
background: $gray-darkest; background: $near-black;
} }
&--md-gray { &--md-gray {
...@@ -24,7 +24,7 @@ body.footer-color { ...@@ -24,7 +24,7 @@ body.footer-color {
} }
&--lt-gray { &--lt-gray {
background: $gray-lightest; background: $near-white;
} }
&--white { &--white {
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
text-transform: uppercase; text-transform: uppercase;
margin-bottom: 5px; margin-bottom: 5px;
clear: both; clear: both;
background: $gray-lightest; background: $near-white;
@include breakout; @include breakout;
padding: 6px 0 0 4.5%; padding: 6px 0 0 4.5%;
margin-top: 2.5em; margin-top: 2.5em;
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
display: block; display: block;
height: 100px; height: 100px;
margin-bottom: 0.3em; margin-bottom: 0.3em;
border: 1px solid $gray-lighter; border: 1px solid #bbb;
} }
} }
......
...@@ -31,12 +31,12 @@ ...@@ -31,12 +31,12 @@
h1, h1,
.h1 { .h1 {
@include heading(42, 800, $line-height: 1.1); @include heading(40, 800, $line-height: 1.1);
} }
h2, h2,
.h2 { .h2 {
@include heading(32, 700); @include heading(30, 700, $line-height: 1.1);
} }
h3, h3,
......
.blockquote { .blockquote {
border-left: solid 3px $gray-lighter; border-left: solid 3px $gray-light;
margin: 2em 0 2em 2em; margin: 2em 0 2em 2em;
padding-left: 1em; padding-left: 1em;
padding-right: 3em; padding-right: 3em;
...@@ -21,7 +21,7 @@ blockquote:not(.pull-quote) { ...@@ -21,7 +21,7 @@ blockquote:not(.pull-quote) {
} }
.pull-quote__icon { .pull-quote__icon {
color: $gray-lighter; color: $gray-light;
position: absolute; position: absolute;
top: 0.8em; top: 0.8em;
} }
......
...@@ -17,8 +17,7 @@ $color-link--hover: $teal; ...@@ -17,8 +17,7 @@ $color-link--hover: $teal;
} }
} }
a, a {
.link {
@include link; @include link;
} }
......
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
cursor: pointer; cursor: pointer;
&:active { &:active {
position: relative;
top: 1px;
background-color: darken($bg, 5%) !important; background-color: darken($bg, 5%) !important;
} }
...@@ -25,7 +23,7 @@ ...@@ -25,7 +23,7 @@
&:focus { &:focus {
background-color: lighten($bg, 3%); background-color: lighten($bg, 3%);
outline: 2px dotted $gray-darkest; outline: 2px dotted $near-black;
outline-offset: 0; outline-offset: 0;
} }
} }
...@@ -37,10 +35,7 @@ ...@@ -37,10 +35,7 @@
padding: 11px 16px 10px; padding: 11px 16px 10px;
&:active { &:active {
border: 1px solid $color;
background-color: darken($color, 5%) !important; background-color: darken($color, 5%) !important;
padding: 12px 16px 11px;
top: 0;
} }
&:hover { &:hover {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
} }
.list-item { .list-item {
margin-bottom: $space-y-third; margin-bottom: $space-y-half;
padding-left: $space-x-quarter; padding-left: $space-x-quarter;
} }
......
//common styles for all form elements //common styles for all form elements
.form-item { .form-item {
color: $gray-darker; color: $gray-dark;
margin-bottom: 0.5em; margin-bottom: 0.5em;
@include clearfix; @include clearfix;
...@@ -9,17 +9,11 @@ ...@@ -9,17 +9,11 @@
.form-item__label { .form-item__label {
display: block; display: block;
font-weight: 600; font-weight: 600;
// @include xs {
// display: block;
// margin-right: 2%;
// padding: 0.6em 0 0.3em 0;
// }
} }
.form-item__description { .form-item__description {
font-size: rem-calc(14); font-size: rem-calc(14);
margin-top: -0.5em; margin-top: 5px;
margin-bottom: 1.5em; margin-bottom: 1.5em;
} }
......
.form-item--checkboxes, .form-item--checkboxes {
.form-item--checkbox__item {
@include list-reset; @include list-reset;
@extend .form-options-list; @extend .form-options-list;
......
.form-item--radios, .form-item--radios {
.form-item--radio__item {
@include list-reset; @include list-reset;
@extend .form-options-list; @extend .form-options-list;
......
// CSS-only select styling (from https://github.com/filamentgroup/select-css) // CSS-only select styling (from https://github.com/filamentgroup/select-css)
.form-item__dropdown { .form-item__dropdown {
border: 1px solid $gray-lighter; border: 1px solid $gray-light;
background-color: $white; background-color: $white;
display: block; display: block;
position: relative; position: relative;
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
} }
&:hover { &:hover {
border-color: $gray-light; border-color: $gray;
&::after { &::after {
border-top: 9px solid $gray-dark; border-top: 9px solid $gray-dark;
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
} }
.form-item__select { .form-item__select {
border: 1px solid $gray-lightest; border: 1px solid $near-white;
font-size: rem-calc(14); font-size: rem-calc(14);
margin: 0; margin: 0;
outline: none; outline: none;
......
/* Styling for the text areas */ /* Styling for the text areas */
.form-item__textfield { .form-item__textfield {
border: 1px solid $gray-lighter; border: 1px solid $gray-light;
padding: 0.625em 1em; padding: 0.625em 1em;
margin-bottom: 1em; margin-bottom: 1em;
font-size: rem-calc(14); font-size: rem-calc(14);
...@@ -24,11 +24,11 @@ ...@@ -24,11 +24,11 @@
} }
&::-webkit-input-placeholder { &::-webkit-input-placeholder {
color: $gray-light; color: $gray;
} }
&:-moz-placeholder { &:-moz-placeholder {
color: $gray-light; color: $gray;
} }
&::-moz-placeholder { &::-moz-placeholder {
......
@mixin callout($color: $gray-light) { @mixin callout($color: $gray) {
border: 1px solid $color; border: 1px solid $color;
margin: 2em 0.625em; margin: 2em 0.625em;
padding: 0;
display: flex; display: flex;
align-items: stretch; align-items: stretch;
......
...@@ -2,17 +2,17 @@ ...@@ -2,17 +2,17 @@
details, details,
.details-item { .details-item {
margin-bottom: 3px; margin-bottom: 3px;
border: 1px solid $gray-lightest; border: 1px solid $near-white;
summary { summary {
background: $gray-lightest; background: $near-white;
padding: 0.675em 1em; padding: 0.675em 1em;
font-size: rem-calc(18); font-size: rem-calc(18);
font-weight: 600; font-weight: 600;
&:hover, &:hover,
&[aria-expanded='true'] { &[aria-expanded='true'] {
background: darken($gray-lightest, 5%); background: darken($near-white, 5%);
} }
&:focus { &:focus {
...@@ -52,7 +52,7 @@ details, ...@@ -52,7 +52,7 @@ details,
width: 2px; width: 2px;
&.plus { &.plus {
background: $gray-darkest; background: $near-black;
-webkit-transition: all 0.8s ease; -webkit-transition: all 0.8s ease;
-moz-transition: all 0.8s ease; -moz-transition: all 0.8s ease;
-o-transition: all 0.8s ease; -o-transition: all 0.8s ease;
...@@ -68,7 +68,7 @@ details, ...@@ -68,7 +68,7 @@ details,
} }
&:after { &:after {
background: $gray-darkest; background: $near-black;
content: ''; content: '';
position: absolute; position: absolute;
height: 2px; height: 2px;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment