-
Notifications
You must be signed in to change notification settings - Fork 10
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.
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
errorModule JavaScript, partials, oh my! #73
Open
laurennicoleroth
wants to merge
35
commits into
nyc-sea-lions-2015:master
Choose a base branch
from
laurennicoleroth:tues_march_24
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
errorModule JavaScript, partials, oh my! #73
laurennicoleroth
wants to merge
35
commits into
nyc-sea-lions-2015:master
from
laurennicoleroth:tues_march_24
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
new file: config.ru new file: environment.rb
new file: spec_helper.rb
modified: app/controllers/index.rb new file: app/views/sealions/edit.erb new file: app/views/sealions/index.erb new file: app/views/sealions/new.erb new file: app/views/sealions/show.erb
modified: app/controllers/sealions.rb modified: app/views/sealions/show.erb modified: database.rb modified: environment.rb
modified: Gemfile new file: app/views/layout.erb new file: public/javascripts/main.js new file: spec/javascripts/javascript_spec.js new file: spec/javascripts/support/jasmine.yml
modified: Rakefile modified: app/views/layout.erb
modified: Gemfile.lock modified: Rakefile modified: app/controllers/index.rb modified: app/views/layout.erb
new file: public/javascripts/calculator.js
modified: Gemfile.lock modified: Rakefile modified: app/controllers/index.rb modified: app/views/layout.erb modified: public/javascripts/calculator.js
modified: app/controllers/index.rb deleted: app/views/calculator.erb modified: public/javascripts/calculator.js modified: spec/javascripts/javascript_spec.js
modified: spec/javascripts/javascript_spec.js
modified: app/controllers/index.rb new file: app/views/_error.erb modified: app/views/layout.erb modified: app/views/sealions/index.erb new file: public/css/portfolio-item.css modified: public/index.html modified: public/javascripts/calculator.js
modified: app/views/layout.erb new file: app/views/partials/error.erb deleted: public/css/calculator.css deleted: public/css/round-about.css
deleted: app/views/_error.erb
modified: app/controllers/index.rb modified: app/views/index.erb modified: app/views/layout.erb modified: app/views/partials/error.erb new file: public/css/custom.css modified: public/javascripts/calculator.js modified: public/javascripts/main.js
@@ -0,0 +1,7 @@ | |||
.alert-danger { | |||
color: white !important; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you find that you need !important
, something has gone wrong. You probably need to go and relax the specificity of your CSS elsewhere.
If you make the text color !important
, you should probably make the background-color
!important
, too.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Tested show/hide/change in console and jasmine. errorModule object is really simple. The div starts hidden, then can be shown/hidden/changed above yield, but below fixed nav at top of page.
(BTW, The instructions to use _ in the naming of the partial did not work. I created a partials directory and put error.erb in it instead so I could properly add the rendering in the layout file.)
@linkblaine @queerviolet