commit 1225292ac1b190a12a52aac5313d7b5888241c2f
parent 304a9ab22531d435aaa93208a66ef52250fcd6cc
Author: therealFIGBERT <figbertwelner@gmail.com>
Date: Fri, 20 Sep 2019 10:53:16 -0700
Condensing stylesheets and updating to BEM syntax, and correcting link addresses.
Diffstat:
7 files changed, 105 insertions(+), 264 deletions(-)
diff --git a/consecutiveNum/index.html b/consecutiveNum/index.html
@@ -4,12 +4,12 @@
<head>
<title>FIGBERT Math - C.N.F.</title>
<meta charset="utf-8">
- <link href="main.css" rel="stylesheet">
+ <link href="../main.css" rel="stylesheet" type="text/css">
</head>
<body>
<header>
- <h1>Consecutive Number Solver</h1>
- <h2>by FIGBERT</h2>
+ <h1 class="pagetitle">Consecutive Number Solver</h1>
+ <h2 class="pagetitle pagetitle__sub">by FIGBERT</h2>
</header>
<main>
<form>
@@ -17,11 +17,11 @@
<legend id="bigBox">Configure the number set</legend>
<fieldset>
<legend>Set the amount of numbers</legend>
- <label for="numSet">There are <input type="number" step="1" min="2" id="numSet" class="numSet"> numbers</label>
+ <label for="numSet">There are <input type="number" step="1" min="2" id="numSet" class="numinput"> numbers</label>
</fieldset>
<fieldset>
<legend>Set the sum of the numbers</legend>
- <label for="sumSet">The sum of the numbers is <input type="number" step="1" id="sumSet" class="numSet"></label>
+ <label for="sumSet">The sum of the numbers is <input type="number" step="1" id="sumSet" class="numinput"></label>
</fieldset>
<fieldset>
<legend>Set the type of the numbers</legend>
@@ -36,20 +36,14 @@
</form>
</main>
<footer>
- <a href="/index.html" class="footer-text">Home</a>
- <div class="dot"></div>
- <a href="about/" class="footer-text">About</a>
- <div class="dot"></div>
- <a href="requests/" class="footer-text">Request New Program</a>
- <div class="dot"></div>
- <a href="submit/" class="footer-text">Submit Code</a>
+ <a href="../" class="footer__text">Home</a>
+ <span class="footer__text">•</span>
+ <a href="../about/" class="footer__text">About</a>
+ <span class="footer__text">•</span>
+ <a href="../requests/" class="footer__text">Request New Program</a>
+ <span class="footer__text">•</span>
+ <a href="../submit/" class="footer__text">Submit Code</a>
</footer>
</body>
</html>
-<script src="consecutiveNum.js"></script>
-
-<!-- QUESTIONS:
-
-How many numbers?
-Sum of the numbers?
-Odd/Even/Both?
-\ No newline at end of file
+<script src="consecutiveNum.js"></script>
+\ No newline at end of file
diff --git a/consecutiveNum/main.css b/consecutiveNum/main.css
@@ -1,77 +0,0 @@
-* {
- font-family: sans-serif, monospace;
- margin: 0px;
-}
-
-body {
- background-color: #1A181C;
-}
-
-header {
- background-color: #643181;
- text-align: center;
- width: 100%;
-}
-
-h1 {
- padding: 5px 0px 5px 0px;
- font-size: 30px;
- color: #B494C7;
-}
-
-header h2 {
- color: #B494C7;
- padding-bottom: 10px;
- font-size: 15px;
-}
-
-main {
- margin-top: 10px;
- color: #ACA0B2;
- border-color: #ACA0B2;
-}
-
-.numSet {
- width: 3%;
-}
-
-footer {
- display: flex;
- flex-direction: row;
- justify-content: flex-start;
- align-items: center;
- position: fixed;
- bottom: 0;
- width: 100%;
-}
-
-.footer-text {
- color: #ACA0B2;
- font-size: 10px;
- margin: 10px;
-}
-
-.dot {
- background-color: #ACA0B2;
- width: 4px;
- height: 4px;
- border-radius: 50px;
-}
-
-input {
- background-color: #8E60A7;
- color: #ACA0B2;
- border-color: #ACA0B2;
-}
-
-#bigBox {
- font-weight: 900;
-}
-
-#setButton {
- margin-top: 9px;
-}
-
-h3 {
- margin: 10px 0px 10px 0px;
-}
-\ No newline at end of file
diff --git a/index.html b/index.html
@@ -12,24 +12,19 @@
</head>
<body>
<header>
- <h1>FIGBERT Math</h1>
- <h2>Custom Math Programs for Everyday Use</h2>
+ <h1 class="pagetitle">FIGBERT Math</h1>
+ <h2 class="pagetitle pagetitle__sub">Homework is for Pussies</h2>
</header>
- <div id="programs">
- <a href="matrix/" class="programList"><img src="http://lorempixel.com/500/500/" alt="Subsequent Equation Solver Logo">Subsequent Equation Solver</a>
- <a href="consecutiveNum/" class="programList"><img src="http://lorempixel.com/500/500/" alt="Consecutive Number Finder Logo">Consecutive Number Solver</a>
- <a href="" class="programList"><img src="http://lorempixel.com/500/500/" alt="Test">Test</a>
+ <div class="linklist">
+ <a href="matrix/" class="linklist__item">Subsequent Equation Solver</a>
+ <a href="consecutiveNum/" class="linklist__item">Consecutive Number Solver</a>
</div>
<footer>
- <a href="about/" class="footer-text">About</a>
- <div class="dot"></div>
- <a href="requests/" class="footer-text">Request New Program</a>
- <div class="dot"></div>
- <a href="submit/" class="footer-text">Submit Code</a>
+ <a href="about/" class="footer__text">About</a>
+ <span class="footer__text">•</span>
+ <a href="requests/" class="footer__text">Request New Program</a>
+ <span class="footer__text">•</span>
+ <a href="submit/" class="footer__text">Submit Code</a>
</footer>
</body>
-</html>
-
-<!--<form action="/matrix">
- <input type="submit" value="Test">
-</form>-->
-\ No newline at end of file
+</html>
+\ No newline at end of file
diff --git a/main.css b/main.css
@@ -1,8 +1,5 @@
-* {
- font-family: sans-serif, monospace;
-}
-
body {
+ font-family: sans-serif, monospace;
background-color: #1A181C;
margin: 0px;
}
@@ -13,56 +10,71 @@ header {
width: 100%;
}
-h1 {
+.pagetitle {
margin: 0px;
padding: 10px 10px 0px 10px;
- font-size: 30px;
+ font-size: calc(28px + 0.5vw);
color: #B494C7;
- display: block;
}
-header h2 {
- color: #B494C7;
- display: block;
- margin: 0px;
+.pagetitle__sub {
padding-bottom: 10px;
- font-size: 15px;
+ padding-top: 0px;
+ font-size: calc(20px + 0.25vw);
}
-.footer-text {
- color: #ACA0B2;
- font-size: 10px;
- margin: 10px;
+.linklist {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ padding-top: 20px;
}
-.dot {
- background-color: #ACA0B2;
- width: 4px;
- height: 4px;
- border-radius: 50px;
+.linklist__item {
+ color: #ACA0B2;
+ font-size: calc(15px + 0.20vw);
+ flex-grow: 1;
+ padding-top: 10px;
+ padding-bottom: 10px;
}
-footer {
- display: flex;
- flex-direction: row;
- justify-content: flex-start;
- align-items: center;
+.numinput {
+ background-color: #8E60A7;
+ color: #ACA0B2;
+ border-color: #ACA0B2;
+ width: 3%;
}
-ul {
+main {
+ margin-top: 10px;
color: #ACA0B2;
+ border-color: #ACA0B2;
}
-.programList {
- color: #ACA0B2;
+#equations {
+ display: none;
+}
+
+#out {
+ display: none;
+}
+
+footer {
+ font-size: calc(10px + 0.1vw);
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ z-index: 9999;
+ padding-bottom: 5px;
display: flex;
- flex-direction: column;
+ flex-direction: row;
+ justify-content: flex-start;
align-items: center;
- width: 20%;
- height: 20%;
}
-#programs {
- display: flex;
- flex-flow: row wrap;
+.footer__text {
+ color: #ACA0B2;
+ padding-right: 5px;
+ padding-left: 5px;
}
\ No newline at end of file
diff --git a/matrix/index.html b/matrix/index.html
@@ -4,12 +4,12 @@
<head>
<title>FIGBERT Math - S.E.S.</title>
<meta charset="utf-8">
- <link href="matrix.css" rel="stylesheet">
+ <link href="../main.css" rel="stylesheet" type="text/css">
</head>
<body>
<header>
- <h1>Simultaneous Equation Solver</h1>
- <h2>by FIGBERT</h2>
+ <h1 class="pagetitle">Simultaneous Equation Solver</h1>
+ <h2 class="pagetitle pagetitle__sub">by FIGBERT</h2>
</header>
<main>
<form>
@@ -23,32 +23,32 @@
<fieldset id="equations">
<legend>Set the equation values</legend>
<div>
- <label for="wOne" class="w"><input id="wOne" type="number" name="setOne" class="numSet w a" step="0.01">w</label>
- <label for="xOne"><input id="xOne" type="number" name="setOne" class="numSet a" step="0.01">x</label>
- <label for="yOne"><input id="yOne" type="number" name="setOne" class="numSet a" step="0.01">y</label>
- <label for="zOne" class="z"><input id="zOne" type="number" name="setOne" class="numSet z a" step="0.01">z</label>
- <label for="equalsOne">=<input id="equalsOne" type="number" name="setOne" class="numSet a" step="0.01"></label>
+ <label for="wOne" class="w"><input id="wOne" type="number" name="setOne" class="numinput w a" step="0.01">w</label>
+ <label for="xOne"><input id="xOne" type="number" name="setOne" class="numinput a" step="0.01">x</label>
+ <label for="yOne"><input id="yOne" type="number" name="setOne" class="numinput a" step="0.01">y</label>
+ <label for="zOne" class="z"><input id="zOne" type="number" name="setOne" class="numinput z a" step="0.01">z</label>
+ <label for="equalsOne">=<input id="equalsOne" type="number" name="setOne" class="numinput a" step="0.01"></label>
</div>
<div>
- <label for="wTwo" class="w"><input id="wTwo" type="number" name="setTwo" class="numSet w a" step="0.01">w</label>
- <label for="xTwo"><input id="xTwo" type="number" name="setTwo" class="numSet a" step="0.01">x</label>
- <label for="yTwo"><input id="yTwo" type="number" name="setTwo" class="numSet a" step="0.01">y</label>
- <label for="zTwo" class="z"><input id="zTwo" type="number" name="setTwo" class="numSet z a" step="0.01">z</label>
- <label for="equalsTwo">=<input id="equalsTwo" type="number" name="setTwo" class="numSet a" step="0.01"></label>
+ <label for="wTwo" class="w"><input id="wTwo" type="number" name="setTwo" class="numinput w a" step="0.01">w</label>
+ <label for="xTwo"><input id="xTwo" type="number" name="setTwo" class="numinput a" step="0.01">x</label>
+ <label for="yTwo"><input id="yTwo" type="number" name="setTwo" class="numinput a" step="0.01">y</label>
+ <label for="zTwo" class="z"><input id="zTwo" type="number" name="setTwo" class="numinput z a" step="0.01">z</label>
+ <label for="equalsTwo">=<input id="equalsTwo" type="number" name="setTwo" class="numinput a" step="0.01"></label>
</div>
<div id="thirdEquation">
- <label for="wThree" class="w"><input id="wThree" type="number" name="setThree" class="numSet w a" step="0.01">w</label>
- <label for="xThree"><input id="xThree" type="number" name="setThree" class="numSet a" step="0.01">x</label>
- <label for="yThree"><input id="yThree" type="number" name="setThree" class="numSet a" step="0.01">y</label>
- <label for="zThree" class="z"><input id="zThree" type="number" name="setThree" class="numSet z a" step="0.01">z</label>
- <label for="equalsThree">=<input id="equalsThree" type="number" name="setThree" class="numSet a" step="0.01"></label>
+ <label for="wThree" class="w"><input id="wThree" type="number" name="setThree" class="numinput w a" step="0.01">w</label>
+ <label for="xThree"><input id="xThree" type="number" name="setThree" class="numinput a" step="0.01">x</label>
+ <label for="yThree"><input id="yThree" type="number" name="setThree" class="numinput a" step="0.01">y</label>
+ <label for="zThree" class="z"><input id="zThree" type="number" name="setThree" class="numinput z a" step="0.01">z</label>
+ <label for="equalsThree">=<input id="equalsThree" type="number" name="setThree" class="numinput a" step="0.01"></label>
</div>
<div id="fourthEquation">
- <label for="wFour" class="w"><input id="wFour" type="number" name="setFour" class="numSet w a" step="0.01">w</label>
- <label for="xFour"><input id="xFour" type="number" name="setFour" class="numSet a" step="0.01">x</label>
- <label for="yFour"><input id="yFour" type="number" name="setFour" class="numSet a" step="0.01">y</label>
- <label for="zFour" class="z"><input id="zFour" type="number" name="setFour" class="numSet z a" step="0.01">z</label>
- <label for="equalsFour">=<input id="equalsFour" type="number" name="setFour" class="numSet a" step="0.01"></label>
+ <label for="wFour" class="w"><input id="wFour" type="number" name="setFour" class="numinput w a" step="0.01">w</label>
+ <label for="xFour"><input id="xFour" type="number" name="setFour" class="numinput a" step="0.01">x</label>
+ <label for="yFour"><input id="yFour" type="number" name="setFour" class="numinput a" step="0.01">y</label>
+ <label for="zFour" class="z"><input id="zFour" type="number" name="setFour" class="numinput z a" step="0.01">z</label>
+ <label for="equalsFour">=<input id="equalsFour" type="number" name="setFour" class="numinput a" step="0.01"></label>
</div>
<input type="button" value="Solve" onclick="solveMatrix(eqSet.value)">
</fieldset>
@@ -70,13 +70,13 @@
</div>
</main>
<footer>
- <a href="/index.html" class="footer-text">Home</a>
- <div class="dot"></div>
- <a href="about/" class="footer-text">About</a>
- <div class="dot"></div>
- <a href="requests/" class="footer-text">Request New Program</a>
- <div class="dot"></div>
- <a href="submit/" class="footer-text">Submit Code</a>
+ <a href="../" class="footer__text">Home</a>
+ <span class="footer__text">•</span>
+ <a href="../about/" class="footer__text">About</a>
+ <span class="footer__text">•</span>
+ <a href="../requests/" class="footer__text">Request New Program</a>
+ <span class="footer__text">•</span>
+ <a href="../submit/" class="footer__text">Submit Code</a>
</footer>
</body>
</html>
diff --git a/matrix/matrix.css b/matrix/matrix.css
@@ -1,75 +0,0 @@
-* {
- font-family: sans-serif, monospace;
- margin: 0px;
-}
-
-body {
- background-color: #1A181C;
-}
-
-header {
- background-color: #643181;
- margin: 0px;
- text-align: center;
- width: 100%;
-}
-
-h1 {
- color: #B494C7;
- font-size: 30px;
- padding-bottom: 5px;
- padding-top: 5px;
-}
-
-h2 {
- color: #B494C7;
- padding-bottom: 10px;
- font-size: 15px;
-}
-
-main {
- margin-top: 10px;
- color: #ACA0B2;
- border-color: #ACA0B2;
-}
-
-.numSet {
- width: 3%;
-}
-
-#equations {
- display: none;
-}
-
-#out {
- display: none;
-}
-
-input {
- background-color: #8E60A7;
- border: 0px;
- color: #ACA0B2;
-}
-
-.footer-text {
- color: #ACA0B2;
- font-size: 10px;
- margin: 10px;
-}
-
-.dot {
- background-color: #ACA0B2;
- width: 4px;
- height: 4px;
- border-radius: 50px;
-}
-
-footer {
- display: flex;
- flex-direction: row;
- justify-content: flex-start;
- align-items: center;
- position: fixed;
- bottom: 0;
- width: 100%;
-}
-\ No newline at end of file
diff --git a/matrix/matrix.js b/matrix/matrix.js
@@ -229,10 +229,4 @@ function solveMatrix(dimension) {
document.getElementById("yValue").innerHTML = "y = " + valuesWXYZ[2];
document.getElementById("zValue").innerHTML = "z = " + valuesWXYZ[3];
}
-}
-
-/* FOR EXPANDABLE ALGORITHM
-
-Some form of repeating solveTwoMatrix() with a variable that detects the location of the last zero (in: [0,0,0,4,5] out: 2) and then finds the multiple and adds
-
-*/
-\ No newline at end of file
+}
+\ No newline at end of file
