Improve formatting of HTML, CSS #12

Merged
merged 3 commits into from Jul 23, 2014

Projects

None yet

2 participants

Contributor

This PR will fix #11. We have some redundant CSS rules, HTML that needs better tabbing, and some artifacts that came from a conflict which should have been removed.

@danielberkompas danielberkompas commented on an outdated diff Jul 22, 2014
assets/stylesheets/home_page.css
}
-
-.container {
- width: 850px;
-
-#container {
- width: 800px;
-
- height: 900px;
- margin: auto;
- background-color: #002640;
- border-radius: 5px;
-}
-
danielberkompas
danielberkompas Jul 22, 2014 Contributor

We don't need these styles. Bootstrap already provides them.

@danielberkompas danielberkompas commented on an outdated diff Jul 22, 2014
assets/stylesheets/home_page.css
div.banner {
margin-left: auto;
margin-right: auto;
width: 800px
}
-=======
danielberkompas
danielberkompas Jul 22, 2014 Contributor

This is invalid CSS. @zberkom It probably got in here because of the conflict that you resolved. You need to remove this stuff when you're fixing a conflict.

@danielberkompas danielberkompas commented on an outdated diff Jul 22, 2014
assets/stylesheets/home_page.css
@@ -39,4 +22,3 @@ p {
color: gray;
padding-left: 15px;
}
->>>>>>> main_home_page_project
danielberkompas
danielberkompas Jul 22, 2014 Contributor

This also came from a conflict, and is also invalid CSS. This invalid CSS can break the CSS file.

@danielberkompas danielberkompas commented on an outdated diff Jul 22, 2014
views/index.erb
</div>
-
-<body>
danielberkompas
danielberkompas Jul 22, 2014 Contributor

The <body> tag is already in the layout.erb file. We don't need to repeat it in the other views.

@danielberkompas danielberkompas commented on an outdated diff Jul 22, 2014
views/index.erb
</div>
-
-<body>
- <div id="container">
danielberkompas
danielberkompas Jul 22, 2014 Contributor

Don't need to have a #container here, since this is also in the layout.erb file.

@danielberkompas danielberkompas commented on the diff Jul 22, 2014
views/layout.erb
@@ -23,11 +23,11 @@
<li><a href="#">Contact Us</a></li>
</ul>
<form class="navbar-form navbar-left" role="search">
- <div class="form-group">
- <input type="text" class="form-control" placeholder="Search">
- </div>
- <button type="submit" class="btn btn-info">Submit</button>
- </form>
+ <div class="form-group">
+ <input type="text" class="form-control" placeholder="Search">
+ </div>
+ <button type="submit" class="btn btn-info">Submit</button>
+ </form>
danielberkompas
danielberkompas Jul 22, 2014 Contributor

I improved the tabbing here.

Contributor

@zberkom @matthewberkompas Take a look at this.

@danielberkompas danielberkompas referenced this pull request Jul 22, 2014
Merged

Product Page #10

@zberkom zberkom merged commit 78117db into master Jul 23, 2014
@zberkom zberkom deleted the bugfix/11/container_styles branch Jul 23, 2014

You left in git's conflict stuff. When you fix a conflict, you need to get rid of these things:

  • <<<<<< HEAD
  • ===========
  • >>>>>>> master

I will demonstrate by fixing this on another branch.

Contributor
zberkom commented Jul 23, 2014

I am pretty sure that I did remove it from the index file, maybe I didn't remove it from all the files.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment