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
No related branches found
No related tags found
1 merge request!3Theme in progress.
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 118 additions and 78 deletions
composer.json
+ 2
− 1
View file @ dc386fe2
......@@ -20,11 +20,12 @@
"require": {
"composer/installers": "^1.7",
"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": {
"drupal/twig_vardumper": "^1.2",
"drupal/bamboo_twig": "^4.1",
"drupal/twig_tweak": "^2.5",
"drupal/components": "^1.1"
},
"extra": {
......
composer.lock
+ 77
− 21
View file @ dc386fe2
......@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "93fab4620bc655303e6550e0d903440a",
"content-hash": "ae5f0300e24328a7383e92f9bebbfeb6",
"packages": [
{
"name": "asm89/stack-cors",
......@@ -912,37 +912,38 @@
},
{
"name": "drupal/bamboo_twig",
"version": "4.1.0",
"version": "5.0.0-alpha1",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/bamboo_twig.git",
"reference": "8.x-4.1"
"reference": "8.x-5.0-alpha1"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/bamboo_twig-8.x-4.1.zip",
"reference": "8.x-4.1",
"shasum": "9e70166a3252509f18d6d5d0de784f497b099642"
"url": "https://ftp.drupal.org/files/projects/bamboo_twig-8.x-5.0-alpha1.zip",
"reference": "8.x-5.0-alpha1",
"shasum": "7924e1f4c31a762e4fa190da773987f2128e8267"
},
"require": {
"drupal/core": "~8.0"
"drupal/core": "^8.8 || ^9"
},
"require-dev": {
"drupal/coder": "*",
"squizlabs/php_codesniffer": "^2.7",
"twig/extensions": "^1.4.1"
"drupal/coder": "^8.3.1",
"squizlabs/php_codesniffer": "^3.0.1",
"symfony/mime": "^4.3",
"twig/extensions": "^1.5.4"
},
"type": "drupal-module",
"extra": {
"branch-alias": {
"dev-4.x": "4.x-dev"
"dev-5.x": "5.x-dev"
},
"drupal": {
"version": "8.x-4.1",
"datestamp": "1535186880",
"version": "8.x-5.0-alpha1",
"datestamp": "1578674583",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
"status": "not-covered",
"message": "Alpha releases are not covered by Drupal security advisories."
}
}
},
......@@ -1252,6 +1253,61 @@
"description": "Drupal is an open source content management platform powering millions of websites and applications.",
"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",
"version": "0.9.1",
......@@ -1563,16 +1619,16 @@
},
{
"name": "it-osu-web/it-osu-pl-drupal",
"version": "v1.0.0-alpha",
"version": "v1.0.0-beta",
"source": {
"type": "git",
"url": "https://github.com/it-osu-web/it-osu-pl-drupal.git",
"reference": "15fb9127fcaab2e5548ce528cb469dd80c3cfcb5"
"reference": "29d27cdab86957e7208c3b03a71da6f683e4c91c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/it-osu-web/it-osu-pl-drupal/zipball/15fb9127fcaab2e5548ce528cb469dd80c3cfcb5",
"reference": "15fb9127fcaab2e5548ce528cb469dd80c3cfcb5",
"url": "https://api.github.com/repos/it-osu-web/it-osu-pl-drupal/zipball/29d27cdab86957e7208c3b03a71da6f683e4c91c",
"reference": "29d27cdab86957e7208c3b03a71da6f683e4c91c",
"shasum": ""
},
"require": {
......@@ -1590,7 +1646,7 @@
}
],
"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",
......@@ -4129,7 +4185,7 @@
"aliases": [],
"minimum-stability": "alpha",
"stability-flags": {
"it-osu-web/it-osu-pl-drupal": 15
"it-osu-web/it-osu-pl-drupal": 10
},
"prefer-stable": true,
"prefer-lowest": false,
......
css/main.css
+ 1
− 1
View file @ dc386fe2
source diff could not be displayed: it is too large. Options to address this: view the blob.
css/main.css.map
+ 1
− 1
View file @ dc386fe2
This diff is collapsed.
libraries/it-osu-pl-drupal/00-base/global/01-colors/_color-vars.scss
+ 14
− 16
View file @ dc386fe2
// Neutrals.
$clear: rgba(0, 0, 0, 0);
$white: #fff;
$near-white: #f7f7f7;
$gray-lightest: #eaeaea;
$gray-lighter: #ccc;
$gray-light: #999;
$near-white: #f2f2f2;
$gray-light: #ccc;
$gray: #666;
$gray-dark: #444446;
$gray-darker: #303033;
$gray-darkest: #202024;
$gray-dark: #3c3c3c;
$near-black: #202022;
$black: #000;
//colors
// Colors.
$red: #b00;
$red-dark: #830000;
$orange: #d65828;
$orange-dark: #c04f24;
$orange-dark: #ab4620;
$green: #909738;
$green-dark: #73792d;
$teal: #1c7c89;
$purple: #5d3f82;
$blue-dark: #476c97;
$green-dark: #656927;
$teal: #26686d;
$purple: #442369;
$blue: #667b96;
$violet: #851e5e;
// Other.
$gray-border: #ddd;
libraries/it-osu-pl-drupal/00-base/global/01-colors/_colors-used.scss deleted 100644 → 0
+ 0
− 1
View file @ 836df0dc
$color-border: $gray-light;
libraries/it-osu-pl-drupal/00-base/global/03-grid/_grid.scss
+ 1
− 1
View file @ dc386fe2
.sample-grid {
margin-bottom: 2em;
.cell {
background: $gray-lightest;
background: $near-white;
padding: 10px 15px;
min-height: 80px;
}
......
libraries/it-osu-pl-drupal/00-base/global/04-animations/_animation.scss
+ 1
− 1
View file @ dc386fe2
......@@ -22,7 +22,7 @@
}
.demo-animate {
background-color: $gray-lightest;
background-color: $near-white;
cursor: pointer;
padding: 1em;
text-align: center;
......
libraries/it-osu-pl-drupal/00-base/utils/_04-base.scss
+ 2
− 2
View file @ dc386fe2
......@@ -16,7 +16,7 @@ html {
body.footer-color {
&--dk-gray {
background: $gray-darkest;
background: $near-black;
}
&--md-gray {
......@@ -24,7 +24,7 @@ body.footer-color {
}
&--lt-gray {
background: $gray-lightest;
background: $near-white;
}
&--white {
......
libraries/it-osu-pl-drupal/00-base/utils/_pl-base.scss
+ 2
− 2
View file @ dc386fe2
......@@ -24,7 +24,7 @@
text-transform: uppercase;
margin-bottom: 5px;
clear: both;
background: $gray-lightest;
background: $near-white;
@include breakout;
padding: 6px 0 0 4.5%;
margin-top: 2.5em;
......@@ -68,7 +68,7 @@
display: block;
height: 100px;
margin-bottom: 0.3em;
border: 1px solid $gray-lighter;
border: 1px solid #bbb;
}
}
......
libraries/it-osu-pl-drupal/01-atoms/00-text/00-headings/_headings.scss
+ 2
− 2
View file @ dc386fe2
......@@ -31,12 +31,12 @@
h1,
.h1 {
@include heading(42, 800, $line-height: 1.1);
@include heading(40, 800, $line-height: 1.1);
}
h2,
.h2 {
@include heading(32, 700);
@include heading(30, 700, $line-height: 1.1);
}
h3,
......
libraries/it-osu-pl-drupal/01-atoms/00-text/02-blockquote/_blockquote.scss
+ 2
− 2
View file @ dc386fe2
.blockquote {
border-left: solid 3px $gray-lighter;
border-left: solid 3px $gray-light;
margin: 2em 0 2em 2em;
padding-left: 1em;
padding-right: 3em;
......@@ -21,7 +21,7 @@ blockquote:not(.pull-quote) {
}
.pull-quote__icon {
color: $gray-lighter;
color: $gray-light;
position: absolute;
top: 0.8em;
}
......
libraries/it-osu-pl-drupal/01-atoms/01-links/link/_link.scss
+ 1
− 2
View file @ dc386fe2
......@@ -17,8 +17,7 @@ $color-link--hover: $teal;
}
}
a,
.link {
a {
@include link;
}
......
libraries/it-osu-pl-drupal/01-atoms/02-buttons/_buttons.scss
+ 1
− 6
View file @ dc386fe2
......@@ -14,8 +14,6 @@
cursor: pointer;
&:active {
position: relative;
top: 1px;
background-color: darken($bg, 5%) !important;
}
......@@ -25,7 +23,7 @@
&:focus {
background-color: lighten($bg, 3%);
outline: 2px dotted $gray-darkest;
outline: 2px dotted $near-black;
outline-offset: 0;
}
}
......@@ -37,10 +35,7 @@
padding: 11px 16px 10px;
&:active {
border: 1px solid $color;
background-color: darken($color, 5%) !important;
padding: 12px 16px 11px;
top: 0;
}
&:hover {
......
libraries/it-osu-pl-drupal/01-atoms/03-lists/_lists.scss
+ 1
− 1
View file @ dc386fe2
......@@ -7,7 +7,7 @@
}
.list-item {
margin-bottom: $space-y-third;
margin-bottom: $space-y-half;
padding-left: $space-x-quarter;
}
......
libraries/it-osu-pl-drupal/01-atoms/05-form-elements/_form-elements.scss
+ 2
− 8
View file @ dc386fe2
//common styles for all form elements
.form-item {
color: $gray-darker;
color: $gray-dark;
margin-bottom: 0.5em;
@include clearfix;
......@@ -9,17 +9,11 @@
.form-item__label {
display: block;
font-weight: 600;
// @include xs {
// display: block;
// margin-right: 2%;
// padding: 0.6em 0 0.3em 0;
// }
}
.form-item__description {
font-size: rem-calc(14);
margin-top: -0.5em;
margin-top: 5px;
margin-bottom: 1.5em;
}
......
libraries/it-osu-pl-drupal/01-atoms/05-form-elements/checkbox/_checkbox.scss
+ 1
− 2
View file @ dc386fe2
.form-item--checkboxes,
.form-item--checkbox__item {
.form-item--checkboxes {
@include list-reset;
@extend .form-options-list;
......
libraries/it-osu-pl-drupal/01-atoms/05-form-elements/radio/_radio.scss
+ 1
− 2
View file @ dc386fe2
.form-item--radios,
.form-item--radio__item {
.form-item--radios {
@include list-reset;
@extend .form-options-list;
......
libraries/it-osu-pl-drupal/01-atoms/05-form-elements/select/_select.scss
+ 3
− 3
View file @ dc386fe2
// CSS-only select styling (from https://github.com/filamentgroup/select-css)
.form-item__dropdown {
border: 1px solid $gray-lighter;
border: 1px solid $gray-light;
background-color: $white;
display: block;
position: relative;
......@@ -22,7 +22,7 @@
}
&:hover {
border-color: $gray-light;
border-color: $gray;
&::after {
border-top: 9px solid $gray-dark;
......@@ -31,7 +31,7 @@
}
.form-item__select {
border: 1px solid $gray-lightest;
border: 1px solid $near-white;
font-size: rem-calc(14);
margin: 0;
outline: none;
......
libraries/it-osu-pl-drupal/01-atoms/05-form-elements/textfield/_textfield.scss
+ 3
− 3
View file @ dc386fe2
/* Styling for the text areas */
.form-item__textfield {
border: 1px solid $gray-lighter;
border: 1px solid $gray-light;
padding: 0.625em 1em;
margin-bottom: 1em;
font-size: rem-calc(14);
......@@ -24,11 +24,11 @@
}
&::-webkit-input-placeholder {
color: $gray-light;
color: $gray;
}
&:-moz-placeholder {
color: $gray-light;
color: $gray;
}
&::-moz-placeholder {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment