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

move drupal modules to dev

parents 836df0dc da0e6bc2
Branches feature/composer-trouble
No related tags found
1 merge request!3Theme in progress.
Showing
with 118 additions and 78 deletions
...@@ -20,11 +20,12 @@ ...@@ -20,11 +20,12 @@
"require": { "require": {
"composer/installers": "^1.7", "composer/installers": "^1.7",
"oomphinc/composer-installers-extender": "^1.1", "oomphinc/composer-installers-extender": "^1.1",
"it-osu-web/it-osu-pl-drupal": "v1.0.0-alpha" "it-osu-web/it-osu-pl-drupal": "^1.0@beta"
}, },
"require-dev": { "require-dev": {
"drupal/twig_vardumper": "^1.2", "drupal/twig_vardumper": "^1.2",
"drupal/bamboo_twig": "^4.1", "drupal/bamboo_twig": "^4.1",
"drupal/twig_tweak": "^2.5",
"drupal/components": "^1.1" "drupal/components": "^1.1"
}, },
"extra": { "extra": {
......
...@@ -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": "93fab4620bc655303e6550e0d903440a", "content-hash": "ae5f0300e24328a7383e92f9bebbfeb6",
"packages": [ "packages": [
{ {
"name": "asm89/stack-cors", "name": "asm89/stack-cors",
...@@ -912,37 +912,38 @@ ...@@ -912,37 +912,38 @@
}, },
{ {
"name": "drupal/bamboo_twig", "name": "drupal/bamboo_twig",
"version": "4.1.0", "version": "5.0.0-alpha1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://git.drupalcode.org/project/bamboo_twig.git", "url": "https://git.drupalcode.org/project/bamboo_twig.git",
"reference": "8.x-4.1" "reference": "8.x-5.0-alpha1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://ftp.drupal.org/files/projects/bamboo_twig-8.x-4.1.zip", "url": "https://ftp.drupal.org/files/projects/bamboo_twig-8.x-5.0-alpha1.zip",
"reference": "8.x-4.1", "reference": "8.x-5.0-alpha1",
"shasum": "9e70166a3252509f18d6d5d0de784f497b099642" "shasum": "7924e1f4c31a762e4fa190da773987f2128e8267"
}, },
"require": { "require": {
"drupal/core": "~8.0" "drupal/core": "^8.8 || ^9"
}, },
"require-dev": { "require-dev": {
"drupal/coder": "*", "drupal/coder": "^8.3.1",
"squizlabs/php_codesniffer": "^2.7", "squizlabs/php_codesniffer": "^3.0.1",
"twig/extensions": "^1.4.1" "symfony/mime": "^4.3",
"twig/extensions": "^1.5.4"
}, },
"type": "drupal-module", "type": "drupal-module",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-4.x": "4.x-dev" "dev-5.x": "5.x-dev"
}, },
"drupal": { "drupal": {
"version": "8.x-4.1", "version": "8.x-5.0-alpha1",
"datestamp": "1535186880", "datestamp": "1578674583",
"security-coverage": { "security-coverage": {
"status": "covered", "status": "not-covered",
"message": "Covered by Drupal's security advisory policy" "message": "Alpha releases are not covered by Drupal security advisories."
} }
} }
}, },
...@@ -1252,6 +1253,61 @@ ...@@ -1252,6 +1253,61 @@
"description": "Drupal is an open source content management platform powering millions of websites and applications.", "description": "Drupal is an open source content management platform powering millions of websites and applications.",
"time": "2020-03-04T18:01:37+00:00" "time": "2020-03-04T18:01:37+00:00"
}, },
{
"name": "drupal/twig_tweak",
"version": "2.5.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/twig_tweak.git",
"reference": "8.x-2.5"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/twig_tweak-8.x-2.5.zip",
"reference": "8.x-2.5",
"shasum": "077e193192d85706f5c5afc7575ba07b41499f79"
},
"require": {
"drupal/core": "^8.7 || ^9.0"
},
"suggest": {
"symfony/var-dumper": "Better dump() function for debugging Twig variables"
},
"type": "drupal-module",
"extra": {
"branch-alias": {
"dev-2.x": "2.x-dev"
},
"drupal": {
"version": "8.x-2.5",
"datestamp": "1583937566",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
}
}
},
"notification-url": "https://packages.drupal.org/8/downloads",
"license": [
"GPL-2.0+"
],
"authors": [
{
"name": "Chi",
"homepage": "https://www.drupal.org/user/556138"
}
],
"description": "A Twig extension with some useful functions and filters for Drupal development.",
"homepage": "https://www.drupal.org/project/twig_tweak",
"keywords": [
"Drupal",
"Twig"
],
"support": {
"source": "https://git.drupalcode.org/project/twig_tweak",
"issues": "https://www.drupal.org/project/issues/twig_tweak"
}
},
{ {
"name": "easyrdf/easyrdf", "name": "easyrdf/easyrdf",
"version": "0.9.1", "version": "0.9.1",
...@@ -1563,16 +1619,16 @@ ...@@ -1563,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": {
...@@ -1590,7 +1646,7 @@ ...@@ -1590,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",
...@@ -4129,7 +4185,7 @@ ...@@ -4129,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,
......
source diff could not be displayed: it is too large. Options to address this: view the blob.
This diff is collapsed.
// 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 {
......
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