Bläddra i källkod

Remove manual responsive handling and readd Bootstrap.

Frederic G. MARAND 8 år sedan
förälder
incheckning
c58db4375e
4 ändrade filer med 2 tillägg och 72 borttagningar
  1. 0 25
      public/css/styles.css
  2. 1 1
      public/css/styles.css.map
  3. 0 39
      public/css/styles.scss
  4. 1 7
      public/index.html

+ 0 - 25
public/css/styles.css

@@ -1,30 +1,5 @@
-body {
-  margin: 0; }
-
 /* use this to put borders around things... */
 .thin_border {
   border: 1px solid black; }
 
-div {
-  border: 1px solid gray;
-  box-sizing: border-box;
-  margin: 0;
-  padding: 0;
-  float: left; }
-
-@media (min-width: 750px) {
-  .responsive {
-    display: inline-block;
-    width: 400px; } }
-@media (min-width: 1000px) {
-  .responsive {
-    display: inline;
-    width: 500px; } }
-@media (min-width: 500px) {
-  body {
-    background: #ff8060; } }
-@media (min-width: 1000px) {
-  body {
-    background: #80e0a0; } }
-
 /*# sourceMappingURL=styles.css.map */

+ 1 - 1
public/css/styles.css.map

@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "AAAA,IAAK;EACH,MAAM,EAAE,CAAC;;AAGX,8CAA8C;AAC9C,YAAa;EACZ,MAAM,EAAE,eAAe;;AAGxB,GAAI;EACF,MAAM,EAAE,cAAc;EACtB,UAAU,EAAE,UAAU;EACtB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,KAAK,EAAE,IAAI;;AAGb,yBAA0B;EACxB,WAAY;IACV,OAAO,EAAE,YAAY;IACrB,KAAK,EAAE,KAAK;AAIhB,0BAA2B;EACzB,WAAY;IACV,OAAO,EAAE,MAAM;IACf,KAAK,EAAE,KAAK;AAKhB,yBAA0B;EACxB,IAAK;IACH,UAAU,EAAE,OAAO;AAIvB,0BAA2B;EACzB,IAAK;IACH,UAAU,EAAE,OAAO",
+"mappings": "AAAA,8CAA8C;AAC9C,YAAa;EACZ,MAAM,EAAE,eAAe",
 "sources": ["styles.scss"],
 "names": [],
 "file": "styles.css"

+ 0 - 39
public/css/styles.scss

@@ -1,43 +1,4 @@
-body {
-  margin: 0;
-}
-
 /* use this to put borders around things... */
 .thin_border {
 	border: 1px solid black;
 }
-
-div {
-  border: 1px solid gray;
-  box-sizing: border-box;
-  margin: 0;
-  padding: 0;
-  float: left;
-}
-
-@media (min-width: 750px) {
-  .responsive {
-    display: inline-block;
-    width: 400px;
-  }
-}
-
-@media (min-width: 1000px) {
-  .responsive {
-    display: inline;
-    width: 500px;
-  }
-
-}
-
-@media (min-width: 500px) {
-  body {
-    background: #ff8060;
-  }
-}
-
-@media (min-width: 1000px) {
-  body {
-    background: #80e0a0;
-  }
-}

+ 1 - 7
public/index.html

@@ -1,7 +1,7 @@
 <html>
 	<head>
 		<title>This is my first web page</title>
-    <!-- link rel="stylesheet" type="text/css" href="css/bootstrap.css" / -->
+    <link rel="stylesheet" type="text/css" href="css/bootstrap.css" />
   	<link rel="stylesheet" type="text/css" href="css/styles.css" />
 	</head>
 
@@ -14,12 +14,6 @@
 
 		<hr />
 
-    <!-- Manual responsive layout -->
-    <div class="responsive" style="background-color: yellow">column 1</div>
-    <div class="responsive" style="background-color: purple">column 2</div>
-
-    <hr />
-
     <div class="container">
       <h1>This is my first web page</h1>