Skip to content

GitLab

Commit 31264553 authored by Leonardo Piccioni de Almeida's avatar Leonardo Piccioni de Almeida
Browse files

Merge branch 'master' into develop

parents ebba8872 62795de5
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 54 deletions
themes/IberCulturaViva/assets/css/main.css
View file @ 31264553
......@@ -535,10 +535,10 @@ h6 {
background-color: #ed2891 !important; }
.bg-project {
background-color: #999 !important; }
background-color: #777 !important; }
.bg-opportunity {
background-color: #bbb !important; }
background-color: #999 !important; }
.color-agent {
color: #722e79 !important; }
......@@ -550,10 +550,10 @@ h6 {
color: #ed2891 !important; }
.color-project {
color: #999 !important; }
color: #777 !important; }
.color-opportunity {
color: #bbb !important; }
color: #999 !important; }
#header-search-row {
position: relative;
......@@ -609,14 +609,14 @@ h6 {
background: #ed2891; }
#filter-projects {
background: #999; }
background: #777; }
#filter-projects .advanced-filters {
background: #999; }
background: #777; }
#filter-opportunities {
background: #bbb; }
background: #999; }
#filter-opportunities .advanced-filters {
background: #bbb; }
background: #999; }
.filter {
box-sizing: border-box;
......@@ -839,12 +839,12 @@ h6 {
border-right-color: #ed2891; }
#project-list-header {
border-left-color: #999;
border-right-color: #999; }
border-left-color: #777;
border-right-color: #777; }
#opportunity-list-header {
border-left-color: #bbb;
border-right-color: #bbb; }
border-left-color: #999;
border-right-color: #999; }
#seal-list-header {
border-left-color: #cc0033;
......@@ -923,10 +923,10 @@ h6 {
color: #ed2891; }
.project .objeto:hover h1 a, .project .objeto-meta a {
color: #999; }
color: #777; }
.opportunity .objeto:hover h1 a, .opportunity .objeto-meta a {
color: #bbb; }
color: #999; }
.seal .objeto:hover h1 a, .seal .objeto-meta a {
color: #cc0033; }
......@@ -1126,10 +1126,10 @@ article.event .header-image {
background-color: #ee3042; }
article.project .header-image {
background-color: #999; }
background-color: #777; }
article.opportunity .header-image, article.registration .header-image {
background-color: #bbb; }
background-color: #999; }
article.subsite .header-image {
background-color: #cc0033; }
......@@ -1169,9 +1169,9 @@ article.seal .header-image {
text-transform: uppercase;
color: inherit; }
.header-content .project-type {
color: #999; }
color: #777; }
.header-content .opportunity-type, .header-content .registration-type {
color: #bbb; }
color: #999; }
.header-content .agent-type {
color: #722e79; }
.header-content .event-type {
......@@ -1491,28 +1491,28 @@ article.seal .header-image {
border-right: 8px solid transparent; }
#entities-menu-project.active, #entities-menu-project:hover, #entities-menu-project.current-entity-parent {
border-top-color: #999;
color: #999; }
border-top-color: #777;
color: #777; }
#entities-menu-project.active a, #entities-menu-project:hover a, #entities-menu-project.current-entity-parent a {
color: #999; }
color: #777; }
#entities-menu-project.active:after {
content: "";
position: absolute;
top: -8px;
border-bottom: 8px solid #999;
border-bottom: 8px solid #777;
border-left: 8px solid transparent;
border-right: 8px solid transparent; }
#entities-menu-opportunity.active, #entities-menu-opportunity:hover, #entities-menu-opportunity.current-entity-parent {
border-top-color: #bbb;
color: #bbb; }
border-top-color: #999;
color: #999; }
#entities-menu-opportunity.active a, #entities-menu-opportunity:hover a, #entities-menu-opportunity.current-entity-parent a {
color: #bbb; }
color: #999; }
#entities-menu-opportunity.active:after {
content: "";
position: absolute;
top: -8px;
border-bottom: 8px solid #bbb;
border-bottom: 8px solid #999;
border-left: 8px solid transparent;
border-right: 8px solid transparent; }
......@@ -1775,10 +1775,10 @@ article.seal .header-image {
background: #ed2891; }
#nav-projects {
background: #999; }
background: #777; }
#nav-opportunities {
background: #bbb; }
background: #999; }
#nav-subsite {
background: #cc0033; }
......@@ -1787,7 +1787,7 @@ article.seal .header-image {
background: #cc0033; }
#nav-developers {
background: #999; }
background: #777; }
.up {
border-top-right-radius: 2px; }
......@@ -2011,11 +2011,11 @@ article.seal .header-image {
#projects-filter:hover,
#projects-filter:focus {
background-color: #999; }
background-color: #777; }
#opportunities-filter:hover,
#opportunities-filter:focus {
background-color: #bbb; }
background-color: #999; }
#seals-filter:hover,
#seals-filter:focus {
......@@ -2037,14 +2037,14 @@ article.seal .header-image {
border-bottom-color: #ed2891; }
#home-projects {
background: #999; }
background: #777; }
#home-projects .abas li.active {
border-bottom-color: #999; }
border-bottom-color: #777; }
#home-opportunities {
background: #bbb; }
background: #999; }
#home-opportunities .abas li.active {
border-bottom-color: #bbb; }
border-bottom-color: #999; }
#home-subsite {
background: #cc0033; }
......@@ -2057,7 +2057,7 @@ article.seal .header-image {
border-bottom-color: #cc0033; }
#home-developers {
background: #999; }
background: #777; }
#home-developers .box {
float: none;
width: auto; }
......@@ -2742,18 +2742,18 @@ nav.sidebar-panel ul {
color: #ed2891; }
.sidebar.project {
border-top-color: #999; }
border-top-color: #777; }
.sidebar.project:before {
border-top-color: #999 !important; }
border-top-color: #777 !important; }
.sidebar.project .widget-list-item > a {
color: #999; }
color: #777; }
.sidebar.opportunity, .sidebar.registration {
border-top-color: #bbb; }
border-top-color: #999; }
.sidebar.opportunity:before, .sidebar.registration:before {
border-top-color: #bbb !important; }
border-top-color: #999 !important; }
.sidebar.opportunity .widget-list-item > a, .sidebar.registration .widget-list-item > a {
color: #bbb; }
color: #999; }
.sidebar.seal {
border-top-color: #cc0033; }
......@@ -4138,10 +4138,10 @@ h1 .icon {
background-color: #ed2891; }
.tag-project {
background-color: #999; }
background-color: #777; }
.tag-opportunity {
background-color: #bbb; }
background-color: #999; }
.tag-seal {
background-color: #cc0033; }
......@@ -4528,7 +4528,7 @@ h1 .icon {
margin-bottom: 0.75rem;
line-height: 1.5; }
.registrations-table tbody a, .my-registrations tbody a {
color: #bbb; }
color: #999; }
.registrations-table tbody a.icon-download, .my-registrations tbody a.icon-download {
width: 100%;
vertical-align: top; }
......@@ -4682,7 +4682,7 @@ h1 .icon {
content: ""; } }
.registration-header {
background-color: #bbb;
background-color: #999;
color: #fff;
padding: 0.75rem;
border-radius: 2px; }
......@@ -5652,7 +5652,7 @@ button.mfp-arrow-left {
#main-header #brand-logo img {
height: 48px; } }
#main-header a {
color: #777; }
color: #444; }
#home-agents {
background-image: url("/assets/img/home--agents.jpg");
......@@ -5661,7 +5661,7 @@ button.mfp-arrow-left {
#home-developers {
background-image: url("/assets/img/home--developers.jpg");
background-size: cover;
box-shadow: inset 0 0 0 10000px rgba(153, 153, 153, 0.85); }
box-shadow: inset 0 0 0 10000px rgba(119, 119, 119, 0.85); }
#home-events {
background-image: url("http://iberculturaviva.org/wp-content/uploads/2016/05/cuatro-gatos-arte-al-parqie-529x350.jpg");
background-size: cover;
......@@ -5673,11 +5673,11 @@ button.mfp-arrow-left {
#home-opportunities {
background-image: url("/assets/img/home--opportunities.jpg");
background-size: cover;
box-shadow: inset 0 0 0 10000px rgba(187, 187, 187, 0.85); }
box-shadow: inset 0 0 0 10000px rgba(153, 153, 153, 0.85); }
#home-projects {
background-image: url("/assets/img/home--projects.jpg");
background-size: cover;
box-shadow: inset 0 0 0 10000px rgba(153, 153, 153, 0.85); }
box-shadow: inset 0 0 0 10000px rgba(119, 119, 119, 0.85); }
#home-spaces {
background-image: url("http://iberculturaviva.org/wp-content/uploads/2016/11/jongo_pinheiral_1374170479.jpg");
background-size: cover;
......
themes/IberCulturaViva/assets/css/sass/_overrides.scss
View file @ 31264553
......@@ -39,7 +39,7 @@
}
a {
color: #777;
color: #444;
}
}
......
themes/IberCulturaViva/assets/css/sass/_variables.scss
View file @ 31264553
......@@ -19,9 +19,9 @@ $brand-primary: #722e79 !default;
$brand-event: #ee3042 !default;
$brand-agent: #722e79 !default;
$brand-space: #ed2891 !default;
$brand-project: #999 !default;
$brand-opportunity: #bbb !default;
$brand-developer: #999 !default;
$brand-project: #777 !default;
$brand-opportunity: #999 !default;
$brand-developer: #777 !default;
//$brand-info: #40b4b4 !default;
//$brand-warning: #cc9933 !default;
......
Markdown is supported
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