Skip to content

Commit

Permalink
Merge pull request #166 from isubit/development
Browse files Browse the repository at this point in the history
Development - 1.6.12
  • Loading branch information
sacarney committed Apr 21, 2021
2 parents 373420c + eb60e01 commit f69b950
Show file tree
Hide file tree
Showing 12 changed files with 77 additions and 1 deletion.
6 changes: 6 additions & 0 deletions css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@ a.nav-link { /* Some links to not need underlines. */
.page-link:hover { /* Overrides bootstrap.min.css */
color: #006BA6; /* ISU brand standard */
}
.btn {
-webkit-user-select: initial;
-moz-user-select: initial;
-ms-user-select: initial;
user-select: initial;
}
button.btn {
cursor: pointer;
}
Expand Down
28 changes: 28 additions & 0 deletions css/icons/isuthemeicons-1.0.0/css/isuthemeicons.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
@font-face {
font-family: 'isuthemeicons';
src:url('../fonts/isuthemeicons.eot?v=1.0.0');
src:url('../fonts/isuthemeicons.eot?v=1.0.0') format('embedded-opentype'),
url('../fonts/isuthemeicons.ttf?v=1.0.0') format('truetype'),
url('../fonts/isuthemeicons.woff?v=1.0.0') format('woff'),
url('../fonts/isuthemeicons.svg?v=1.0.0#isuthemeicons') format('svg');
font-weight: normal;
font-style: normal;
font-display: block;
}

.isui {
display: inline-block;
font-family: 'isuthemeicons' !important;
speak: never;
font-style: normal;
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}

.isui-discord:before {
content: '\e900';
}
1 change: 1 addition & 0 deletions css/icons/isuthemeicons-1.0.0/css/isuthemeicons.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
11 changes: 11 additions & 0 deletions css/icons/isuthemeicons-1.0.0/fonts/isuthemeicons.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
5 changes: 5 additions & 0 deletions css/isu-social.css
Original file line number Diff line number Diff line change
Expand Up @@ -188,4 +188,9 @@
.isu-social-menu a[href*='scholar.google.com']:hover:before {
color: #dd4b39;
}
.isu-social-menu a[href*='discord']:before {
content: '\e900';
font-family: isuthemeicons;
position: relative;
}

13 changes: 13 additions & 0 deletions css/theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,7 @@ body,

.isu-pagination {
padding-top: 1rem;
justify-content: center;
}
.isu-page-link {
height: 100%;
Expand Down Expand Up @@ -1301,6 +1302,15 @@ a.tabledrag-handle .handle {
padding: 1rem 0;
background: #dddddd;
}
.isu-footer_contact-title,
.isu-footer .isu-block-title {
margin-bottom: 0.5rem;
padding-bottom: 0;
font-size: 1rem;
line-height: 1.5;
font-weight: 700;
border-bottom: 0;
}

/* --- ## ASSOCIATES MENU --- */
/*
Expand Down Expand Up @@ -1561,6 +1571,9 @@ blockquote.isu-pull-quote {
flex-wrap: wrap;
margin-bottom: 1rem;
}
.views-exposed-form .isu-block-title {
width: 100%;
}
.views-exposed-form .isu-form-group {
margin-right: 1rem;
}
Expand Down
2 changes: 2 additions & 0 deletions iastate_theme.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ description: Drupal 8 theme for Iowa State University websites
type: theme
core: 8.x
core_version_requirement: ^8 || ^9
base_theme: stable
libraries:
- iastate_theme/global-css
- iastate_theme/global-js
- iastate_theme/fonts
- iastate_theme/font-awesome
- iastate_theme/academicons
- iastate_theme/isuthemeicons
ckeditor_stylesheets:
- css/bootstrap/bootstrap.min.css
- css/base.css
Expand Down
10 changes: 10 additions & 0 deletions iastate_theme.libraries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,13 @@ academicons:
theme:
css/icons/academicons-1.8.6/css/academicons.min.css: { minified: true }

isuthemeicons:
version: 1.0.0
license:
name: MIT
url: https://opensource.org/licenses/mit-license.html
gpl-compatible: true
css:
theme:
css/icons/isuthemeicons-1.0.0/css/isuthemeicons.min.css: { minified: true }

2 changes: 1 addition & 1 deletion templates/parts/footer.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
<div class="mb-3">

{% if iastate_contact_title %}
<h2 class="isu-footer_contact-title h5" id="footercontact">
<h2 class="isu-footer_contact-title" id="footercontact">
{{ iastate_contact_title|nl2br }}
</h2>
{% else %}
Expand Down

0 comments on commit f69b950

Please sign in to comment.