Browse Source

I forgot to merge the actual changes

pull/26/head
parent
commit
438fd2fec6
11 changed files with 55 additions and 37 deletions
  1. +4
    -4
      donate/index.php
  2. +2
    -2
      index.php
  3. +45
    -27
      res/css/style.css
  4. BIN
      res/fonts/roboto/Roboto-Bold.ttf
  5. BIN
      res/fonts/roboto/Roboto-Bold.woff
  6. BIN
      res/fonts/roboto/Roboto-Light.ttf
  7. BIN
      res/fonts/roboto/Roboto-Light.woff
  8. BIN
      res/fonts/roboto/Roboto-Regular.ttf
  9. BIN
      res/fonts/roboto/Roboto-Regular.woff
  10. +2
    -2
      resolutions/index.php
  11. +2
    -2
      resources/meat-donation-map/index.php

+ 4
- 4
donate/index.php View File

@ -61,7 +61,7 @@
}
#member-con {
font-family: 'Heebo', sans-serif;
font-family: 'Roboto', sans-serif;
paddinecho $response;g-bottom: 50em;
}
@ -69,7 +69,7 @@
width: 100%;
margin: auto auto;
display: block;
font-family: 'Heebo', sans-serif;
font-family: 'Roboto', sans-serif;
font-weight: 100;
color: #aab9c6;
background-color: #fff;
@ -93,7 +93,7 @@
margin: 10px 0 10px 0;
border: 2px solid #000;
padding: 2%;
font-family: 'Heebo', sans-serif;
font-family: 'Roboto', sans-serif;
}
select {
@ -461,4 +461,4 @@ if (isset($error)) {
}
</script>
</body>
</html>
</html>

+ 2
- 2
index.php View File

@ -90,7 +90,7 @@
z-index: 10;
position: absolute;
text-align: center;
font-family: AvenirNext Bold;
font-family: "AvenirNext Bold";
font-weight: 700;
/* padding: 1.4em; */
}
@ -106,7 +106,7 @@
z-index: 9;
position: absolute;
text-align: center;
font-family: Roboto Bold;
font-family: "Roboto";
font-weight: 700;
padding: 1.4em;
opacity: .7;


+ 45
- 27
res/css/style.css View File

