Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
fa07bfc
pagina a medias
marrqqss Nov 20, 2024
80fd34b
Merge pull request #1 from marc-marcos/working-page
marrqqss Nov 20, 2024
c879629
Set initial project structure + Main Layout
Pandax40 Feb 7, 2025
bccccbe
Merge pull request #2 from marc-marcos/initial-layout-and-project-str…
Pandax40 Feb 7, 2025
2ffd1c6
unused bg removed
Pandax40 Feb 8, 2025
59309b4
component loading script
Pandax40 Feb 9, 2025
df0bb09
window component
Pandax40 Feb 9, 2025
4f5df3e
social links fixed
Pandax40 Feb 9, 2025
74a234e
window buttons
Pandax40 Feb 9, 2025
105fa73
removed unused div
Pandax40 Feb 9, 2025
54ef768
feat: hacer que la fecha y la hora se actualicen al carga la página y…
marc-marcos Feb 10, 2025
d4d6589
Merge pull request #5 from marc-marcos/feat/fecha-y-hora-dinamica
marc-marcos Feb 10, 2025
a83ea34
add title component
Pandax40 Feb 10, 2025
40b37b6
hot fix: forbid sidebar resize
Pandax40 Feb 10, 2025
49adb9e
relative path fixed
Pandax40 Feb 10, 2025
4aa5ad5
update README.md with local deployment instructions
Pandax40 Feb 10, 2025
c96b53c
update README file and add LICENSE file
Pandax40 Feb 11, 2025
4fd45ed
Merge branch 'development' into feature/component_system
Pandax40 Feb 11, 2025
f0a43a5
component loading code optimized and refactored
Pandax40 Feb 11, 2025
122e21d
main content height fixed
Pandax40 Feb 11, 2025
807ad1d
add about component and component js refactored
Pandax40 Feb 13, 2025
da93ddc
title css remove unused CSS import
Pandax40 Feb 13, 2025
efbce7f
add activities component
Pandax40 Feb 13, 2025
b975062
set minimum size about component
Pandax40 Feb 13, 2025
dc8b8c8
top bar fully responsive :) [proud of myself]
Pandax40 Feb 18, 2025
fabf15a
sidebar responsive (no clamp)
Pandax40 Feb 18, 2025
3460366
sidebar and top bar improved responsiveness with @media querrys
Pandax40 Feb 19, 2025
bab4fe3
title responsiveness improved
Pandax40 Feb 19, 2025
311c560
about responsiveness improved + scroll bar content + overflow js removed
Pandax40 Feb 19, 2025
77f4c20
activities responsiveness improved
Pandax40 Feb 19, 2025
d6a9c85
max-height media query readjusted
Pandax40 Feb 19, 2025
b2bd728
move SVG icons to the right folder
Pandax40 Feb 19, 2025
48d987d
fix typo in activities component
Pandax40 Feb 20, 2025
0a79633
fix(components): url path to images and icons
Pandax40 Feb 20, 2025
fcd246c
fix(js): window control buttons sometimes disapear
Pandax40 Feb 20, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"livePreview.defaultPreviewPath": "/index.html",
"markdown.validate.enabled": true
}
8 changes: 8 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
The MIT License (MIT)
Copyright © 2025 Linux UPC

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
46 changes: 45 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,45 @@
# linux_website
# LinuxUPC Website

This is the website of LinuxUPC, a community at the UPC dedicated to Free Software.

## Project Structure

The project is organized as follows:

- `assets/css/`: Contains CSS files.
- `assets/js/`: Contains JavaScript files.
- `assets/fonts`: Contains the font files.
- `assets/icons/`: Contains icon files used in the project.
- `assets/img/`: Contains image files used in the project.
- `components/`: Contains HTML files for components.
- `index.html`: The main page and the entry point of the website.

## Running the Project Locally

To avoid issues with `fetch` and `file://`, the project should be served from a local server. Here are some options:

### Using Python

```sh
python -m http.server 8000
```

### Using Node.js

```sh
npx http-server -p 8000
```

### Using PHP

```sh
php -S localhost:8000
```

## Contributing

Contributions are welcome! Feel free to open an issue or submit a pull request.

## License

This project is licensed under the [MIT License](LICENSE).
112 changes: 112 additions & 0 deletions assets/css/about.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
.about-component {
position: relative;
padding: 0.5em;
font-size: clamp(1rem, 0.481rem + 2.374vw, 2rem);

/* Establecer maxima altura */
max-height: 100%;
overflow-y: hidden;
}

.about-component .window-component {
position: absolute;
top: 0;
left: 0;
}

.about {
position: relative;
pointer-events: none;
z-index: 1;
display: flex;
flex-direction: column;
align-items: start;
gap: 0.3em;

/* Establecer maxima altura */
max-height: 100%;
overflow-y: hidden;
}

