Skip to content

Commit

Permalink
Remove bootstrap
Browse files Browse the repository at this point in the history
  • Loading branch information
matthuhiggins committed Jun 11, 2016
1 parent 8ea6ab8 commit 25a232b
Show file tree
Hide file tree
Showing 8 changed files with 151 additions and 130 deletions.
184 changes: 130 additions & 54 deletions app/assets/stylesheets/home.scss
Original file line number Diff line number Diff line change
@@ -1,32 +1,120 @@
//margins: 60,40,24;

* {
box-sizing: border-box;
}

html {
margin: 0;
padding: 0;
}

body {
font-family: 'Lato', sans-serif !important;
color: #333;
font-family: 'Lato', sans-serif;
font-size: 14px;
margin: 0;
padding: 0;
}

h1, h2, h3 {
a {
color: inherit;
}

h1, h2, h3, h4 {
color: inherit;
line-height: 1.1;
text-transform: uppercase;
}

h1 {

font-size: 135px;
font-weight: 300;
letter-spacing: -4px;
margin: 0;
white-space: nowrap;
}

h2 {
font-size: 36px;

}

h3 {
font-size: 36px;
}

h4 {
font-size: 18px;
}

img.img-responsive {
display: block;
max-width: 100%;
height: auto;
}

p {
font-size: 16px;
padding-left: 17%;
padding-right: 17%;
text-align: center;
}

li {
list-style-type: none;
}

h4 {
margin-top: 2em;
}

.container {
margin-right: auto;
margin-left: auto;
}

nav {
background-color: white;
border-bottom: 1px solid #e7e7e7;
left: 0;
overflow: hidden;
position: fixed;
right: 0;
top: 0;

a {
float: left;
line-height: 20px;
padding: 15px;
text-decoration: none;
}

.brand {
font-size: 18px;
margin-top: -2px;
}
}

section {
margin-right: auto;
margin-left: auto;

&.alt {
background-color: #dedddc
}

h3,h4 {
text-align: center;
}
}

#home {
margin-bottom: 1em;
margin-top: 4em;
text-align: left;

h1 {
font-size: 135px;
font-weight: 300;
margin: 0;
white-space: nowrap;

}

> h1 {
Expand All @@ -46,6 +134,10 @@ h3 {
margin-left: 1em;
margin-right: 0.1em;
}

.matthew {
margin-top: -0.1em;
}
}

h2 {
Expand All @@ -54,73 +146,57 @@ h3 {
margin: 0 0 0 0;
padding: 0.2em 0 0.6em 1.5em;
white-space: nowrap;

a {
color: inherit;
}
}

}

section {
&.alt {
background-color: #dedddc
}

h1,h2,h3,h4 {
text-align: center;
}
.container {
width: 970px;
}

p {
font-size: 16px;
padding-left: 17%;
padding-right: 17%;
text-align: center;
@media (max-width: 768px) {
h1 {
font-size: 80px;
}

li {
list-style-type: none;
h2 {
font-size: 30px;
}

h4 {
margin-top: 2em;
h3 {
font-size: 16px;
}
}

@media (max-width: 768px) {
#home {
h1 {
font-size: 80px;
}

h2 {
font-size: 30px;
}
@media (max-width: 550px) {
h1 {
font-size: 60px;
}
}

@media (max-width: 550px) {
#home {
h1 {
font-size: 60px;
}
h2 {
font-size: 24px;
}

h2 {
font-size: 24px;
}
h3 {
font-size: 16px;
}

}

@media (max-width: 450px) {
#home {
.container {
min-width: 290px;
}

h1 {
font-size: 48px;
}
h1 {
font-size: 48px;
}

h2 {
font-size: 18px;
}
h2 {
font-size: 18px;
}

h3 {
font-size: 12px;
}
}
16 changes: 0 additions & 16 deletions app/assets/stylesheets/menu.scss

This file was deleted.

12 changes: 0 additions & 12 deletions app/assets/stylesheets/whatever.scss

This file was deleted.

25 changes: 6 additions & 19 deletions app/views/application/_menu.html.erb
Original file line number Diff line number Diff line change
@@ -1,22 +1,9 @@
<!-- Fixed navbar -->
<nav class="navbar navbar-default navbar-fixed-top" id="menu">
<nav>
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#home">Brigitte + Matt</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li><a href="#wedding">Wedding</a></li>
<li><a href="#directions">Getting There</a></li>
<li><a href="#accomodations">Accomodations</a></li>
<li><a href="#registry">Registry</a></li>
</ul>
</div>
<a class="brand" href="#home">Brigitte + Matt</a>
<a href="#wedding">Wedding</a>
<a href="#venue">Venue</a>
<a href="#accomodations">Accomodations</a>
<a href="#registry">Registry</a>
</div>
</nav>
5 changes: 1 addition & 4 deletions app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@
<%= javascript_include_tag 'application' %>

<link href='https://fonts.googleapis.com/css?family=Lato' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script>

<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>

<body>
Expand Down
13 changes: 0 additions & 13 deletions app/views/layouts/mailer.html.erb

This file was deleted.

1 change: 0 additions & 1 deletion app/views/layouts/mailer.text.erb

This file was deleted.

Loading

0 comments on commit 25a232b

Please sign in to comment.