forked from twbs/bootstrap-sass
-
Notifications
You must be signed in to change notification settings - Fork 0
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
TA-1362: Update bootstrap 3 theme to match branding #68
Merged
Merged
Changes from 12 commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
e0dd60a
Update readme
darren-arbon 98b12fc
All the changes
darren-arbon af24f55
couple of tweaks
darren-arbon 8d127cf
add new logo
darren-arbon 5ca76bb
fix image location
darren-arbon d645c0b
revert
darren-arbon 002eb18
Change primary and secondary names
darren-arbon 3f39985
change
darren-arbon 4b31aa5
change #fff to $white
darren-arbon b687433
text cololur change
darren-arbon 331d11e
change back
darren-arbon 3d04cee
fix navbar
darren-arbon 34dcb09
added logo to list box page, update text colour on error page and add…
TomBirbeckTFS 26eae4c
removed text colour css from error page as it defaults to what we want
TomBirbeckTFS c8cefe2
removed scripts for favicon, moved placement of file so github hopefu…
TomBirbeckTFS 6b8134e
added include for customer header for favicon
TomBirbeckTFS 2dbed0a
header to head
TomBirbeckTFS ce56b25
added script for favicon to index
TomBirbeckTFS fb82e98
fix for favicon
TomBirbeckTFS File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -155,7 +155,7 @@ | |
.navbar-brand { | ||
float: left; | ||
height: $navbar-height; | ||
padding: $navbar-padding-vertical $navbar-padding-horizontal; | ||
padding: 15px $navbar-padding-horizontal 15px $navbar-padding-horizontal; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we overwrite this in dc anyway, so makes sense to have it here? |
||
font-size: $font-size-large; | ||
line-height: $line-height-computed; | ||
|
||
|
@@ -272,7 +272,7 @@ | |
} | ||
} | ||
.divider { | ||
background-color: $accent; | ||
background-color: $brand-primary; | ||
} | ||
} | ||
} | ||
|
@@ -449,7 +449,7 @@ | |
&:focus { | ||
color: $navbar-default-link-active-color; | ||
// background-color: $navbar-default-link-active-bg; | ||
background-image: linear-gradient(0deg, white 4px, transparent 4px); | ||
background-image: linear-gradient(0deg, $navbar-default-link-active-color 4px, transparent 4px); | ||
} | ||
} | ||
> .disabled > a { | ||
|
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
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.
I think you can just remove these
color
entries and it'll pick up the global text colour, which should be$gray700
instead of$black