Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Final css adds #37

Merged
merged 20 commits into from
Oct 28, 2016
Merged

Final css adds #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
434cbb1
index page styling
LaurenSky Oct 28, 2016
7af0a9c
more changes
LaurenSky Oct 28, 2016
d64994e
css
LaurenSky Oct 28, 2016
36645e6
updated reviews
LaurenSky Oct 28, 2016
751e08d
css merchant show
LaurenSky Oct 28, 2016
ac9a8db
category show
LaurenSky Oct 28, 2016
14aced0
css prodcut cat and cat new
LaurenSky Oct 28, 2016
530389c
css form styling
LaurenSky Oct 28, 2016
8546f7c
merchant show page
LaurenSky Oct 28, 2016
a642291
added merchant name to show page if logged out
LaurenSky Oct 28, 2016
6e1abf2
fixed title on product edit page, saving a purchased order's time
wordkarin Oct 28, 2016
852293b
Merge branch 'master' into final-css-adds
wordkarin Oct 28, 2016
2931e24
css finessing
LaurenSky Oct 28, 2016
a18efb1
fix merge conflicts
LaurenSky Oct 28, 2016
3ec7668
fixed images on merchant prodcut page
LaurenSky Oct 28, 2016
4efadaf
Merge branch 'final-css-adds' of https://github.com/wordkarin/betsy i…
LaurenSky Oct 28, 2016
09daec1
Merge branch 'master' into final-css-adds
LaurenSky Oct 28, 2016
1cc7920
added spacing
LaurenSky Oct 28, 2016
b388f9d
Merge branch 'master' into final-css-adds
LaurenSky Oct 28, 2016
6d236ff
spelling
LaurenSky Oct 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions app/assets/stylesheets/application.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,17 @@ header section#category-list article.top-bar-section ul {
text-align: center;
}

/*FOOTER*/
footer div {
width: 100%;
background-color: #5A6070;
color: #ECEBE4;
}

footer div p {
padding: .3%;
}

/*ALL PAGES*/
.page-title {
padding-top: 2%;
Expand Down
3 changes: 1 addition & 2 deletions app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
</section>
</header>

<%= yield %>

<%= yield %>
</body>
</html>
2 changes: 1 addition & 1 deletion app/views/merchants/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<% if @user_page == true %>
<h3 class="change-font top-add-space underline">
<%= "Welcome to you Merchant Page, #{@merchant.name}." %>
<%= "Welcome to your Merchant Page, #{@merchant.name}." %>
</h3>

<section class="underline">
Expand Down
4 changes: 2 additions & 2 deletions app/views/reviews/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<% end %>

<%= form_for @review, class: "", html: {class: 'form'}, url: product_reviews_path, http_method: :post do |f| %>
<article class="new-table cream-background">
<article class="new-table cream-background padding-bot">
<section class="change-font">
<%= f.label :title, 'Title:' %>
<%= f.text_field :title %>
Expand All @@ -25,7 +25,7 @@
<%= f.label :body %>
<%= f.text_field :body %>
</section>
<%= f.submit :class => 'product-button' %>
<%= f.submit :class => 'button' %>
</article>
<% end %>
</article>