Skip to content
This repository has been archived by the owner on Dec 12, 2021. It is now read-only.

Device 1.1.3 styles and stylesheet.css files unified #70

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Device 1.1.3 styles and stylesheet.css files unified #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 26 additions & 11 deletions lib/generators/nifty/layout/templates/stylesheet.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ a {
margin-top: 20px;
}

#flash_notice, #flash_error, #flash_alert {
#flash_notice, #flash_error {
padding: 5px 8px;
margin: 10px 0;
}
Expand All @@ -37,39 +37,54 @@ a {
border: solid 1px #6C6;
}

#flash_error, #flash_alert {
#flash_error {
background-color: #FCC;
border: solid 1px #C66;
}

.fieldWithErrors {
.fieldWithErrors, .field_with_errors {
display: inline;
color: #f00;
}

.error_messages {
#errorExplanation {
width: 400px;
border: 2px solid #CF0000;
padding: 0px;
padding-bottom: 12px;
margin-bottom: 20px;
background-color: #f0f0f0;
font-size: 12px;
}

.error_messages h2 {
#error_explanation {
width: 400px;
border: 2px solid #CF0000;
padding: 0px;
margin-bottom: 20px;
background-color: #f0f0f0;
}

#errorExplanation h2, #error_explanation h2 {
text-align: left;
font-weight: bold;
padding: 5px 10px;
padding: 5px 5px 5px 15px;
font-size: 12px;
margin: 0;
background-color: #c00;
color: #fff;
}

.error_messages p {
margin: 8px 10px;
#errorExplanation p, #error_explanation p {
color: #333;
margin-bottom: 0;
padding: 8px;
}

.error_messages ul {
margin: 0;
#errorExplanation ul, #error_explanation ul {
margin: 12px 2px;
}

#errorExplanation ul li, #error_explanation ul li {
font-size: 12px;
list-style: disc;
}
21 changes: 15 additions & 6 deletions rails_generators/nifty_layout/templates/stylesheet.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ a {
border: solid 1px #C66;
}

.fieldWithErrors {
.fieldWithErrors, .field_with_errors {
display: inline;
color: #f00;
}

#errorExplanation {
Expand All @@ -55,7 +56,15 @@ a {
background-color: #f0f0f0;
}

#errorExplanation h2 {
#error_explanation {
width: 400px;
border: 2px solid #CF0000;
padding: 0px;
margin-bottom: 20px;
background-color: #f0f0f0;
}

#errorExplanation h2, #error_explanation h2 {
text-align: left;
font-weight: bold;
padding: 5px 5px 5px 15px;
Expand All @@ -65,17 +74,17 @@ a {
color: #fff;
}

#errorExplanation p {
#errorExplanation p, #error_explanation p {
color: #333;
margin-bottom: 0;
padding: 8px;
}

#errorExplanation ul {
margin: 2px 24px;
#errorExplanation ul, #error_explanation ul {
margin: 12px 2px;
}

#errorExplanation ul li {
#errorExplanation ul li, #error_explanation ul li {
font-size: 12px;
list-style: disc;
}