.about > .title {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
gap: 0.2em;
width: fit-content;
}

.about > .title img {
height: 2em;
object-fit: contain;
}

.about > .title h3 {
font-family: Ubuntu;
font-style: normal;
font-size: 1em;
font-weight: 600;
letter-spacing: 0.5px;
text-decoration: none;
text-transform: none;
color: #fff;
margin: 0;
padding: 0;
text-align: start;
align-self: center;
}

.about p, .about li {
font-family: Ubuntu;
font-style: normal;
font-size: 0.6em;
font-weight: 400;
letter-spacing: 0.5px;
text-decoration: none;
text-transform: none;
color: #fff;
margin: 0;
padding: 0;
text-align: justify;
width: fit-content;
}

.about > :not(.title) {
margin-left: 0.5em;
}

.about > .list {
display: flex;
flex: 1;
pointer-events: all;
flex-direction: column;
gap: 0.25em;
list-style: decimal inside;
}

.about > .list li {
background: rgba(105, 105, 105, 0.65);
border-radius: 0.75em;
padding: 0.5em;
}

/* Estilos para la barra de scroll */
/* .about > .list::-webkit-scrollbar {
width: 10px;
}

.about > .list::-webkit-scrollbar-track {
background: rgba(29, 29, 29, 1);
border-radius: 8px;
}

.about > .list::-webkit-scrollbar-thumb {
background: rgba(105, 105, 105, 0.65);
border-radius: 8px;
border: 2px solid rgba(29, 29, 29, 1);
}

.about > .list::-webkit-scrollbar-thumb:hover {
background: rgba(150, 150, 150, 0.75);
} */
183 changes: 183 additions & 0 deletions assets/css/activities.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,183 @@
.activities-component {
position: relative;
font-size: clamp(1rem, 0.481rem + 2.374vw, 2rem);
padding: 0.5em;
max-width: 48rem;
height: fit-content;
}

.activities-component .window-component {
position: absolute;
top: 0;
left: 0;
}

.activities {
position: relative;
pointer-events: none;
z-index: 1;
display: flex;
flex-direction: column;
align-items: start;
gap: 0.4em;
}

.activities > .title {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
gap: 0.25em;
width: fit-content;
}

.activities > .title img {
height: 2em;
object-fit: contain;
}

.activities > .title h3 {
font-family: Ubuntu;
font-style: normal;
font-size: 1em;
font-weight: 600;
letter-spacing: 0.5px;
text-decoration: none;
text-transform: none;
color: #fff;
margin: 0;
padding: 0;
text-align: start;
align-self: center;
}

.activities p, .activities li {
font-family: Ubuntu;
font-style: normal;
font-size: 0.55em;
font-weight: 400;
letter-spacing: 0.5px;
text-decoration: none;
text-transform: none;
color: #fff;
margin: 0;
padding: 0;
text-align: justify;
width: fit-content;
}

.activities > .cards {
flex: 1;
display: flex;
flex-direction: row;
justify-content: center;
align-items: stretch;
gap: 0.5em;
}

.activities > .cards > .card {
flex: 1 0;
background: #171718;
border-radius: 12px;
overflow: hidden;

display: flex;
flex-direction: column;
}

.activities > .cards > .card img {
height: 5em;
object-fit: cover;
object-position: center -155px;
}

.activities > .cards .card-content {
flex: 1;
display: flex;
flex-direction: column;
justify-content: start;
gap: 12px;
padding: 10px;
}

.activities > .cards .card-content button {
flex: 0;
pointer-events: all;
background: #3C7EAE;
border-radius: 10px;
border: none;
font-size: 0.8em;
font-weight: 600;
color: #ffffff;

padding: 5px;
margin-top: auto;
}

.activities > .cards .card-content button:hover {
background: #5d95bd;
}

.activities h4 {
font-family: Ubuntu;
font-style: normal;
font-size: 0.8em;
font-weight: 500;
letter-spacing: 0.5px;
text-decoration: none;
text-transform: none;
color: #fff;
padding: 0;
}

.dots {
flex: 0;
display: flex;
align-items: center;
justify-content: space-between;
gap: 0.25em;
}

.dots span {
width: 0.45em;
height: 0.45em;
background-color: rgb(255, 255, 255);
border-radius: 50%;
display: inline-block;
}

/* Media querry for medium size
@media (max-height: 905px) {
.dots {
display: none;
}
} */

/* Media querry for small size */
@media (max-height: 925px) or (max-width: 1650px) {
.dots {
flex: 0 1 1em;
display: flex;
}

.activities > .cards > .card:not(:first-child) {
display: none;
}

.activities > .cards > .card {
flex: 1;
flex-direction: row;
}

.activities > .cards > .card img {
height: 100%;
width: 30%;
object-position: center center;
}
}

@media (max-width: 425px) {
.activities > .cards > .card img {
display: none;
}
}
Loading
Loading