Skip to content
Snippets Groups Projects
Commit 6f75ace7 authored by Brian Canini's avatar Brian Canini
Browse files

asc_bootstrap - sass updates, fixing sass file load order, paragraph slide and btn updates

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