Skip to content
Snippets Groups Projects
Unverified Commit 919537c4 authored by weaver299's avatar weaver299 Committed by GitHub
Browse files

Merge pull request #52 from ASCWebServices/canini 

asc_bootstrap - sass updates, fixing sass file load order, paragraph …
parents 0fb25e45 6f75ace7
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 7609 additions and 7699 deletions
web/themes/asc_bootstrap/assets/sass/components/_menu.scss
+ 6
− 39
View file @ 919537c4
......@@ -8,38 +8,13 @@
z-index: 50;
}
.dropdown-submenu {
@include backgcolor(#47a3da);
position: relative;
.dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:focus {
background: transparent;
color: #333333;
}
.dropdown-submenu > .dropdown-menu {
@include backgcolor(#47a3da);
top: 0;
left: 100%;
padding: 0px;
}
.dropdown-submenu:hover > .dropdown-menu {
@include backgcolor(#47a3da);
display: block;
}
.dropdown-submenu > a:after {
@include backgcolor(#47a3da);
content: "\e080";
display: inline-block;
font-family: 'Glyphicons Halflings';
font-style: normal;
font-size: 10px;
float: right;
margin-top: 5px;
}
.dropdown-submenu:hover > a:after {
@include backgcolor(#47a3da);
border-left-color: #fff;
.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
background-color: transparent;
}
.dropdown-submenu.pull-left {
......@@ -51,15 +26,7 @@
margin-left: 10px;
@include border-radius(6px 0 6px 6px)
}
.navbar-nav li:last-child > .dropdown-menu {
@include backgcolor(#47a3da);
left: auto;
right: 0px;
}
.navbar-nav li:last-child > .dropdown-menu a {
@include backgcolor(#47a3da);
text-align: right !important;
}
.navbar-nav li:last-child > .dropdown-menu .dropdown-submenu > a:after {
float: left;
content: "\e079";
......
web/themes/asc_bootstrap/assets/sass/components/_paragraphs.scss
+ 105
− 91
View file @ 919537c4
......@@ -170,117 +170,131 @@
@media (max-width: 768px) {
width: 80%;
top: 45%;
height: 100%;
height: 120%;
display: flex;
align-items: center;
justify-content: center;
}
h2 {
font-size: 36px;
text-transform: uppercase;
font-weight: bold;
color: $gray-dark;
.slide-txt-wrapper {
@media (max-width: 768px) {
font-size: 18px;
}
}
p {
font-size: 18px;
margin: 25px 0;
@media (max-width: 768px) {
display: none;
}
}
.btn-links-19 {
width: 100%;
margin: 0 auto;
font-size: 18px;
.btn-wrapper {
width: 25%;
margin: 0 10px;
background: $brand-red;
padding: 10px;
display: inline-block;
color: $white;
h2 {
font-size: 36px;
text-transform: uppercase;
svg, i {
padding-top: 1px;
}
&:hover {
background: #8E0101;
}
font-weight: bold;
color: $gray-dark;
line-height: 1.1;
@media (max-width: 768px) {
display: block;
width: 100%;
margin: 10px 0;
font-weight: 700;
font-size: 15px;
margin-top: 0;
}
}
}
.btn-links-18 {
width: 100%;
margin: 0 auto;
font-size: 18px;
.btn-wrapper {
width: 40%;
margin: 0 10px;
background: $brand-red;
padding: 10px;
display: inline-block;
color: $white;
text-transform: uppercase;
p {
font-size: 18px;
margin: 25px 0;
svg, i {
padding-top: 1px;
@media (max-width: 768px) {
display: none;
}
}
&:hover {
background: #8E0101;
}
.btn-links-19 {
width: 100%;
margin: 0 auto;
font-size: 18px;
@media (max-width: 768px) {
display: block;
width: 100%;
margin: 10px 0;
font-weight: 700;
.btn-wrapper {
width: 25%;
margin: 0 10px;
background: $brand-red;
padding: 10px;
display: inline-block;
color: $white;
text-transform: uppercase;
border: 0;
border-radius: 0;
svg, i {
padding-top: 1px;
}
&:hover {
background: #8E0101;
}
@media (max-width: 768px) {
display: block;
width: 100%;
margin: 10px 0;
font-weight: 700;
}
}
}
}
.btn-links-17 {
width: 100%;
margin: 0 auto;
font-size: 18px;
.btn-wrapper {
width: 50%;
margin: 0 10px;
background: $brand-red;
padding: 10px;
display: inline-block;
color: $white;
text-transform: uppercase;
.btn-links-18 {
width: 100%;
margin: 0 auto;
font-size: 18px;
svg, i {
padding-top: 1px;
.btn-wrapper {
width: 40%;
margin: 0 10px;
background: $brand-red;
padding: 10px;
display: inline-block;
color: $white;
text-transform: uppercase;
border: 0;
border-radius: 0;
svg, i {
padding-top: 1px;
}
&:hover {
background: #8E0101;
}
@media (max-width: 768px) {
display: block;
width: 100%;
margin: 10px 0;
font-weight: 700;
}
}
}
&:hover {
background: #8E0101;
}
.btn-links-17 {
width: 100%;
margin: 0 auto;
font-size: 18px;
@media (max-width: 768px) {
display: block;
width: 100%;
font-weight: 700;
.btn-wrapper {
width: 50%;
margin: 0 10px;
background: $brand-red;
padding: 10px;
display: inline-block;
color: $white;
text-transform: uppercase;
border: 0;
border-radius: 0;
svg, i {
padding-top: 1px;
}
&:hover {
background: #8E0101;
}
@media (max-width: 768px) {
display: block;
width: 100%;
font-weight: 700;
}
}
}
}
......
web/themes/asc_bootstrap/assets/sass/layout/_default.scss
+ 7
− 21
View file @ 919537c4
......@@ -34,20 +34,6 @@ body, html { font-size: 100%; padding: 0; margin: 0;}
clear: both;
}
body {
font-family: 'Lato', Calibri, Arial, sans-serif;
color: #47a3da;
}
a {
color: #f0f0f0;
text-decoration: none;
}
a:hover {
color: #000;
}
.container > header {
width: 90%;
max-width: 70em;
......@@ -186,30 +172,30 @@ p {
//## Headings.
h1, h2, h3, h4, h5, h6 {
margin: 11px 0 !important;
margin: 11px 0;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
h1 {
font-weight: bold !important;
line-height: 33px !important;
font-weight: bold;
line-height: 33px;
}
h2 {
line-height: 26px !important;
line-height: 26px;
}
h3 {
line-height: 22px !important;
line-height: 22px;
}
h4 {
line-height: 17px !important;
line-height: 17px;
}
h5, h6 {
line-height: 15px !important;
line-height: 15px;
}
......
web/themes/asc_bootstrap/assets/sass/layout/_header.scss
+ 2
− 9
View file @ 919537c4
......@@ -6,8 +6,8 @@
// --------------------------------------------------
.page-header {
margin: 0 20px 20px;
border-bottom: none;
margin: 11px 0;
//border-bottom: none;
}
#header-logos {
......@@ -146,11 +146,4 @@
}
// --------------------------------------------------
//## Breadcrumb Menu.
.breadcrumb {
background-color: transparent;
//text-transform: capitalize;
}
web/themes/asc_bootstrap/assets/sass/pages/_landing-page.scss
+ 3
− 0
View file @ 919537c4
......@@ -38,6 +38,9 @@
}
// --------------------------------------------------
//## Carousel.
.landing-page .carousel {
......
web/themes/asc_bootstrap/assets/sass/style.scss
+ 21
− 20
View file @ 919537c4
......@@ -15,13 +15,6 @@
@import "../../bootstrap/stylesheets/bootstrap/print";
@import "../../bootstrap/stylesheets/bootstrap/glyphicons";
//Custom Layout
@import "layout/aside";
@import "layout/default";
@import "layout/footer";
@import "layout/header";
@import "layout/section-background-colors";
// Core CSS
@import "../../bootstrap/stylesheets/bootstrap/scaffolding";
@import "../../bootstrap/stylesheets/bootstrap/type";
......@@ -31,19 +24,6 @@
@import "../../bootstrap/stylesheets/bootstrap/forms";
@import "../../bootstrap/stylesheets/bootstrap/buttons";
//Custom Components
@import "components/video";
@import "components/news";
@import "components/cbpmenu";
@import "components/events";
@import "components/fields";
@import "components/filters";
@import "components/menu";
@import "components/paragraphs";
@import "components/people";
@import "components/people-styles";
@import "components/simplemenu";
// Components
@import "../../bootstrap/stylesheets/bootstrap/component-animations";
@import "../../bootstrap/stylesheets/bootstrap/dropdowns";
......@@ -77,6 +57,27 @@
@import "../../bootstrap/stylesheets/bootstrap/utilities";
@import "../../bootstrap/stylesheets/bootstrap/responsive-utilities";
//Custom Layout
@import "layout/aside";
@import "layout/default";
@import "layout/footer";
@import "layout/header";
@import "layout/section-background-colors";
//Custom Components
@import "components/video";
@import "components/news";
@import "components/cbpmenu";
@import "components/events";
@import "components/fields";
@import "components/filters";
@import "components/menu";
@import "components/paragraphs";
@import "components/people";
@import "components/people-styles";
@import "components/simplemenu";
// Custom Pages
@import "pages/basic-page";
@import "pages/landing-page";
......
web/themes/asc_bootstrap/css/style.css
+ 7457
− 7509
View file @ 919537c4
This diff is collapsed.
web/themes/asc_bootstrap/templates/paragraph/paragraph--button.html.twig
+ 5
− 9
View file @ 919537c4
......@@ -37,14 +37,10 @@
#}
{% if content.field_button.0 %}
<a href="{{ content.field_button[0]['#url'] }}" title="{{ content.field_button.0['#title'] }}">
{% if page_content_type == 'landing_page' %}
<div class="btn-wrapper">
{{ content.field_button.0['#title'] }} <i class="fa fa-angle-right"></i>
</div>
{% else %}
<div class="btn-wrapper btn btn-primary btn-par">
{{ content.field_button.0['#title'] }} <i class="fa fa-angle-right"></i>
</div>
{% endif %}
<div class="btn-wrapper btn btn-primary btn-par">
{{ content.field_button.0['#title'] }} <i class="fa fa-angle-right"></i>
</div>
</a>
{% endif %}
web/themes/asc_bootstrap/templates/paragraph/paragraph--slide.html.twig
+ 3
− 1
View file @ 919537c4
......@@ -42,9 +42,11 @@
<div class="slide-txt-container">
<div class="slide-txt">
<div class="slide-txt-wrapper">
{{ content.field_slide_text }}
{{ content.field_slide_text }}
</div>
</div>
</div>
......
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