Compare commits

..

17 Commits

Author SHA1 Message Date
jorge-vitrubio f279e3debc changed colors in primary buttons to solve [issue #5](#5) 2021-12-09 15:55:27 +01:00
jorge-vitrubio a09bc127b7 this commits solves issue #6 2021-12-09 15:41:19 +01:00
jorge-vitrubio 0a5c9be1e4 documented howto debug templates 2021-11-15 16:55:23 +01:00
jorge-vitrubio f0494cb874 no table border 2021-11-15 16:48:37 +01:00
jorge-vitrubio 5183bec42a removed table border 2021-11-15 16:47:49 +01:00
jorge-vitrubio 52836de96c increased space between elements 2021-11-15 16:46:29 +01:00
jorge-vitrubio cf56c8b912 changed a color to the same as titles 2021-11-15 16:39:07 +01:00
jorge-vitrubio b482acda67 eu cookie banner changes 2021-11-15 16:19:40 +01:00
jorge-vitrubio b88efeb9ef changed the buttons styles 2021-11-15 16:10:54 +01:00
jorge-vitrubio c4d97514b0 changed fontsize to affect all content 2021-11-15 16:05:06 +01:00
jorge-vitrubio d8bbb010ab increased fontsize in programs content view 2021-11-15 16:01:55 +01:00
jorge-vitrubio b95b003eff removed overflow hidden 2021-11-15 15:56:22 +01:00
jorge-vitrubio 201b3c71f7 styled programs view to be more consistent 2021-11-15 15:55:04 +01:00
jorge-vitrubio b61c94c3cd consistent same size in frontpage, researchers and 2021-11-15 15:38:56 +01:00
jorge-vitrubio 4e70055570 menu changes to uppercase 2021-11-15 15:22:28 +01:00
jorge-vitrubio 36d578541e increased space around researcher name. mod in menu font 2021-11-15 15:07:56 +01:00
jorge-vitrubio 5138e67908 documnted developing process in the readme 2021-11-15 14:50:12 +01:00
2 changed files with 188 additions and 6 deletions

View File

@ -1,3 +1,88 @@
# Gridspinoza theme
Theme based up on BootStrap modified for the [GridSpinoza](https://gridspinoza.net) website, as part of the [Hangar](https://hangar.org)network.
## Development / modifications
The repo is cloned inside the servers theme, but from ther we have no writing permissions in the git repository, so the development is always done locally, then pushed to [Hangar Git](http://git.hangar.org) and from the server they are `pulled`.
In our computer (localhost):
```
git clone ssh://git@git.hangar.org:21036/hangar-tech/gridspinoza.git
```
## Appliying changes in server
Before we did prepare the content by https cloning the repo `git clone https://git.hangar.org/hangar-tech/gridspinoza.git` and changing file permissions to server needs.
Go to the theme directory:
```
cd /var/www/html/sites/all/themes/gridspinoza
```
from there checkout the `main` branch and `pull`
```
git checkout main
git pull
```
### checking changes before apply
We can create different branches locally, then push them and in the server preview before applying to main.
For example, need to fix "font-size" some were.
#### local host
checkout main repo and be up to date
```
git checkout main
git status
git pull
```
create new branch and check out
```
git branch fix/font-size
git checkout fix/font-size
```
start doing changes and commit and push them to server
#### in the sever
Pull changes
```
cd /var/www/html/sites/all/themes/gridspinoza
git fetch --all
git checkout fix/font-size
git pull
```
now you can refresh the browser and eventually fix more things.
if you like it then do as next:
sever: `git checkout main`
localhost:
- `git fetch all` to get all changes
- in the _fix/font-size_ branch do `git merge main`
- if ok, then go to _main_ branch `git checkout main`
- merge changes `git merge fix/font-size`
- publish the changes `git push`
go to the server, inside the theme directory `git fetch --all` and then `git checkout main` and finally `git pull`
## Drupal enable debug mode
This way we can check the html source code and see where the files are generated.
edit `/var/www/html/sites/default/services.yml` set option `debug: true` and go into drupal admin *configuration* -> *development* -> *performance* and **clear all caches**
the url is https://MYWEBSITE.COM/admin/config/development/performance
---
<!-- @file Instructions on how to sub-theme the Drupal Bootstrap base theme using the CDN Starterkit. --> <!-- @file Instructions on how to sub-theme the Drupal Bootstrap base theme using the CDN Starterkit. -->
<!-- @defgroup subtheme_cdn --> <!-- @defgroup subtheme_cdn -->
<!-- @ingroup subtheme --> <!-- @ingroup subtheme -->

View File

@ -16,6 +16,12 @@ h1 {
h2, h3 { h2, h3 {
font-size: 20px; font-size: 20px;
} }
a {
color: #cf3b3b;
}
a:hover{
color: #a63030;
}
div.page-top { div.page-top {
background-color: #dddddd; background-color: #dddddd;
@ -104,7 +110,32 @@ div.region-top {
float: right; float: right;
width: 200px; width: 200px;
} }
/*******************
BUTTONS */
.btn-default, .btn-primary {
color: #555;
background-color: #eee;
border-color: #ececec;
padding: 1rem 3rem;
border-radius: 0.4rem;
}
.btn-default:hover,.btn-primary:hover {
color: #333;
background-color: #e6e6e6;
border-color: #adadad;
}
/*******************
TABLES */
.table-bordered,
.table-bordered * {
border: none !important;
}
td {
padding-top: 2rem !important;
padding-bottom: 2rem !important;
}
/******************* /*******************
MENU */ MENU */
@ -123,7 +154,6 @@ header.container {
#block-gridspinoza-main-menu ul.navbar-nav { #block-gridspinoza-main-menu ul.navbar-nav {
display: table; display: table;
/* table-layout: fixed; */
width: 100%; width: 100%;
border-bottom: 2px #cf3b3b solid; border-bottom: 2px #cf3b3b solid;
} }
@ -138,6 +168,7 @@ header.container {
color: #aaa; color: #aaa;
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
text-transform: uppercase;
} }
#block-gridspinoza-main-menu ul.navbar-nav li a.is-active, #block-gridspinoza-main-menu ul.navbar-nav li.active a { #block-gridspinoza-main-menu ul.navbar-nav li a.is-active, #block-gridspinoza-main-menu ul.navbar-nav li.active a {
@ -225,11 +256,38 @@ h1.page-header {
margin-top: 30px; margin-top: 30px;
text-transform: uppercase; text-transform: uppercase;
} }
.content p,.path-frontpage .field-content p { .path-frontpage .project-researcher {
padding: 2rem 0 1rem;
}
.content,
.field-content,
.path-node .field-content,
.path-researchers .field-content,
.path-research-fields .field-content p,
.path-frontpage .field-content p{
font-size: 16px; font-size: 16px;
line-height: 26px; line-height: 26px;
} }
.path-programs .views-field-title {
min-height: 8rem;
}
.path-programs .views-field-body {
min-height: 30rem;
}
.path-programs .views-field-body p{
padding: 1rem 0;
}
.path-programs .views-field-body img{
width: 100%;
height: auto;
}
.path-programs .views-field-view-node {
height: 5rem;
}
.page-node-25 h1.page-header, .page-node-236 h1.page-header, .path-partners h1.page-header { .page-node-25 h1.page-header, .page-node-236 h1.page-header, .path-partners h1.page-header {
display: none; display: none;
} }
@ -261,10 +319,9 @@ div.project-researcher a {
text-decoration: underline; text-decoration: underline;
} }
/*span.project-btn*/
.views-field-view-node { .views-field-view-node {
text-align: right; margin-top: 1rem;
margin-bottom: 40px; margin-bottom: 4rem;
} }
.views-col { .views-col {
@ -279,6 +336,10 @@ div.project-researcher a {
margin-top: 30px; margin-top: 30px;
} }
.views-row.clearfix {
margin-bottom: 4rem;
}
#views-exposed-form-search-content-page-1 { #views-exposed-form-search-content-page-1 {
float: right; float: right;
} }
@ -414,6 +475,28 @@ footer img {
padding-right: 10px; padding-right: 10px;
} }
/******************
EU COOKIE BANNER
*/
div#sliding-popup, div#sliding-popup .eu-cookie-withdraw-banner, .eu-cookie-withdraw-tab {
background-color: #bdbdbd;
}
.disagree-button.eu-cookie-compliance-more-button, .eu-cookie-compliance-agree-button, .eu-cookie-compliance-default-button, .eu-cookie-compliance-hide-button, .eu-cookie-compliance-more-button-thank-you, .eu-cookie-withdraw-button {
box-shadow: none;
background: none;
border: none;
color: unset;
font-family: unset;
font-weight: unset;
text-shadow: none;
color: #555;
background-color: #eee;
border-color: #ececec;
padding: 1rem 3rem;
border-radius: 0.4rem;
}
/****************** /******************
MEDIA QUERIES MEDIA QUERIES
*/ */
@ -441,7 +524,21 @@ footer img {
display: none; display: none;
} }
.table-responsive > .table > thead > tr > th, .table-responsive > .table > tbody > tr > th, .table-responsive > .table > tfoot > tr > th, .table-responsive > .table > thead > tr > td, .table-responsive > .table > tbody > tr > td, .table-responsive > .table > tfoot > tr > td { .table-responsive > .table > thead > tr > th,
.table-responsive > .table > tbody > tr > th,
.table-responsive > .table > tfoot > tr > th,
.table-responsive > .table > thead > tr > td,
.table-responsive > .table > tbody > tr > td,
.table-responsive > .table > tfoot > tr > td {
white-space: normal; white-space: normal;
} }
.page-node-type-project .field--name-body {
-webkit-column-count: 1;
-moz-column-count: 1;
column-count: 1;
-moz-column-gap: unset;
-webkit-column-gap: unset;
column-gap: unset;
}
} }