Skip to content
GitLab
Commit 031bc9e3 authored by Cholgrrr's avatar Cholgrrr
Browse files

update Css

parent 5e0aa3a3
master
No related merge requests found
Pipeline #6978 passed with stages
in 14 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 438 additions and 63 deletions
+438 -63
public/assets/css/main.css
+ 24
- 33
View file @ 031bc9e3
.footer {
/* position: fixed; */
/* left: 0;
bottom: 0; */
width: 100%;
text-align: center;
background-color: white;
/* height: 10%; */
.footer,
.page-wrap:after {
height: 90px;
}
.header {
margin-bottom: 10px;
margin-bottom: 50px;
margin-top: 0px;
/* position: fixed; */
/* left: 0;
top: 0; */
height: 10%;
background-color: white;
}
.page-wrap {
min-height: 100%;
/* margin-bottom: -90px; */
top: 0;
left: 0;
right: 0;
bottom: 0;
/* equal to footer height */
}
.page-wrap:after {
content: "";
display: block;
}
.main {
margin-top: 60px;
margin-bottom: 60px;
overflow-x: auto;
overflow-y: hidden;
height: 80%;
height: 100%;
}
.centered {
/* position: absolute; */
/* top: 100;
bottom: 100;*/
left: 0;
right: 0;
height: 70%;
......@@ -43,15 +48,6 @@
clear: both;
}
/* html,
body {
min-height: 80%;
}
body {
height: 85vh;
} */
.column {
float: left;
width: 25%;
......@@ -59,11 +55,6 @@ body {
/* Should be removed. Only for demonstration */
}
* {
box-sizing: border-box;
}
a:link {
color: black;
background-color: transparent;
......@@ -102,14 +93,14 @@ a:active {
h3 {
font-family: 'ApfelGrotezk_regular';
font-size: 35px;
font-size: 40px;
color: black;
padding-left: 1em;
padding-right: 1em;
}
h1 {
font-family: 'ApfelGrotezk_fett';
font-family: 'ApfelGrotezk_regular';
font-size: 40px;
color: black;
......@@ -134,7 +125,7 @@ a:active {
}
h1 {
font-family: 'ApfelGrotezk_fett';
font-family: 'ApfelGrotezk_regular';
font-size: 30px;
color: black;
......
public/assets/css/normalize.css 0 → 100644
+ 379
- 0
View file @ 031bc9e3
/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
/* Document
========================================================================== */
/**
* 1. Correct the line height in all browsers.
* 2. Prevent adjustments of font size after orientation changes in iOS.
*/
html {
line-height: 1.15;
/* 1 */
-webkit-text-size-adjust: 100%;
/* 2 */
}
/* Sections
========================================================================== */
/**
* Remove the margin in all browsers.
*/
body {
margin: 0;
}
/**
* Render the `main` element consistently in IE.
*/
main {
display: block;
}
/**
* Correct the font size and margin on `h1` elements within `section` and
* `article` contexts in Chrome, Firefox, and Safari.
*/
h1 {
font-size: 2em;
margin: 0.67em 0;
}
/* Grouping content
========================================================================== */
/**
* 1. Add the correct box sizing in Firefox.
* 2. Show the overflow in Edge and IE.
*/
hr {
box-sizing: content-box;
/* 1 */
height: 0;
/* 1 */
overflow: visible;
/* 2 */
}
/**
* 1. Correct the inheritance and scaling of font size in all browsers.
* 2. Correct the odd `em` font sizing in all browsers.
*/
pre {
font-family: monospace, monospace;
/* 1 */
font-size: 1em;
/* 2 */
}
/* Text-level semantics
========================================================================== */
/**
* Remove the gray background on active links in IE 10.
*/
a {
background-color: transparent;
}
/**
* 1. Remove the bottom border in Chrome 57-
* 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
*/
abbr[title] {
border-bottom: none;
/* 1 */
text-decoration: underline;
/* 2 */
text-decoration: underline dotted;
/* 2 */
}
/**
* Add the correct font weight in Chrome, Edge, and Safari.
*/
b,
strong {
font-weight: bolder;
}
/**
* 1. Correct the inheritance and scaling of font size in all browsers.
* 2. Correct the odd `em` font sizing in all browsers.
*/
code,
kbd,
samp {
font-family: monospace, monospace;
/* 1 */
font-size: 1em;
/* 2 */
}
/**
* Add the correct font size in all browsers.
*/
small {
font-size: 80%;
}
/**
* Prevent `sub` and `sup` elements from affecting the line height in
* all browsers.
*/
sub,
sup {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
}
sub {
bottom: -0.25em;
}
sup {
top: -0.5em;
}
/* Embedded content
========================================================================== */
/**
* Remove the border on images inside links in IE 10.
*/
img {
border-style: none;
}
/* Forms
========================================================================== */
/**
* 1. Change the font styles in all browsers.
* 2. Remove the margin in Firefox and Safari.
*/
button,
input,
optgroup,
select,
textarea {
font-family: inherit;
/* 1 */
font-size: 100%;
/* 1 */
line-height: 1.15;
/* 1 */
margin: 0;
/* 2 */
}
/**
* Show the overflow in IE.
* 1. Show the overflow in Edge.
*/
button,
input {
/* 1 */
overflow: visible;
}
/**
* Remove the inheritance of text transform in Edge, Firefox, and IE.
* 1. Remove the inheritance of text transform in Firefox.
*/
button,
select {
/* 1 */
text-transform: none;
}
/**
* Correct the inability to style clickable types in iOS and Safari.
*/
button,
[type="button"],
[type="reset"],
[type="submit"] {
-webkit-appearance: button;
}
/**
* Remove the inner border and padding in Firefox.
*/
button::-moz-focus-inner,
[type="button"]::-moz-focus-inner,
[type="reset"]::-moz-focus-inner,
[type="submit"]::-moz-focus-inner {
border-style: none;
padding: 0;
}
/**
* Restore the focus styles unset by the previous rule.
*/
button:-moz-focusring,
[type="button"]:-moz-focusring,
[type="reset"]:-moz-focusring,
[type="submit"]:-moz-focusring {
outline: 1px dotted ButtonText;
}
/**
* Correct the padding in Firefox.
*/
fieldset {
padding: 0.35em 0.75em 0.625em;
}
/**
* 1. Correct the text wrapping in Edge and IE.
* 2. Correct the color inheritance from `fieldset` elements in IE.
* 3. Remove the padding so developers are not caught out when they zero out
* `fieldset` elements in all browsers.
*/
legend {
box-sizing: border-box;
/* 1 */
color: inherit;
/* 2 */
display: table;
/* 1 */
max-width: 100%;
/* 1 */
padding: 0;
/* 3 */
white-space: normal;
/* 1 */
}
/**
* Add the correct vertical alignment in Chrome, Firefox, and Opera.
*/
progress {
vertical-align: baseline;
}
/**
* Remove the default vertical scrollbar in IE 10+.
*/
textarea {
overflow: auto;
}
/**
* 1. Add the correct box sizing in IE 10.
* 2. Remove the padding in IE 10.
*/
[type="checkbox"],
[type="radio"] {
box-sizing: border-box;
/* 1 */
padding: 0;
/* 2 */
}
/**
* Correct the cursor style of increment and decrement buttons in Chrome.
*/
[type="number"]::-webkit-inner-spin-button,
[type="number"]::-webkit-outer-spin-button {
height: auto;
}
/**
* 1. Correct the odd appearance in Chrome and Safari.
* 2. Correct the outline style in Safari.
*/
[type="search"] {
-webkit-appearance: textfield;
/* 1 */
outline-offset: -2px;
/* 2 */
}
/**
* Remove the inner padding in Chrome and Safari on macOS.
*/
[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
/**
* 1. Correct the inability to style clickable types in iOS and Safari.
* 2. Change font properties to `inherit` in Safari.
*/
::-webkit-file-upload-button {
-webkit-appearance: button;
/* 1 */
font: inherit;
/* 2 */
}
/* Interactive
========================================================================== */
/*
* Add the correct display in Edge, IE 10+, and Firefox.
*/
details {
display: block;
}
/*
* Add the correct display in all browsers.
*/
summary {
display: list-item;
}
/* Misc
========================================================================== */
/**
* Add the correct display in IE 10+.
*/
template {
display: none;
}
/**
* Add the correct display in IE 10.
*/
[hidden] {
display: none;
}
\ No newline at end of file
public/assets/css/typeface.css
+ 6
- 3
View file @ 031bc9e3
......@@ -22,9 +22,10 @@ p {
}
h1 {
font-family: 'ApfelGrotezk_fett';
font-size: 55px;
font-family: 'ApfelGrotezk_regular';
font-size: 60px;
margin: 20px;
}
h2 {
......@@ -33,10 +34,12 @@ h2 {
color: black;
padding-left: 1em;
padding-right: 1em;
text-align: center;
}
h3 {
font-family: 'ApfelGrotezk_regular';
font-size: 45px;
font-size: 60px;
text-align: center;
margin: 10px;
}
\ No newline at end of file
public/home/index.html
+ 29
- 27
View file @ 031bc9e3
......@@ -4,42 +4,44 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="GitLab Pages">
<!-- <meta name="generator" content="GitLab Pages"> -->
<title>Zukunft Stadt Labor</title>
<link rel="stylesheet" href="../assets/css/normalize.css">
<link rel="stylesheet" href="../assets/css/typeface.css">
<link rel="stylesheet" href="../assets/css/main.css">
</head>
<body>
<div class="header">
<h1>&bullet;
Zukunft Labor Stadt</h1>
</div>
<div class="page-wrap">
<div class="header">
<h1>&bullet;
Zukunft Labor Stadt</h1>
</div>
<div class="main">
<div class="centered">
<div class="chapter">
<h3>INTRO</h3>
</div>
<div class="chapter">
<h3>1 BETEILIGENDE GESTALTUNG</h3>
</div>
<div class="chapter">
<h3>2 MOBILITÄTSWENDE AKTIV GESTALTEN</h3>
</div>
<div class="chapter">
<h3>3 PARTIZIPATION! UND NUN?</h3>
</div>
<div class="chapter">
<h3>4 NACHHALTIG IM QUARTIER</h3>
</div>
<div class="chapter">
<h3>5 POTENZIALE DIGITALER WERKZEUGE</h3>
<div class="main">
<div class="centered">
<div class="chapter">
<h3>INTRO</h3>
</div>
<div class="chapter">
<h3>1 BETEILIGENDE GESTALTUNG</h3>
</div>
<div class="chapter">
<h3>2 MOBILITÄTSWENDE AKTIV GESTALTEN</h3>
</div>
<div class="chapter">
<h3>3 PARTIZIPATION! UND NUN?</h3>
</div>
<div class="chapter">
<h3>4 NACHHALTIG IM QUARTIER</h3>
</div>
<div class="chapter">
<h3>5 POTENZIALE DIGITALER WERKZEUGE</h3>
</div>
</div>
</div>
</div>
<div class="footer">
<footer class="footer">
<div class="row">
<div class="column">
<h2>Über das Projekt</h2>
......@@ -58,7 +60,7 @@
</div>
</div>
</div>
</footer>
</body>
</html>
\ No newline at end of file
Supports Markdown
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

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal