Skip to content

Commit

Permalink
Formatting CSS
Browse files Browse the repository at this point in the history
  • Loading branch information
Tom Cox committed Feb 1, 2015
1 parent cf659f0 commit 83ea758
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 44 deletions.
39 changes: 6 additions & 33 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,43 +13,16 @@
*= require_tree .
*= require_self
*/
body { padding-top: 0px;
background: #833ad1;
}
/* footer { margin-top: 100px; background-color: #ebebeb; padding: 30px 0;} */
body {padding-top: 0px;background: #833ad1;}


/* This needs to go in pages.scss and be 'converted' to scss */
.landing-image { padding-left: 14.5%; border: 2em; }

.center-content {
margin-left: 20%;
}
.navbar {
min-height: 45px;
background-color: #DBB8FF;
width: 100%;
margin-lefts: 21.5%;
font-size: 20px;
}

.navbar-header {
padding-left: 37%;
padding-top: 4px;

.center-content {margin-left: 20%;}

}

}
.navbar {min-height: 45px;background-color: #DBB8FF;width: 100%;margin-lefts: 21.5%;font-size: 20px;}
.navbar-header {padding-left: 37%;padding-top: 4px;}
.navbar a.brand { font-size: 18px; }
.navbar a.brand:hover {
color: #833ad1;
background-color: transparent;
text-decoration: none;
}
.navbar a.brand:hover {color: #833ad1;background-color: transparent;text-decoration: none;}
navbar navbar-default navbar-fixed-top

h1 {
color: red;

}
h1 {color: red;}
5 changes: 0 additions & 5 deletions app/assets/stylesheets/forms.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

.form1{
width: 20em;
margin-left: auto;
Expand Down Expand Up @@ -30,8 +29,6 @@ label{
margin-bottom: 0.5em;
}


/* set the font-size of the date picker 'gem' calendar see "_form.html.erb" */
div.ui-datepicker{
font-size: 0.7em;
}
Expand All @@ -40,7 +37,6 @@ div.ui-datepicker{
margin-bottom: 0.5em;
}

/* 'notice' is a unique id element, for usage id='notice' see application.html.erb */
#notice { color: green; }

#alert { color: red; }
Expand All @@ -51,7 +47,6 @@ div.ui-datepicker{
display: table;
}

/* 'error_explanation' is a unique id element, usage id='error_explanation' see 'users/form.html.erb' */
#error_explanation {
width: 15em;
float: right;
Expand Down
4 changes: 1 addition & 3 deletions app/assets/stylesheets/index-divs.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/* 'borders' can be displayed if the 's' is removed to make a valid CSS selector
styles used on main product page 'products/index.html.erb'
*/
*/

#all-content {
widths: 80em;
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/pages.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ body { padding-top: 0px; }

.title {
margin-left: 35%;
xborder: solid;
/*border: solid;*/
margin-top: 4px;

}
Expand All @@ -28,5 +28,5 @@ body { padding-top: 0px; }
position: absolute;
left: 50%;
background-color: #E6E6D0;
borders: solid blue;
/*border: solid blue;*/
}
1 change: 0 additions & 1 deletion app/assets/stylesheets/show.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/* for usage see 'products/show.html.erb' */

#all-details {
Expand Down

0 comments on commit 83ea758

Please sign in to comment.