@ -1,21 +1,38 @@
@font-face {
font-family: Avenir Light;
src: url(https://socialistra.org/res/web/fonts/Metropolis-Light.otf);
font-family: "Avenir Light";
src: url('/res/fonts/Metropolis-Light.otf');
}
@font-face {
font-family: AvenirNext Bold;
src: url(https://socialistra.org/res/fonts/Metropolis-SemiBold.otf);
font-family: "AvenirNext Bold";
src: url('/res/fonts/Metropolis-SemiBold.otf');
}
@font-face {
font-family: Roboto Bold;
src: url(https://socialistra.org/res/fonts/roboto/Roboto-Bold.ttf);
font-family: "Roboto";
src: url('/res/fonts/roboto/Roboto-Light.woff') format('woff'),
url('/res/fonts/roboto/Roboto-Light.ttf') format('truetype');
font-weight: 300;
font-style: normal;
}
@font-face {
font-family: "Roboto";
src: url('/res/fonts/roboto/Roboto-Regular.woff') format('woff'),
url('/res/fonts/roboto/Roboto-Regular.ttf') format('truetype');
font-weight: 400;
font-style: normal;
}
@font-face {
font-family: "Roboto";
src: url('/res/fonts/roboto/Roboto-Bold.woff') format('woff'),
url('/res/fonts/roboto/Roboto-Bold.ttf') format('truetype');
font-weight: 700;
font-style: normal;
}
body {
width: 100%;
padding: 0;
margin: 0;
background-color: #f5f5f5;
font-family: roboto, sans-serif;
font-family: "Roboto", sans-serif;
font-weight: 300;
color: #242524;
-webkit-font-smoothing: antialiased;
@ -49,10 +66,11 @@ hr.news-hr {
width: 90%;
}
h4 {
font-family: Roboto Bold;
font-family: "Roboto", sans-serif;
font-weight: 700;
}
h2 {
font-family: roboto, sans-serif;
font-family: "Roboto", sans-serif;
color: #666;
font-weight: 300;
}
@ -129,7 +147,7 @@ p a {
z-index: 9;
position: absolute;
text-align: center;
font-family: Roboto Bold;
font-family: "Roboto";
font-weight: 700;
background-color: #000;
padding: 1.4em;
@ -141,7 +159,7 @@ p a {
visibility: hidden;
}
#read {
font-family: AvenirNext Bold;
font-family: "AvenirNext Bold";
background-color: #d32f2f;
font-size: 0.3em;
padding: 10px 20px;
@ -165,7 +183,7 @@ p a {
z-index: 10;
position: absolute;
text-align: center;
font-family: AvenirNext Bold;
font-family: "AvenirNext Bold";
font-weight: 700;
padding: 1.4em;
}
@ -198,7 +216,7 @@ p a {
}
p.article {
font-size: 1.5em;
font-family: Avenir Light;
font-family: "Avenir Light";
text-align: center;
}
#article-page {
@ -213,14 +231,14 @@ p.article {
text-align: center;
font-size: 4em;
padding: 1em 0 0.5em;
font-family: AvenirNext Bold;
font-family: "AvenirNext Bold";
font-weight: 700;
}
#article-title {
text-align: left;
font-size: 4em;
padding: 1em 0 0;
font-family: AvenirNext Bold;
font-family: "AvenirNext Bold";
font-weight: 700;
}
#article-image img {
@ -230,7 +248,7 @@ p.article {
border-radius: 5px;
}
#article-content {
font-family: heebo, sans-serif;
font-family: 'Roboto', sans-serif;
font-size: 1.25em;
font-weight: 300;
color: #4a4a4a;
@ -279,7 +297,7 @@ p.article {
}
.span_1_of_4 {
width: 23.8%;
font-family: Avenir Light;
font-family: "Avenir Light";
background-color: #fff;
color: #292929;
padding: 10px 0;
@ -287,7 +305,7 @@ p.article {
.span_1_of_4 p {
text-align: center;
text-transform: capitalize;
font-family: Roboto Bold;
font-family: "Roboto";
}
.span_1_of_4 img {
width: 80%;
@ -347,7 +365,7 @@ p.sub-nit {
}
.span_1_of_5 {
width: 18.72%;
font-family: Avenir Light;
font-family: "Avenir Light";
background-color: #fff;
color: #292929;
padding: 10px 0;
@ -367,7 +385,7 @@ footer {
color: #a8a8a8;
border: none;
margin: 0;
font-family: Avenir Light;
font-family: "Avenir Light";
box-shadow: inset 0 2px 1px 0 rgba(0, 0, 0, 0.7);
}
footer img {
@ -467,7 +485,7 @@ footer .fa {
.span_1_of_5 {
margin-left: 0;
text-transform: uppercase;
font-family: AvenirNext Bold;
font-family: "AvenirNext Bold";
}
.span_1_of_4,
.span_2_of_4,
@ -556,7 +574,7 @@ footer .fa {
z-index: 9;
position: absolute;
text-align: center;
font-family: Roboto Bold;
font-family: "Roboto";
font-weight: 700;
background-color: #000;
opacity: 0.7;
@ -575,7 +593,7 @@ footer .fa {
z-index: 10;
position: absolute;
text-align: center;
font-family: AvenirNext Bold;
font-family: "AvenirNext Bold";
text-shadow: 0 0 15px #000;
padding: 1em 0;
}
@ -618,14 +636,14 @@ footer .fa {
text-align: center;
font-size: 2em;
padding: 1em 0 0.5em;
font-family: AvenirNext Bold;
font-family: "AvenirNext Bold";
font-weight: 700;
}
#article-title {
text-align: left;
font-size: 2em;
padding: 0;
font-family: AvenirNext Bold;
font-family: "AvenirNext Bold";
font-weight: 700;
}
#article-image {
@ -639,7 +657,7 @@ footer .fa {
}
p.article {
font-size: 1em;
font-family: Avenir Light;
font-family: "Avenir Light";
text-align: center;
}
.span_1_of_3 img.news_item {
@ -677,7 +695,7 @@ footer .fa {
color: #a8a8a8;
border: none;
margin: 0;
font-family: Avenir Light;
font-family: "Avenir Light";
}
.section {
clear: both;


BIN
res/fonts/roboto/Roboto-Bold.ttf View File


BIN
res/fonts/roboto/Roboto-Bold.woff View File


BIN
res/fonts/roboto/Roboto-Light.ttf View File


BIN
res/fonts/roboto/Roboto-Light.woff View File


BIN
res/fonts/roboto/Roboto-Regular.ttf View File


BIN
res/fonts/roboto/Roboto-Regular.woff View File


+ 2
- 2
resolutions/index.php View File

@ -24,7 +24,7 @@
<style type="text/css">
p {
font-weight: 200;
font-family: 'Heebo', sans-serif;
font-family: 'Roboto', sans-serif;
}
ul.resolutions {
list-style-type: none;
@ -116,4 +116,4 @@ foreach ($resolutions as $object) {
<?php include("../res/php/bottom.php") ?>
</body>
</html>
</html>

+ 2
- 2
resources/meat-donation-map/index.php View File

@ -21,7 +21,7 @@
<head>
<title>Socialist Rifle Association</title>
<link rel="icon" href="/img/favicon.png">
<link rel="stylesheet" type="text/css" href="/css/style.css">
<link rel="stylesheet" type="text/css" href="/res/css/style.css">
<link rel="stylesheet" type="text/css" href="/css/material-display.min.css">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script src="/js/jquery.min.js" type="text/javascript"></script>
@ -162,4 +162,4 @@ img.hunter {
<script src="../js/page-menu.js" type="text/javascript"></script>
<script src="/js/meat-map.js" type="text/javascript"></script>
</body>
</html>
</html>

Loading…
Cancel
Save