Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Improve formatting of HTML, CSS #12

Merged
merged 3 commits into from

2 participants

@danielberkompas

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.

assets/stylesheets/home_page.css
((4 lines not shown))
}
-
-.container {
- width: 850px;
-
-#container {
- width: 800px;
-
- height: 900px;
- margin: auto;
- background-color: #002640;
- border-radius: 5px;
-}
-
@danielberkompas Owner

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
assets/stylesheets/home_page.css
((23 lines not shown))
div.banner {
margin-left: auto;
margin-right: auto;
width: 800px
}
-=======
@danielberkompas Owner

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
assets/stylesheets/home_page.css
@@ -39,4 +22,3 @@ p {
color: gray;
padding-left: 15px;
}
->>>>>>> main_home_page_project
@danielberkompas Owner

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
views/index.erb
((5 lines not shown))
</div>
-
-<body>
@danielberkompas Owner

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
views/index.erb
((5 lines not shown))
</div>
-
-<body>
- <div id="container">
@danielberkompas Owner

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@danielberkompas danielberkompas commented on the diff
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 Owner

I improved the tabbing here.

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

@zberkom @matthewberkompas Take a look at this.

@danielberkompas danielberkompas referenced this pull request
Merged

Product Page #10

@zberkom zberkom merged commit 78117db into from
@zberkom zberkom deleted the branch
@danielberkompas

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.

@zberkom
Owner

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
Commits on Jul 22, 2014
  1. @danielberkompas
  2. @danielberkompas
Commits on Jul 23, 2014
  1. @zberkom

    Merging Daniel's Pull Request

    zberkom authored
This page is out of date. Refresh to see the latest.
View
1  .gitignore
@@ -1,3 +1,4 @@
.bundle/
bin/
tags
+.editorconfig
View
5 assets/stylesheets/home_page.css
@@ -1,6 +1,8 @@
body{
- background-image: url(http://i1.ytimg.com/vi/58-2y-1MUPw/maxresdefault.jpg);
+ background-image: url(http://i1.ytimg.com/vi/58-2y-1MUPw/maxresdefault.jpg);
}
+<<<<<<< HEAD
+=======
div.container{
width: 2000px;
}
@@ -14,6 +16,7 @@ div.container{
padding-right: 20px;
padding-left: 20px;
}
+>>>>>>> master
div.banner {
margin-left: auto;
View
12 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 Owner

I improved the tabbing here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>
@@ -35,4 +35,4 @@
<%= yield %>
</div>
</body>
-</html>
+</html>
Something went wrong with that request. Please try again.