Compare commits
No commits in common. "main" and "fix/fontsize" have entirely different histories.
main
...
fix/fontsi
85
README.md
85
README.md
|
|
@ -1,88 +1,3 @@
|
||||||
# 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 -->
|
||||||
|
|
|
||||||
109
css/style.css
109
css/style.css
|
|
@ -16,12 +16,6 @@ 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;
|
||||||
|
|
@ -110,32 +104,7 @@ 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 */
|
||||||
|
|
||||||
|
|
@ -154,6 +123,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
@ -168,7 +138,6 @@ 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 {
|
||||||
|
|
@ -256,38 +225,11 @@ h1.page-header {
|
||||||
margin-top: 30px;
|
margin-top: 30px;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
}
|
}
|
||||||
.path-frontpage .project-researcher {
|
.content p,.path-frontpage .field-content p {
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
|
@ -319,9 +261,10 @@ div.project-researcher a {
|
||||||
text-decoration: underline;
|
text-decoration: underline;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*span.project-btn*/
|
||||||
.views-field-view-node {
|
.views-field-view-node {
|
||||||
margin-top: 1rem;
|
text-align: right;
|
||||||
margin-bottom: 4rem;
|
margin-bottom: 40px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.views-col {
|
.views-col {
|
||||||
|
|
@ -336,10 +279,6 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
@ -475,28 +414,6 @@ 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
|
||||||
*/
|
*/
|
||||||
|
|
@ -524,21 +441,7 @@ div#sliding-popup, div#sliding-popup .eu-cookie-withdraw-banner, .eu-cookie-with
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.table-responsive > .table > thead > tr > th,
|
.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 > 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;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue